api/oauth: also activate user after successful oauth authentication

Issue: #4670
ecamp · Mar 16, 2024 · 80ae096 · 80ae096
1 parent ede0e00
commit 80ae096
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/api/src/Security/OAuth/GoogleAuthenticator.php b/api/src/Security/OAuth/GoogleAuthenticator.php
@@ -53,7 +53,16 @@ public function authenticate(Request $request): Passport {
                 $existingProfile = $profileRepository->findOneBy(['googleId' => $googleUser->getId()]);
 
                 if ($existingProfile) {
-                    return $existingProfile->user;
+                    $user = $existingProfile->user;
+                    if (User::STATE_REGISTERED === $user->state
+                        || User::STATE_NONREGISTERED === $user->state
+                    ) {
+                        $user->state = User::STATE_ACTIVATED;
+                        $this->entityManager->persist($user);
+                        $this->entityManager->flush();
+                    }
+
+                    return $user;
                 }
 
                 // do we have a matching user by email?

diff --git a/api/src/Security/OAuth/HitobitoAuthenticator.php b/api/src/Security/OAuth/HitobitoAuthenticator.php
@@ -59,7 +59,16 @@ public function authenticate(Request $request): Passport {
                 $existingProfile = $profileRepository->findOneBy(["{$provider}Id" => $hitobitoUser->getId()]);
 
                 if ($existingProfile) {
-                    return $existingProfile->user;
+                    $user = $existingProfile->user;
+                    if (User::STATE_REGISTERED === $user->state
+                        || User::STATE_NONREGISTERED === $user->state
+                    ) {
+                        $user->state = User::STATE_ACTIVATED;
+                        $this->entityManager->persist($user);
+                        $this->entityManager->flush();
+                    }
+
+                    return $user;
                 }
 
                 // do we have a matching user by email?