social-login: Add fallback with ignore cases email search

yona-projects · Apr 15, 2017 · 90dc623 · 90dc623
1 parent d071e97
commit 90dc623
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/User.java b/app/models/User.java
@@ -320,6 +320,11 @@ public static User findByEmail(String email) {
             return subEmail.user;
         }
 
+        User fallback = find.where().ieq("email", email).findUnique();
+        if (fallback != null) {
+            return fallback;
+        }
+
         User anonymous = new NullUser();
         anonymous.email = email;
         return anonymous;

diff --git a/app/service/YonaUserServicePlugin.java b/app/service/YonaUserServicePlugin.java
@@ -66,7 +66,7 @@ private boolean setStatusLoggedIn(@Nonnull UserCredential u, BasicIdentity authU
 		User localUser = User.findByEmail(authUser.getEmail()); //find with oAuth email address
 		if(localUser.isAnonymous()){
 			localUser = User.findByEmail(u.email);  // 1st trial: same email address with local user credential
-			if(localUser == null) localUser =  User.find.byId(u.user.id); // 2nd trial: linked user
+			if(localUser == null || localUser.isAnonymous()) localUser =  User.find.byId(u.user.id); // 2nd trial: linked user
 			if(localUser == null) localUser = User.anonymous;
 		}