From d9ca212f81a841811a4e1bfe3fcf6684d57d7a4f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 17 Jun 2022 16:46:33 +1000
Subject: [PATCH] FIxes for microsoft oauth

---
 app/Http/Controllers/Auth/LoginController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 914fe6966e8b..c3124824b39a 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -514,7 +514,7 @@ class LoginController extends BaseController
             $email = $user->getMail() ?: $user->getUserPrincipalName();
 
             $query = [
-                'oauth_user_id' => $account['idToken']['oid'],
+                'oauth_user_id' => $user->getId(),
                 'oauth_provider_id'=> 'microsoft',
             ];
 
@@ -534,7 +534,7 @@ class LoginController extends BaseController
 
                 Auth::login($existing_login_user, true);
 
-                return $this->existingLoginUser($account['idToken']['oid'], 'microsoft');
+                return $this->existingLoginUser($user->getId(), 'microsoft');
             }
 
             // Signup!
@@ -543,7 +543,7 @@ class LoginController extends BaseController
                 'last_name' => $user->getSurname() ?: '' ,
                 'password' => '',
                 'email' => $email,
-                'oauth_user_id' => $account['idToken']['oid'],
+                'oauth_user_id' => $user->getId(),
                 'oauth_provider_id' => 'microsoft',
             ];