From 9e75ebb31705121f5c78546131f9fec2bd1c3529 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 17 Jun 2022 15:51:37 +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 c342cb8dc8b5..e58d1aabbff7 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -511,7 +511,7 @@ class LoginController extends BaseController if($user){ $account = request()->input('account'); - $email = $user->getMail(); + $email = $user->getMail() ?: $user->getUserPrincipalName(); $query = [ 'oauth_user_id' => $account['idToken']['sub'], @@ -761,7 +761,7 @@ class LoginController extends BaseController public function handleMicrosoftProviderCallback($provider = 'microsoft') { - + $socialite_user = Socialite::driver($provider)->user(); nlog($socialite_user);