From 89f07407033f40cf21b4dd675bd81dae862684f6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 17 Jun 2022 15:53:44 +1000 Subject: [PATCH] Handle personal o365 accounts --- app/Http/Controllers/Auth/LoginController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index e58d1aabbff7..67444dcde51d 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -699,14 +699,14 @@ class LoginController extends BaseController if($provider == 'microsoft'){ $scopes = ['email', 'Mail.ReadWrite', 'Mail.Send', 'offline_access', 'profile', 'User.Read openid']; - $parameters = ['access_type' => 'offline', "prompt" => "consent select_account", 'redirect_uri' => config('ninja.app_url')."/auth/microsoft"]; + $parameters = ['access_type' => 'offline', 'redirect_uri' => config('ninja.app_url')."/auth/microsoft"]; } if (request()->has('code')) { return $this->handleProviderCallback($provider); } else { - if(!in_array($provider, ['google'])) + if(!in_array($provider, ['google','microsoft'])) return abort(400, 'Invalid provider'); return Socialite::driver($provider)->with($parameters)->scopes($scopes)->redirect();