[6.x] fix: custom oauth prompt callback registration (#398)

joelbutcher · web-flow · commit ddfbf0a32036 · 2025-02-19T12:19:57.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 *.php diff=php
 
 /.github export-ignore
+/resources/views/oauth/test-prompt.blade.php export-ignore
 /workbench export-ignore
 /tests export-ignore
 .editorconfig export-ignore
diff --git a/resources/views/oauth/test-prompt.blade.php b/resources/views/oauth/test-prompt.blade.php
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body class="font-sans antialiased">
+    Confirm Your {{ $provider }} OAuth Request (Test)
+</body>
+</html>
diff --git a/src/Http/Controllers/OAuthController.php b/src/Http/Controllers/OAuthController.php
@@ -74,13 +74,7 @@ public function callback(Request $request, string $provider): SocialstreamRespon
      */
     public function prompt(string $provider): View|InertiaResponse
     {
-        if (Socialstream::$oAuthConfirmationPrompt) {
-            return app(Socialstream::$oAuthConfirmationPrompt)($provider);
-        }
-
-        return view('socialstream::oauth.prompt', [
-            'provider' => $provider,
-        ]);
+        return app()->call(Socialstream::getOAuthConfirmationPrompt(), ['provider' => $provider]);
     }
 
     public function confirm(string $provider): SocialstreamResponse|RedirectResponse
diff --git a/src/Socialstream.php b/src/Socialstream.php
@@ -405,8 +405,17 @@ public static function refreshConnectedAccountToken(ConnectedAccount $connectedA
      *
      * @param ?(callable(string): (Response|View)) $callback
      */
-    public static function promptOAuthLinkUsing(?callable $callback): void
+    public static function promptOAuthLinkUsing(?Closure $callback = null): void
     {
-        self::$oAuthConfirmationPrompt = $callback ? $callback(...) : null;
+        self::$oAuthConfirmationPrompt = $callback;
+    }
+
+    public static function getOAuthConfirmationPrompt(): Closure
+    {
+        return self::$oAuthConfirmationPrompt ?? function (string $provider): View {
+            return view('socialstream::oauth.prompt', [
+                'provider' => $provider,
+            ]);
+        };
     }
 }
diff --git a/tests/Feature/SocialstreamTest.php b/tests/Feature/SocialstreamTest.php
@@ -4,6 +4,7 @@
 
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
@@ -305,8 +306,23 @@ public function generate(string $provider): RedirectResponse
         'password' => Hash::make('password'),
     ]));
 
-    get('http://localhost/oauth/github/callback/prompt')
-        ->assertSee('Confirm connection of your GitHub account.');
+    expect(get('http://localhost/oauth/github/callback/prompt'))
+        ->getStatusCode()->toBe(200)
+        ->getContent()->toContain('Confirm connection of your GitHub account.');
+});
+
+it('can render a custom prompt', function () {
+    Socialstream::promptOAuthLinkUsing(fn (string $provider) => view('socialstream::oauth.test-prompt', compact('provider')));
+
+    $this->actingAs(User::create([
+        'name' => 'Joel Butcher',
+        'email' => 'joel@socialstream.dev',
+        'password' => Hash::make('password'),
+    ]));
+
+    expect(get('http://localhost/oauth/github/callback/prompt'))
+        ->getStatusCode()->toBe(200)
+        ->getContent()->toContain('Confirm Your github OAuth Request (Test)');
 });
 
 it('denies an attempt to link an account', function () {

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,7 @@ public function callback(Request $request, string $provider): SocialstreamRespon`
`74`	`74`	`*/`
`75`	`75`	`public function prompt(string $provider): View\|InertiaResponse`
`76`	`76`	`{`
`77`		`- if (Socialstream::$oAuthConfirmationPrompt) {`
`78`		`- return app(Socialstream::$oAuthConfirmationPrompt)($provider);`
`79`		`- }`
`80`		`-`
`81`		`- return view('socialstream::oauth.prompt', [`
`82`		`- 'provider' => $provider,`
`83`		`- ]);`
	`77`	`+ return app()->call(Socialstream::getOAuthConfirmationPrompt(), ['provider' => $provider]);`
`84`	`78`	`}`
`85`	`79`
`86`	`80`	`public function confirm(string $provider): SocialstreamResponse\|RedirectResponse`
Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,17 @@ public static function refreshConnectedAccountToken(ConnectedAccount $connectedA`
`405`	`405`	`*`
`406`	`406`	`* @param ?(callable(string): (Response\|View)) $callback`
`407`	`407`	`*/`
`408`		`- public static function promptOAuthLinkUsing(?callable $callback): void`
	`408`	`+ public static function promptOAuthLinkUsing(?Closure $callback = null): void`
`409`	`409`	`{`
`410`		`- self::$oAuthConfirmationPrompt = $callback ? $callback(...) : null;`
	`410`	`+ self::$oAuthConfirmationPrompt = $callback;`
	`411`	`+ }`
	`412`	`+`
	`413`	`+ public static function getOAuthConfirmationPrompt(): Closure`
	`414`	`+ {`
	`415`	`+ return self::$oAuthConfirmationPrompt ?? function (string $provider): View {`
	`416`	`+ return view('socialstream::oauth.prompt', [`
	`417`	`+ 'provider' => $provider,`
	`418`	`+ ]);`
	`419`	`+ };`
`411`	`420`	`}`
`412`	`421`	`}`