Some fixes.

AudithSoftworks · Apr 22, 2018 · a91812e · a91812e
1 parent bbcdea6
commit a91812e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 422 deletions.
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -47,7 +47,8 @@ public function showLoginForm()
      * @param \Illuminate\Http\Request $request
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
-     * @throws \App\Exceptions\Common\ValidationException
+     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function loginViaWeb(Request $request)
     {
@@ -193,7 +194,9 @@ protected function registerViaOAuth(SocialiteUser $oauthUserData, $provider)
             $ownerAccount->save();
         }
 
-        ($doLinkOAuthAccount = $this->linkOAuthAccount($oauthUserData, $provider, $ownerAccount)) && app('auth.driver')->login($ownerAccount, true);
+        if ($doLinkOAuthAccount = $this->linkOAuthAccount($oauthUserData, $provider, $ownerAccount)) {
+            app('auth.driver')->login($ownerAccount, true);
+        }
 
         event(new LoggedIn($ownerAccount, $provider));
 

diff --git a/package-lock.json b/package-lock.json