update cache logic + UT

AzureAD · Aug 29, 2023 · 0b07e1c · 0b07e1c
1 parent cd92d59
commit 0b07e1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/internal/base/internal/storage/storage.go b/apps/internal/base/internal/storage/storage.go
@@ -261,7 +261,7 @@ func (m *Manager) readAccessToken(homeID string, envAliases []string, realm, cli
 	// an issue, however if it does become a problem then we know where to look.
 	for _, at := range m.contract.AccessTokens {
 		if at.HomeAccountID == homeID && at.Realm == realm && at.ClientID == clientID {
-			if at.TokenType == tokenType && at.AuthnSchemeKeyID == authnSchemeKeyID || at.TokenType == "" {
+			if (at.TokenType == tokenType && at.AuthnSchemeKeyID == authnSchemeKeyID) || (at.TokenType == "" && (tokenType == "" || tokenType == "Bearer")) {
 				if checkAlias(at.Environment, envAliases) {
 					if isMatchingScopes(scopes, at.Scopes) {
 						return at

diff --git a/apps/internal/base/internal/storage/storage_test.go b/apps/internal/base/internal/storage/storage_test.go
@@ -180,14 +180,14 @@ func TestReadAccessToken(t *testing.T) {
 	if diff := pretty.Compare(testAccessTokenWithoutTokenType, retAccessToken2); diff != "" {
 		t.Fatalf("Returned access token is not the same as expected access token: -want/+got:\n%s", diff)
 	}
-	// Test that we can find fallback to an empty token type in the cache when the token type is not provided
+	// Test that we can find fallback to an empty token type in the cache when the token type is Bearer (defaulted)
 	retAccessToken2 = storageManager.readAccessToken(
 		"hid2",
 		[]string{"hello", "env2", "test"},
 		"realm2",
 		"cid2",
 		[]string{"user.read", "openid"},
-		"tokenType",
+		"Bearer",
 		"",
 	)
 	if diff := pretty.Compare(testAccessTokenWithoutTokenType, retAccessToken2); diff != "" {