Merge pull request #492 from canyongbs/feature/ADVAPP-216-calendar-oa…

…uth-account-select [ADVAPP-216]: Adjust Meeting Center calendar oAuth flow to require you select what account to use
canyongbs · Feb 1, 2024 · e5ae2f4 · e5ae2f4
2 parents 933e4e2 + 30fc21d
commit e5ae2f4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/app-modules/authorization/src/Enums/SocialiteProvider.php b/app-modules/authorization/src/Enums/SocialiteProvider.php
@@ -82,7 +82,7 @@ public function config(): Config
             'azure_calendar' => new Config(
                 key: $azureCalendarSettings->client_id,
                 secret: $azureCalendarSettings->client_secret,
-                callbackUri: route('socialite.callback', ['provider' => 'azure_calendar']),
+                callbackUri: route('calendar.outlook.callback'),
                 additionalProviderConfig: ['tenant' => $azureCalendarSettings->tenant_id ?? 'common']
             ),
             'google' => new Config(

diff --git a/app-modules/authorization/src/Http/Controllers/SocialiteController.php b/app-modules/authorization/src/Http/Controllers/SocialiteController.php
@@ -57,9 +57,14 @@ public function redirect(SocialiteProvider $provider, Request $request)
 
         auth()->guard('web')->logout();
 
-        return $provider->driver()
-            ->setConfig($provider->config())
-            ->redirect();
+        $driver = $provider->driver()
+            ->setConfig($provider->config());
+
+        if (in_array($provider, [SocialiteProvider::Azure, SocialiteProvider::Google])) {
+            $driver->with(['prompt' => 'select_account']);
+        }
+
+        return $driver->redirect();
     }
 
     public function callback(SocialiteProvider $provider)

diff --git a/app-modules/meeting-center/src/Http/Controllers/GoogleCalendarController.php b/app-modules/meeting-center/src/Http/Controllers/GoogleCalendarController.php
@@ -52,7 +52,13 @@ public function login(Request $request): RedirectResponse
     {
         $client = GoogleCalendarManager::client();
 
-        return redirect()->away($client->createAuthUrl());
+        return redirect()->away(
+            $client->createAuthUrl(
+                queryParams: [
+                    'prompt' => 'select_account',
+                ]
+            )
+        );
     }
 
     public function callback(Request $request): RedirectResponse

diff --git a/app-modules/meeting-center/src/Http/Controllers/OutlookCalendarController.php b/app-modules/meeting-center/src/Http/Controllers/OutlookCalendarController.php
@@ -55,6 +55,7 @@ public function login(Request $request): RedirectResponse
         return $driver
             ->setConfig(SocialiteProvider::AzureCalendar->config())
             ->scopes(['Calendars.ReadWrite', 'User.Read', 'offline_access'])
+            ->with(['prompt' => 'select_account'])
             ->redirect();
     }