Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5792 from turbo124/v5-develop

Browse Source 
Fixes for OAuth using logging in over user/pass combinations
This commit is contained in:
David Bomba 2021-05-23 07:58:17 +10:00 committed by GitHub
commit 518006a466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,6 +405,20 @@ class LoginController extends BaseController
'oauth_user_id' => $google->harvestSubField($user), 'oauth_user_id' => $google->harvestSubField($user),
'oauth_provider_id'=> 'google', '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);
} }
} }

6
app/Http/Requests/Account/CreateAccountRequest.php
View File

@ -40,13 +40,13 @@ class CreateAccountRequest extends Request
'password' => 'required|string|min:6', 'password' => 'required|string|min:6',
'email' => 'bail|required|email:rfc,dns', 'email' => 'bail|required|email:rfc,dns',
'email' => new NewUniqueUserRule(), 'email' => new NewUniqueUserRule(),
'privacy_policy' => 'required', 'privacy_policy' => 'required|boolean',
'terms_of_service' => 'required', 'terms_of_service' => 'required|boolean',
]; ];
} }
protected function prepareForValidation() protected function prepareForValidation()
{ {nlog($this->all());
$input = $this->all(); $input = $this->all();
$input['user_agent'] = request()->server('HTTP_USER_AGENT'); $input['user_agent'] = request()->server('HTTP_USER_AGENT');