User retrieval fix

sztyup · Jan 6, 2020 · 4b7ae8c · 4b7ae8c
1 parent cef57eb
commit 4b7ae8c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/LAuth/AbstractProvider.php b/src/LAuth/AbstractProvider.php
@@ -62,9 +62,9 @@ public function callback(): Account
             $account->setCreatedAt(new DateTime());
         } else {
             $this->updateAccount($account, $providerUser, $tokens);
-            $account->setUpdatedAt(new DateTime());
         }
 
+        $account->setUpdatedAt(new DateTime());
         $account->setLastSignedIn(new DateTime());
 
         $this->em->flush();

diff --git a/src/LAuth/LAuth.php b/src/LAuth/LAuth.php
@@ -91,7 +91,16 @@ protected function getUserFromAccount(Account $socialAccount): User
 
         // Create user if there are none
 
-        $userClass = $this->config->get('user.class');
+        $userClass = $this->config->get('lauth.user_class');
+
+        $existing = $this->em->getRepository($userClass)->findOneBy([
+            'email' => $socialAccount->getEmail()
+        ]);
+
+        if ($existing) {
+            return $existing;
+        }
+
         /** @var User $user */
         $user = new $userClass();
         $user