wip

config/socialstream.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Providers\RouteServiceProvider;
 use JoelButcher\Socialstream\Features;
 use JoelButcher\Socialstream\Providers;
 
@@ -16,4 +17,13 @@
         Features::providerAvatars(),
         Features::refreshOAuthTokens(),
     ],
+    'home' => RouteServiceProvider::HOME,
+    'redirects' => [
+        'login' => RouteServiceProvider::HOME,
+        'register' => RouteServiceProvider::HOME,
+        'login-failed' => '/login',
+        'registration-failed' => '/register',
+        'provider-linked' => '/user/profile',
+        'provider-link-failed' => '/user/profile',
+    ]
 ];

src/Contracts/AuthenticatesOAuthCallback.php

@@ -3,14 +3,12 @@
 namespace JoelButcher\Socialstream\Contracts;
 
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
-use Laravel\Fortify\Contracts\LoginResponse;
 use Laravel\Socialite\Contracts\User;
 
 interface AuthenticatesOAuthCallback
 {
     /**
      * Authenticates users returning from an OAuth flow.
      */
-    public function authenticate(string $provider, User $providerAccount): Response|RedirectResponse|LoginResponse;
+    public function authenticate(string $provider, User $providerAccount): SocialstreamResponse|RedirectResponse;
 }

src/Contracts/OAuthLoginFailedResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthLoginFailedResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/OAuthLoginResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthLoginResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/OAuthProviderLinkFailedResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthProviderLinkFailedResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/OAuthProviderLinkedResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthProviderLinkedResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/OAuthRegisterFailedResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthRegisterFailedResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/OAuthRegisterResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+interface OAuthRegisterResponse extends SocialstreamResponse
+{
+
+}

src/Contracts/SocialstreamResponse.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace JoelButcher\Socialstream\Contracts;
+
+use Illuminate\Contracts\Support\Responsable;
+
+interface SocialstreamResponse extends Responsable
+{
+
+}

src/Events/ConnectedAccountEvent.php

@@ -13,10 +13,8 @@ abstract class ConnectedAccountEvent
 
     /**
      * Create a new event instance.
-     *
-     * @param  ConnectedAccount  $connectedAccount
      */
-    public function __construct(public $connectedAccount)
+    public function __construct(public mixed $connectedAccount)
     {
         //
     }

src/Events/NewOAuthRegistration.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class NewOAuthRegistration
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public mixed $user,
+        public string $provider,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Events/OAuthLogin.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class OAuthLogin
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public mixed $user,
+        public string $provider,
+        public mixed $connectedAccount,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Events/OAuthLoginFailed.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class OAuthLoginFailed
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public string $provider,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Events/OAuthProviderLinkFailed.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class OAuthProviderLinkFailed
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public mixed $user,
+        public string $provider,
+        public mixed $connectedAccount,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Events/OAuthProviderLinked.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class OAuthProviderLinked
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public mixed $user,
+        public string $provider,
+        public mixed $connectedAccount,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Events/OAuthRegistrationFailed.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace JoelButcher\Socialstream\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Laravel\Socialite\Contracts\User as ProviderUser;
+
+class OAuthRegistrationFailed
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public string $provider,
+        public mixed $connectedAccount,
+        public ProviderUser $providerAccount,
+    ) {
+        //
+    }
+}

src/Features.php

@@ -29,9 +29,18 @@ public static function hasCreateAccountOnFirstLoginFeatures(): bool
         return static::enabled(static::createAccountOnFirstLogin());
     }
 
+    /**
+     * Determine if the application supports social login
+     * authentication from pages other than "/login".
+     */
+    public static function hasGlobalLoginFeatures(): bool
+    {
+        return static::enabled(static::globalLogin());
+    }
+
     /**
      * Determine if the application supports logging into existing
-     * accounts when registering with a provider who's email address
+     * accounts when registering with a provider whose email address
      * is already registered.
      */
     public static function hasLoginOnRegistrationFeatures(): bool
@@ -79,6 +88,11 @@ public static function createAccountOnFirstLogin(): string
         return 'create-account-on-first-login';
     }
 
+    public static function globalLogin(): string
+    {
+        return 'global-login';
+    }
+
     /**
      * Enable the login on registration feature.
      */

src/Http/Controllers/OAuthController.php

@@ -11,7 +11,7 @@
 use JoelButcher\Socialstream\Contracts\HandlesInvalidState;
 use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
 use JoelButcher\Socialstream\Contracts\ResolvesSocialiteUsers;
-use Laravel\Fortify\Contracts\LoginResponse;
+use JoelButcher\Socialstream\Contracts\SocialstreamResponse;
 use Laravel\Socialite\Two\InvalidStateException;
 use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirectResponse;
 
@@ -42,7 +42,7 @@ public function redirect(string $provider, GeneratesProviderRedirect $generator)
     /**
      * Attempt to log the user in via the provider user returned from Socialite.
      */
-    public function callback(Request $request, string $provider): Response|RedirectResponse|LoginResponse
+    public function callback(Request $request, string $provider): SocialstreamResponse|RedirectResponse|Response
     {
         $redirect = $this->errorHandler->handle($request);
 

src/Http/Responses/OAuthLoginResponse.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace JoelButcher\Socialstream\Http\Responses;
+
+use App\Providers\RouteServiceProvider;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Route;
+use JoelButcher\Socialstream\Concerns\InteractsWithComposer;
+use JoelButcher\Socialstream\Contracts\OAuthLoginResponse as LoginResponseContract;
+use JoelButcher\Socialstream\Socialstream;
+use Laravel\Fortify\Contracts\LoginResponse as FortifyLoginResponse;
+
+class OAuthLoginResponse implements LoginResponseContract
+{
+    use InteractsWithComposer;
+
+    public function toResponse($request): RedirectResponse
+    {
+        return Socialstream::redirects('login')
+            ? redirect()->intended(Socialstream::redirects('login'))
+            : $this->defaultResponse();
+    }
+
+    private function defaultResponse(): RedirectResponse|FortifyLoginResponse
+    {
+        $previousUrl = session()->pull('socialstream.previous_url');
+
+        return match (true) {
+            Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => redirect()
+                ->route('admin'),
+            $this->hasComposerPackage('laravel/breeze') => redirect()
+                ->route('dashboard'),
+            $this->hasComposerPackage('laravel/jetstream') => app(FortifyLoginResponse::class),
+            default => redirect()
+                ->to(RouteServiceProvider::HOME),
+        };
+    }
+
+}

src/Http/Responses/OAuthOAuthLoginFailedResponse.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace JoelButcher\Socialstream\Http\Responses;
+
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Route;
+use JoelButcher\Socialstream\Concerns\InteractsWithComposer;
+use JoelButcher\Socialstream\Contracts\OAuthLoginFailedResponse as OAuthLoginFailedResponseContract;
+use JoelButcher\Socialstream\Socialstream;
+
+class OAuthOAuthLoginFailedResponse implements OAuthLoginFailedResponseContract
+{
+    use InteractsWithComposer;
+
+    public function toResponse($request): RedirectResponse
+    {
+        return Socialstream::redirects('login-failed')
+            ? redirect()->intended(Socialstream::redirects('login-failed'))
+            : $this->defaultResponse();
+    }
+
+    private function defaultResponse(): RedirectResponse
+    {
+        $previousUrl = session()->pull('socialstream.previous_url');
+
+        return redirect()->to(match (true) {
+            Route::has('filament.auth.login') && $previousUrl === route('filament.auth.login') => 'filament.auth.login',
+            Route::has('login') && $previousUrl === route('login') => 'login',
+            Route::has('register') && $previousUrl === route('register') => 'register',
+            default => 'login',
+        });
+    }
+}