commit commit

src/main/java/com/example/afrishop_v3/repository/UserRepository.java

@@ -11,6 +11,7 @@ public interface UserRepository extends PagingAndSortingRepository<TbCfUserInfo,
     Optional<TbCfUserInfo> findFirstByAccount(String s);
     boolean existsByAccount(String s);
     Optional<TbCfUserInfo> findByFirebaseUid(String s);
+    Optional<TbCfUserInfo> findFirstByFirebaseUidOrAccount(String firebaseUid, String account);
     boolean existsByFirebaseUid(String s);
     Optional<TbCfUserInfo> findFirstByEmail(String s);
     Optional<TbCfUserInfo> findByCode(String s);

src/main/java/com/example/afrishop_v3/security/services/AuthenticationUser.java

@@ -21,7 +21,8 @@ public class AuthenticationUser implements IAuthenticationFacade {
     }
 
     public TbCfUserInfo user(){
-        return repository.findByFirebaseUid(getAuthentication().getName()).orElseGet(null);
+        String name = getAuthentication().getName();
+        return repository.findFirstByFirebaseUidOrAccount(name,name).orElseGet(null);
     }
 
     public String userId(){