fix(oidc): allow configure auto token refresh

sitkoru · Apr 28, 2022 · 39da17f · 39da17f
1 parent 6f3617e
commit 39da17f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Sitko.Core.Auth.IdentityServer/OidcIdentityServerModule.cs b/src/Sitko.Core.Auth.IdentityServer/OidcIdentityServerModule.cs
@@ -11,7 +11,8 @@ public class OidcIdentityServerModule : IdentityServerModule<OidcIdentityServerM
         public override string OptionsKey => "Auth:IdentityServer:Oidc";
 
         protected override void ConfigureAuthentication(AuthenticationBuilder authenticationBuilder,
-            OidcIdentityServerModuleOptions startupOptions) =>
+            OidcIdentityServerModuleOptions startupOptions)
+        {
             authenticationBuilder.AddOpenIdConnect(startupOptions.ChallengeScheme, options =>
             {
                 options.SignInScheme = startupOptions.SignInScheme;
@@ -35,9 +36,14 @@ protected override void ConfigureAuthentication(AuthenticationBuilder authentica
                         options.Scope.Add(scope);
                     }
                 }
-            }).AddAutomaticTokenManagement(options =>
-            {
-                options.Scheme = startupOptions.SignInScheme;
             });
+            if (startupOptions.AutoRefreshTokens)
+            {
+                authenticationBuilder.AddAutomaticTokenManagement(options =>
+                {
+                    startupOptions.ConfigureAutoRefreshTokens?.Invoke(options);
+                });
+            }
+        }
     }
 }
diff --git a/src/Sitko.Core.Auth.IdentityServer/OidcIdentityServerModuleOptions.cs b/src/Sitko.Core.Auth.IdentityServer/OidcIdentityServerModuleOptions.cs
@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using FluentValidation;
 using IdentityModel;
+using Sitko.Core.Auth.IdentityServer.Tokens;
 
 namespace Sitko.Core.Auth.IdentityServer
 {
@@ -16,6 +18,8 @@ public class OidcIdentityServerModuleOptions : IdentityServerAuthOptions
         public override bool RequiresCookie => true;
         public override string SignInScheme => "Cookies";
         public override string ChallengeScheme => "oidc";
+        public bool AutoRefreshTokens { get; set; } = true;
+        public Action<AutomaticTokenManagementOptions>? ConfigureAutoRefreshTokens { get; set; }
     }
 
     public class OidcAuthOptionsValidator : IdentityServerAuthOptionsValidator<OidcIdentityServerModuleOptions>