diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a557e8915654..113675dae44e 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -332,11 +332,6 @@ class LoginController extends BaseController if (request()->input('provider') == 'google') { return $this->handleGoogleOauth(); } elseif (request()->input('provider') == 'microsoft') { - // if (request()->has('token')) { - // return $this->handleSocialiteLogin('microsoft', request()->get('token')); - // } else { - // $message = 'Bearer token missing for the microsoft login'; - // } return $this->handleMicrosoftOauth(); } elseif (request()->input('provider') == 'apple') { // if (request()->has('token')) { @@ -501,7 +496,7 @@ class LoginController extends BaseController elseif(request()->has('access_token')) $accessToken = request()->input('access_token'); else - return response()->json(['message' => 'Invalid response from oauth server'], 400); + return response()->json(['message' => 'Invalid response from oauth server, no access token in response.'], 400); $graph = new \Microsoft\Graph\Graph(); $graph->setAccessToken($accessToken); @@ -512,7 +507,6 @@ class LoginController extends BaseController if($user){ - $account = request()->input('account'); $email = $user->getMail() ?: $user->getUserPrincipalName(); $query = [ @@ -553,6 +547,8 @@ class LoginController extends BaseController } + return response()->json(['message' => 'Unable to authenticate this user'], 400); + } private function existingOauthUser($existing_user)