From f1dc5cf5834bb6cb723052b05d3568567d2dcbca Mon Sep 17 00:00:00 2001
From: dencoded <33698537+dencoded@users.noreply.github.com>
Date: Thu, 29 Aug 2019 12:34:07 -0400
Subject: [PATCH] addressing PR comments

---
 gateway/auth_manager.go | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gateway/auth_manager.go b/gateway/auth_manager.go
index 64aba95102d..216e0eb2f7f 100644
--- 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)
 		}
 	}