login: Update login user check logic

yona-projects · Sep 3, 2017 · ece3c7d · ece3c7d
1 parent f88d416
commit ece3c7d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -652,7 +652,7 @@ private static User getUserFromSession() {
         if ((userKey != null && Long.valueOf(userId) != null)){
             user = CacheStore.yonaUsers.getIfPresent(Long.valueOf(userId));
         }
-        if (user == null) {
+        if (user == null || user.isLocked()) {
             return invalidSession();
         }
         return user;
@@ -664,7 +664,14 @@ private static User getUserFromContext() {
             return (User) cached;
         }
         initTokenUser();
-        return (User) Http.Context.current().args.get(TOKEN_USER);
+        User foundUser = (User) Http.Context.current().args.get(TOKEN_USER);
+
+        if(foundUser.isLocked()) {
+            processLogout();
+            return User.anonymous;
+        }
+
+        return foundUser;
     }
 
     public static void initTokenUser() {
@@ -692,7 +699,7 @@ private static User getUserFromToken() {
     }
 
     private static User invalidSession() {
-        session().clear();
+        processLogout();
         return User.anonymous;
     }