Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 13:54:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for microsoft login

Browse Source
This commit is contained in:
David Bomba 2023-09-20 12:23:02 +10:00
parent 42508f63d5
commit 701295af34
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Auth/LoginController.php
View File

@ -418,6 +418,8 @@ class LoginController extends BaseController
->setReturnType(Model\User::class) ->setReturnType(Model\User::class)
->execute(); ->execute();
nlog($user);
if ($user) { if ($user) {
$account = request()->input('account'); $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 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 = MultiDB::hasUser(['email' => $email])) {
if (!$existing_login_user->account) { // if (!$existing_login_user->account) {
return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400); // 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! // Signup!