[feature] link social service

Author: uswebk

backend/app/Services/Application/Auth/SocialService.php

@@ -63,21 +63,30 @@ public function handle(string $provider): void
             $this->userRepository->save($user);
 
             DB::commit();
+
+            Auth::login($user);
         } catch (ModelNotFoundException $e) {
-            $code = $this->userLatestCodeRepository->next();
-
-            $user = $this->userRepository->store([
-                'name' => $userSocial->name,
-                'company_id' => CompanyConstant::INDEPENDENT_COMPANY_ID,
-                'role_id' => RoleConstant::DEFAULT_ROLE_ID,
-                'code' => $code,
-                'email' => $userSocial->email,
-                'emoji' => '',
-                'password' => Hash::make(Str::random(32)),
-                'email_verify_token' => '',
-                'last_login_at' => now(),
-                'email_verified_at' => now()->toDateTimeString(),
-            ]);
+
+            $user = Auth::user();
+
+            if (!isset($user)) {
+                $code = $this->userLatestCodeRepository->next();
+
+                $user = $this->userRepository->store([
+                    'name' => $userSocial->name,
+                    'company_id' => CompanyConstant::INDEPENDENT_COMPANY_ID,
+                    'role_id' => RoleConstant::DEFAULT_ROLE_ID,
+                    'code' => $code,
+                    'email' => $userSocial->email,
+                    'emoji' => '',
+                    'password' => Hash::make(Str::random(32)),
+                    'email_verify_token' => '',
+                    'last_login_at' => now(),
+                    'email_verified_at' => now()->toDateTimeString(),
+                ]);
+
+                Auth::login($user);
+            }
 
             $this->socialAccountRepository->store([
                 'user_id' => $user->id,
@@ -92,7 +101,5 @@ public function handle(string $provider): void
 
             throw new Exception('Failed registration');
         }
-
-        Auth::login($user);
     }
 }

frontend/components/mypage/Profile.vue

@@ -36,7 +36,13 @@
       <v-col cols="2">
         <v-tooltip bottom>
           <template #activator="{ on, attrs }">
-            <v-btn color="primary" small fab v-bind="attrs" v-on="on"
+            <v-btn
+              color="primary"
+              small
+              fab
+              v-bind="attrs"
+              @click="pushGoogleLogin"
+              v-on="on"
               ><v-icon> mdi-google-plus</v-icon></v-btn
             >
           </template>
@@ -70,7 +76,7 @@ export default {
   },
   methods: {
     ...mapActions('account', ['updateProfile', 'sendMessage']),
-    ...mapActions('authentication', ['fetchMe']),
+    ...mapActions('authentication', ['fetchMe', 'providerLogin']),
     selectEmoji(emoji) {
       this.shownEmoji = false
       this.userModel.emoji = emoji.data
@@ -103,6 +109,10 @@ export default {
         }
       }
     },
+    async pushGoogleLogin() {
+      const response = await this.providerLogin('google')
+      location.href = response.data
+    },
   },
 }
 </script>

frontend/middleware/authenticated.js

@@ -33,10 +33,7 @@ function isAuthPath(routePath) {
   const pattern = /^\/password\/reset\/[\w]+/
   const result1 = pattern.test(routePath)
 
-  const pattern2 = /^\/login\/[\w]+\/callback/
-  const result2 = pattern2.test(routePath)
-
-  if (result1 || result2) return false
+  if (result1) return false
   const targetRoute = [
     '/login',
     '/register',