Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit a91812e

Browse files
committed
Some fixes.
1 parent bbcdea6 commit a91812e

File tree

7 files changed

+35
-422
lines changed

7 files changed

+35
-422
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public function showLoginForm()
4747
* @param \Illuminate\Http\Request $request
4848
*
4949
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
50-
* @throws \App\Exceptions\Common\ValidationException
50+
* @throws ValidationException
51+
* @throws \Illuminate\Validation\ValidationException
5152
*/
5253
public function loginViaWeb(Request $request)
5354
{
@@ -193,7 +194,9 @@ protected function registerViaOAuth(SocialiteUser $oauthUserData, $provider)
193194
$ownerAccount->save();
194195
}
195196

196-
($doLinkOAuthAccount = $this->linkOAuthAccount($oauthUserData, $provider, $ownerAccount)) && app('auth.driver')->login($ownerAccount, true);
197+
if ($doLinkOAuthAccount = $this->linkOAuthAccount($oauthUserData, $provider, $ownerAccount)) {
198+
app('auth.driver')->login($ownerAccount, true);
199+
}
197200

198201
event(new LoggedIn($ownerAccount, $provider));
199202

package-lock.json

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)