From c5a24fd9d99307811029b9b967b1a015fa54d6ac Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 23 May 2021 07:57:53 +1000 Subject: [PATCH] Fixes for OAuth using logging in over user/pass combinations --- app/Http/Controllers/Auth/LoginController.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 698857171b84..772563845e40 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -405,6 +405,20 @@ class LoginController extends BaseController 'oauth_user_id' => $google->harvestSubField($user), 'oauth_provider_id'=> 'google', ]); + + + $cu = CompanyUser::query() + ->where('user_id', auth()->user()->id); + + $cu->first()->account->companies->each(function ($company) use($cu){ + + if($company->tokens()->where('is_system', true)->count() == 0) + { + CreateCompanyToken::dispatchNow($company, $cu->first()->user, request()->server('HTTP_USER_AGENT')); + } + }); + + return $this->timeConstrainedResponse($cu); } }