From 701295af34caaa3e503760d7cba974ece25304a4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 12:23:02 +1000 Subject: [PATCH] Fixes for microsoft login --- app/Http/Controllers/Auth/LoginController.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a32ea52c4efb..4d496a01ed58 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -418,6 +418,8 @@ class LoginController extends BaseController ->setReturnType(Model\User::class) ->execute(); + nlog($user); + if ($user) { $account = request()->input('account'); @@ -437,15 +439,15 @@ class LoginController extends BaseController } //If this is a result user/email combo - lets add their OAuth details details - if ($existing_login_user = MultiDB::hasUser(['email' => $email])) { - if (!$existing_login_user->account) { - return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400); - } + // if ($existing_login_user = MultiDB::hasUser(['email' => $email])) { + // if (!$existing_login_user->account) { + // return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400); + // } - Auth::login($existing_login_user, true); + // Auth::login($existing_login_user, true); - return $this->existingLoginUser($user->getId(), 'microsoft'); - } + // return $this->existingLoginUser($user->getId(), 'microsoft'); + // } // Signup!