addressing PR comments

TykTechnologies · Aug 29, 2019 · f1dc5cf · f1dc5cf
1 parent 1406145
commit f1dc5cf
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/gateway/auth_manager.go b/gateway/auth_manager.go
@@ -286,20 +286,25 @@ func (b *DefaultSessionManager) SessionDetail(keyName string, hashed bool) (user
 	if hashed {
 		jsonKeyVal, err = b.store.GetRawKey(b.store.GetKeyPrefix() + keyName)
 	} else {
-		// try to get legacy and new format key at once
-		var jsonKeyValList []string
-		jsonKeyValList, err = b.store.GetMultiKey(
-			[]string{
-				keyName,
-				generateToken(b.orgID, keyName),
-			},
-		)
-		// pick the 1st non empty from the returned list
-		for _, val := range jsonKeyValList {
-			if val != "" {
-				jsonKeyVal = val
-				break
+		if storage.TokenOrg(keyName) != b.orgID {
+			// try to get legacy and new format key at once
+			var jsonKeyValList []string
+			jsonKeyValList, err = b.store.GetMultiKey(
+				[]string{
+					keyName,
+					generateToken(b.orgID, keyName),
+				},
+			)
+			// pick the 1st non empty from the returned list
+			for _, val := range jsonKeyValList {
+				if val != "" {
+					jsonKeyVal = val
+					break
+				}
 			}
+		} else {
+			// key is not an imported one
+			jsonKeyVal, err = b.store.GetKey(keyName)
 		}
 	}