Add AuthFeature plugin ctor overloads

mythz · mythz · commit ee3e0f3ed097 · 2021-09-09T02:11:41.000+08:00
diff --git a/src/ServiceStack.Desktop/ServiceStack.Desktop.Source.csproj b/src/ServiceStack.Desktop/ServiceStack.Desktop.Source.csproj
@@ -18,12 +18,12 @@
         <ProjectReference Include="..\ServiceStack.Common\ServiceStack.Common.Source.csproj" />
         <ProjectReference Include="..\ServiceStack\ServiceStack.Source.csproj" />
         <ProjectReference Include="..\..\..\ServiceStack.Text\src\ServiceStack.Text\ServiceStack.Text.csproj" />
-        
-        <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-        <PackageReference Include="PInvoke.User32" Version="0.6.49" />
-        <PackageReference Include="PInvoke.Kernel32" Version="0.6.49" />
-        <PackageReference Include="PInvoke.Gdi32" Version="0.6.49" />
-        <PackageReference Include="PInvoke.Shell32" Version="0.6.49" />
+
+        <PackageReference Include="System.Drawing.Common" Version="4.7.2" />
+        <PackageReference Include="PInvoke.User32" Version="0.7.104" />
+        <PackageReference Include="PInvoke.Kernel32" Version="0.7.104" />
+        <PackageReference Include="PInvoke.Gdi32" Version="0.7.104" />
+        <PackageReference Include="PInvoke.Shell32" Version="0.7.104" />
     </ItemGroup>
 
 </Project>
diff --git a/src/ServiceStack/AuthFeature.cs b/src/ServiceStack/AuthFeature.cs
@@ -77,6 +77,16 @@ public static void NoExternalRedirects(IRequest req, string redirect)
         /// What queryString param to capture redirect param on
         /// </summary>
         public string HtmlRedirectReturnParam { get; set; } = LocalizedStrings.Redirect;
+        
+        /// <summary>
+        /// Redirect path to when Authenticated User requires 2FA
+        /// </summary>
+        public string HtmlRedirectLoginWith2Fa { get; set; }
+        
+        /// <summary>
+        /// Redirect path to when User is Locked out
+        /// </summary>
+        public string HtmlRedirectLockout { get; set; }
 
         /// <summary>
         /// Whether to only capture return path or absolute URL (default)
@@ -206,7 +216,9 @@ public AuthFeature AddAuthenticateAliasRoutes()
             Permissions = new List<string>(),
             UserAuthId = "0",
         };
-        
+
+        public AuthFeature(IAuthProvider authProvider) : this(() => new AuthUserSession(), new []{ authProvider }) {}
+        public AuthFeature(IAuthProvider[] authProviders) : this(() => new AuthUserSession(), authProviders) {}
         public AuthFeature(Func<IAuthSession> sessionFactory, IAuthProvider[] authProviders, string htmlRedirect = null)
         {
             this.sessionFactory = sessionFactory;
diff --git a/src/ServiceStack/ErrorMessages.cs b/src/ServiceStack/ErrorMessages.cs
@@ -30,6 +30,7 @@ public static class ErrorMessages
         public static string PrimaryKeyRequired = "Primary Key is Required";
         public static string InvalidAccessToken = "AccessToken is Invalid";
         public static string SessionIdEmpty = "Session not set. Is Session being set in RequestFilters?";
+        public static string Requires2FA = "Session not set. Is Session being set in RequestFilters?";
 
         public static string InvalidRole = "Invalid Role";
         public static string InvalidPermission = "Invalid Permission";
