🔨 (identity) 给RefreshToken增加滑动过期选项 #129

dotnetcore · Mar 1, 2020 · 949ddd2 · 949ddd2
1 parent 864a57f
commit 949ddd2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/build/OSharpNS.nuspec b/build/OSharpNS.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>OSharpNS</id>
-    <version>3.1.2-preview2.29</version>
+    <version>3.1.2-preview3-01</version>
     <title>OSharpFramework(.NETCoreApp3.1)</title>
     <authors>柳柳软件(66soft.net)</authors>
     <owners>柳柳软件(66soft.net)</owners>
@@ -15,11 +15,11 @@
     <tags>osharp osharpns</tags>
     <dependencies>
       <group targetFramework=".NETCoreApp3.1">
-        <dependency id="OSharpNS.Core" version="3.1.2-preview2.29" />
-        <dependency id="OSharpNS.EntityFrameworkCore" version="3.1.2-preview2.29" />
-        <dependency id="OSharpNS.AutoMapper" version="3.1.2-preview2.29" />
-        <dependency id="OSharpNS.AspNetCore" version="3.1.2-preview2.29" />
-        <dependency id="OSharpNS.Log4Net" version="3.1.2-preview2.29" />
+        <dependency id="OSharpNS.Core" version="3.1.2-preview3-01" />
+        <dependency id="OSharpNS.EntityFrameworkCore" version="3.1.2-preview3-01" />
+        <dependency id="OSharpNS.AutoMapper" version="3.1.2-preview3-01" />
+        <dependency id="OSharpNS.AspNetCore" version="3.1.2-preview3-01" />
+        <dependency id="OSharpNS.Log4Net" version="3.1.2-preview3-01" />
       </group>
     </dependencies>
   </metadata>

diff --git a/build/version.props b/build/version.props
@@ -3,7 +3,7 @@
     <VersionMain>3.1</VersionMain>
     <VersionPrefix>2</VersionPrefix>
     <VersionSuffix>-preview</VersionSuffix>
-    <VersionSuffixVersion>2.29</VersionSuffixVersion>
+    <VersionSuffixVersion>3-01</VersionSuffixVersion>
     <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
     <AssemblyVersion>$(VersionMain).$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionMain).$(VersionSuffixVersion)</FileVersion>

diff --git a/samples/web/Liuliu.Demo.Web/appsettings.Development.json b/samples/web/Liuliu.Demo.Web/appsettings.Development.json
@@ -22,7 +22,7 @@
       //,
       "MySql": {
         "DbContextTypeName": "OSharp.Entity.DefaultDbContext,OSharp.EntityFrameworkCore",
-        "ConnectionString": "Server=127.0.0.1;UserId=root;Password=abc123456;Database=osharpns-dev2;charset='utf8';Allow User Variables=True",
+        "ConnectionString": "Server=127.0.0.1;UserId=root;Password=abc123456;Database=osharpns-dev;charset='utf8';Allow User Variables=True",
         "DatabaseType": "MySql",
         "LazyLoadingProxiesEnabled": true,
         "AuditEntityEnabled": true,
@@ -87,7 +87,8 @@
       "Audience": "osharp angular demo",
       "Secret": "{8619F7C3-B53C-4B85-99F0-983D351ECD82}",
       "AccessExpireMins": 5,
-      "RefreshExpireMins": 10080 // 7天
+      "RefreshExpireMins": 10080, // 7天
+      "IsRefreshAbsoluteExpired": false
     },
     "Redis": {
       "Configuration": "localhost",

diff --git a/src/OSharp.Identity/Authentication/JwtBearer/JwtBearerService.cs b/src/OSharp.Identity/Authentication/JwtBearer/JwtBearerService.cs
@@ -203,7 +203,7 @@ await _provider.ExecuteScopedWorkAsync(async provider =>
             }
             else
             {
-                if (refreshToken == null)
+                if (refreshToken == null || !options.IsRefreshAbsoluteExpired)
                 {
                     double minutes = options.RefreshExpireMins > 0 ? options.RefreshExpireMins : 10080; // 默认7天
                     expires = now.AddMinutes(minutes);

diff --git a/src/OSharp/Core/Options/JwtOptions.cs b/src/OSharp/Core/Options/JwtOptions.cs
@@ -38,5 +38,10 @@ public class JwtOptions
         /// 获取或设置 RefreshToken有效期分钟数
         /// </summary>
         public double RefreshExpireMins { get; set; }
+
+        /// <summary>
+        /// 获取或设置 RefreshToken是否绝对过期
+        /// </summary>
+        public bool IsRefreshAbsoluteExpired { get; set; } = true;
     }
 }