change cache name & unify cache

apache · May 20, 2021 · b167190 · b167190
1 parent 7d80fd9
commit b167190
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/StandardAuthManager.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/auth/StandardAuthManager.java
@@ -45,7 +45,7 @@ public class StandardAuthManager implements AuthManager {
     private final HugeGraphParams graph;
     private final EventListener eventListener;
     private final Cache<Id, HugeUser> usersCache;
-    private final Cache<Id, String> validateCache;
+    private final Cache<Id, String> pwdCache;
 
     private final EntityManager<HugeUser> users;
     private final EntityManager<HugeGroup> groups;
@@ -60,8 +60,7 @@ public StandardAuthManager(HugeGraphParams graph) {
         this.graph = graph;
         this.eventListener = this.listenChanges();
         this.usersCache = this.cache("users");
-        this.validateCache = CacheManager.instance().cache("validate_pwd");
-        this.validateCache.expire(CACHE_EXPIRE);
+        this.pwdCache = this.cache("users_pwd");
 
         this.users = new EntityManager<>(this.graph, HugeUser.P.USER,
                                          HugeUser::fromVertex);
@@ -76,9 +75,9 @@ public StandardAuthManager(HugeGraphParams graph) {
                                                 HugeAccess::fromEdge);
     }
 
-    private Cache<Id, HugeUser> cache(String prefix) {
+    private <V> Cache<Id, V> cache(String prefix) {
         String name = prefix + "-" + this.graph.name();
-        Cache<Id, HugeUser> cache = CacheManager.instance().cache(name);
+        Cache<Id, V> cache = CacheManager.instance().cache(name);
         cache.expire(CACHE_EXPIRE);
         return cache;
     }
@@ -123,7 +122,7 @@ private void initSchemaIfNeeded() {
 
     private void invalidCache() {
         this.usersCache.clear();
-        this.validateCache.clear();
+        this.pwdCache.clear();
     }
 
     @Override
@@ -349,13 +348,13 @@ public HugeUser matchUser(String name, String password) {
             return null;
         }
 
-        Id id = IdGenerator.of(name);
-        if (password.equals(validateCache.get(id))) {
+        Id id = IdGenerator.of(user.id());
+        if (password.equals(pwdCache.get(id))) {
             return user;
         }
 
         if (StringEncoding.checkPassword(password, user.password())) {
-            validateCache.update(id, password);
+            pwdCache.update(id, password);
             return user;
         }
         return null;