Merge pull request #22 from synolia/hotfix/fix-google-user-locale

Google user set locale coalesce if null
synolia · Nov 20, 2024 · c47c27d · c47c27d
2 parents acbfbc3 + 3bee759
commit c47c27d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/sylius.yaml b/.github/workflows/sylius.yaml
@@ -34,6 +34,9 @@ jobs:
                     -
                         sylius: 1.11.0
                         symfony: 6.3
+                    -
+                        sylius: 1.12.0
+                        symfony: 5.4
         env:
             APP_ENV: test
             package-name: synolia/sylius-admin-oauth-plugin

diff --git a/src/Factory/AdminUserFactory.php b/src/Factory/AdminUserFactory.php
@@ -10,7 +10,7 @@
 
 final class AdminUserFactory
 {
-    public static function createByGoogleAccount(GoogleUser $googleUser): customAdminUser
+    public static function createByGoogleAccount(GoogleUser $googleUser, string $locale): customAdminUser
     {
         $user = new customAdminUser();
         $user->setEmail($googleUser->getEmail());
@@ -21,7 +21,7 @@ public static function createByGoogleAccount(GoogleUser $googleUser): customAdmi
         $user->setHostedDomain($googleUser->getHostedDomain());
         $user->setEnabled(true);
         $user->setCreatedAt(new \DateTimeImmutable('now'));
-        $user->setLocaleCode($googleUser->getLocale());
+        $user->setLocaleCode($locale);
         /** @var string|null $googleId */
         $googleId = $googleUser->getId();
         $user->setGoogleId($googleId);

diff --git a/src/Security/Resolver/DomainInformationsResolver.php b/src/Security/Resolver/DomainInformationsResolver.php
@@ -35,7 +35,7 @@ public function getDomainInformations(AzureResourceOwner|GoogleUser $user): arra
         }
 
         /** @var AdminUser $newUser */
-        $newUser = AdminUserFactory::createByGoogleAccount($user);
+        $newUser = AdminUserFactory::createByGoogleAccount($user, $this->localeContext->getLocaleCode());
 
         return [
             GoogleUser::class => [