Fixed cache key repetition (swoft-cloud/swoft-component#197)

swoft-cloud · Sep 7, 2018 · 4d3efab · 4d3efab
1 parent 5aba246
commit 4d3efab
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/AuthManager.php b/src/AuthManager.php
@@ -107,7 +107,7 @@ public function isLoggedIn()
      * @param array $data
      * @return AuthSession
      */
-    public function login(string $accountTypeName, array $data):AuthSession
+    public function login(string $accountTypeName, array $data): AuthSession
     {
         if (!$account = $this->getAccountType($accountTypeName)) {
             throw new AuthException(ErrorCode::AUTH_INVALID_ACCOUNT_TYPE);
@@ -121,7 +121,7 @@ public function login(string $accountTypeName, array $data):AuthSession
         if ($this->cacheEnable === true) {
             try {
                 $this->getCacheClient()->set(
-                    $this->getCacheKey($result->getIdentity()),
+                    $this->getCacheKey($result->getIdentity(), $result->getExtendedData()),
                     $session->getToken(),
                     $session->getExpirationTime()
                 );
@@ -133,9 +133,12 @@ public function login(string $accountTypeName, array $data):AuthSession
         return $session;
     }
 
-    protected function getCacheKey($identity)
+    protected function getCacheKey(string $identity, array $extendedData)
     {
-        return $this->prefix . $identity;
+        if (empty($extendedData)) {
+            return $this->prefix . $identity;
+        }
+        return $this->prefix . $identity . (string)$extendedData[0];
     }
 
     /**
@@ -218,7 +221,7 @@ public function getCacheClient()
      * @return bool
      * @throws AuthException
      */
-    public function authenticateToken(string $token):bool
+    public function authenticateToken(string $token): bool
     {
         try {
             /** @var AuthSession $session */
@@ -245,7 +248,7 @@ public function authenticateToken(string $token):bool
 
         if ($this->cacheEnable === true) {
             try {
-                $cache = $this->getCacheClient()->get($this->getCacheKey($session->getIdentity()));
+                $cache = $this->getCacheClient()->get($this->getCacheKey($session->getIdentity(), $session->getExtendedData()));
                 if (!$cache || $cache !== $token) {
                     throw new AuthException(ErrorCode::AUTH_TOKEN_INVALID);
                 }