cleanup auth session user token store

Author: brockallen

src/Duende.AccessTokenManagement.OpenIdConnect/AuthenticationSessionUserTokenStore.cs

@@ -102,13 +102,14 @@ public async Task<UserToken> GetTokenAsync(
             {
                 dpopKeyName += $"::{parameters.Resource}";
             }
-            var expiresName = $"{TokenPrefix}expires_at"; string? refreshToken = null;
+            var expiresName = $"{TokenPrefix}expires_at";
             if (!string.IsNullOrEmpty(parameters.Resource))
             {
                 expiresName += $"::{parameters.Resource}";
             }
             const string refreshTokenName = $"{TokenPrefix}{OpenIdConnectParameterNames.RefreshToken}";
 
+            string? refreshToken = null;
             string? accessToken = null;
             string? accessTokenType = null;
             string? dpopKey = null;
@@ -156,7 +157,7 @@ public async Task StoreTokenAsync(
             UserToken token,
             UserTokenRequestParameters? parameters = null)
         {
-            parameters ??= new ();
+            parameters ??= new();
 
             // check the cache in case the cookie was re-issued via StoreTokenAsync
             // we use String.Empty as the key for a null SignInScheme
@@ -173,13 +174,7 @@ public async Task StoreTokenAsync(
             // in case you want to filter certain claims before re-issuing the authentication session
             var transformedPrincipal = await FilterPrincipalAsync(result.Principal!).ConfigureAwait(false);
 
-            var expiresName = "expires_at";
-            if (!string.IsNullOrEmpty(parameters.Resource))
-            {
-                expiresName += $"::{parameters.Resource}";
-            }
-
-            var tokenName = OpenIdConnectParameterNames.AccessToken;
+            var tokenName = $"{TokenPrefix}{OpenIdConnectParameterNames.AccessToken}";
             if (!string.IsNullOrEmpty(parameters.Resource))
             {
                 tokenName += $"::{parameters.Resource}";
@@ -194,7 +189,11 @@ public async Task StoreTokenAsync(
             {
                 dpopKeyName += $"::{parameters.Resource}";
             }
-
+            var expiresName = $"{TokenPrefix}expires_at";
+            if (!string.IsNullOrEmpty(parameters.Resource))
+            {
+                expiresName += $"::{parameters.Resource}";
+            }
             var refreshTokenName = $"{OpenIdConnectParameterNames.RefreshToken}";
 
             if (AppendChallengeSchemeToTokenNames(parameters))
@@ -206,13 +205,13 @@ public async Task StoreTokenAsync(
                 expiresName += $"||{parameters.ChallengeScheme}";
             }
 
-            result.Properties!.Items[$"{TokenPrefix}{tokenName}"] = token.AccessToken;
-            result.Properties!.Items[$"{TokenPrefix}{tokenTypeName}"] = token.AccessTokenType;
+            result.Properties!.Items[tokenName] = token.AccessToken;
+            result.Properties!.Items[tokenTypeName] = token.AccessTokenType;
             if (token.DPoPJsonWebKey != null)
             {
-                result.Properties!.Items[$"{TokenPrefix}{dpopKeyName}"] = token.DPoPJsonWebKey;
+                result.Properties!.Items[dpopKeyName] = token.DPoPJsonWebKey;
             }
-            result.Properties!.Items[$"{TokenPrefix}{expiresName}"] = token.Expiration.ToString("o", CultureInfo.InvariantCulture);
+            result.Properties!.Items[expiresName] = token.Expiration.ToString("o", CultureInfo.InvariantCulture);
 
             if (token.RefreshToken != null)
             {

test/Tests/UserTokenManagementTests.cs

@@ -262,7 +262,7 @@ public async Task Short_token_lifetime_should_trigger_refresh()
         token.ShouldNotBeNull();
         token.IsError.ShouldBeFalse();
         token.AccessToken.ShouldBe("refreshed2_access_token");
-        token.AccessTokenType.ShouldBe("token_type");
+        token.AccessTokenType.ShouldBe("token_type2");
         token.RefreshToken.ShouldBe("refreshed2_refresh_token");
         token.Expiration.ShouldNotBe(DateTimeOffset.MaxValue);
     }