Merge pull request #4779 from BacLuc/also-activate-user-after-oauth-l…

…ogin api/oauth: also activate user after successful oauth authentication
ecamp · Mar 25, 2024 · afa6571 · afa6571
2 parents c9ab08b + 809b447
commit afa6571
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/api/src/Security/OAuth/GoogleAuthenticator.php b/api/src/Security/OAuth/GoogleAuthenticator.php
@@ -67,6 +67,9 @@ public function authenticate(Request $request): Passport {
                     $profile->surname = $googleUser->getLastName();
                     $user = new User();
                     $user->profile = $profile;
+                }
+
+                if (in_array($user->state, [null, User::STATE_NONREGISTERED, User::STATE_REGISTERED])) {
                     $user->state = User::STATE_ACTIVATED;
                 }
 

diff --git a/api/src/Security/OAuth/HitobitoAuthenticator.php b/api/src/Security/OAuth/HitobitoAuthenticator.php
@@ -74,6 +74,9 @@ public function authenticate(Request $request): Passport {
                     $profile->nickname = $hitobitoUser->getNickName();
                     $user = new User();
                     $user->profile = $profile;
+                }
+
+                if (in_array($user->state, [null, User::STATE_NONREGISTERED, User::STATE_REGISTERED])) {
                     $user->state = User::STATE_ACTIVATED;
                 }