Skip to content

Commit 4fb0a4d

Browse files
habarthierry-huehabarthierry-hue
committed
Update the template project
Fix the SQL Sugar project
1 parent b904591 commit 4fb0a4d

63 files changed

Lines changed: 548 additions & 861 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/console/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ViewBag.Title = AuthenticateConsoleResource.title;
1010
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
1111
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
12-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
12+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1313
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1414
}
1515

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/email/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ViewBag.Title = AuthenticateEmailResource.title;
1010
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
1111
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
12-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
12+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1313
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1414
}
1515

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/mobile/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
ViewBag.Title = AuthenticateMobileResource.auth_title;
99
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
1010
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
11-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
11+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1212
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1313
}
1414

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/otp/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ViewBag.Title = AuthenticateOtpResource.title;
1010
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
1111
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
12-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
12+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1313
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1414
}
1515

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/pwd/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ViewBag.Title = AuthenticatePasswordResource.title;
66
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
77
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
8-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
8+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
99
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1010
}
1111

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/sms/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
ViewBag.Title = AuthenticateSmsResource.title;
99
Layout = "~/Views/Shared/_AuthenticateLayout.cshtml";
1010
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
11-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
11+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1212
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1313
}
1414

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Areas/webauthn/Views/Authenticate/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
var makeAssertionsOptionsUrl = Url.Action("MakeAssertionOptions", "Authenticate", new { area = "webauthn" });
1111
var authenticateUrl = Url.Action("Index", "Authenticate", new { area = "webauthn" });
1212
var returnUrl = Microsoft.AspNetCore.Http.Extensions.UriHelper.GetDisplayUrl(Context.Request);
13-
var realm = SimpleIdServer.IdServer.Middlewares.RealmContext.Instance()?.Realm;
13+
var realm = SimpleIdServer.IdServer.Helpers.RealmContext.Instance()?.Realm;
1414
var registationUrl = $"{(string.IsNullOrWhiteSpace(realm) ? "/" : $"/{realm}/")}Registration?redirectUrl={returnUrl}&workflowName={Model.RegistrationWorkflow?.Name}";
1515
}
1616

‎src/IdServer/SimpleIdServer.IdServer.SqlSugar.Startup/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
.UseSamlIdp()
139139
.UseGotifyNotification()
140140
.UseAutomaticConfiguration();
141-
SeedData(app);
141+
// SeedData(app);
142142
app.Run();
143143

144144
void ConfigureIdServer(IServiceCollection services)
@@ -148,7 +148,7 @@ void ConfigureIdServer(IServiceCollection services)
148148
if (!string.IsNullOrWhiteSpace(identityServerConfiguration.SessionCookieNamePrefix))
149149
cb.SessionCookieName = identityServerConfiguration.SessionCookieNamePrefix;
150150
cb.Authority = identityServerConfiguration.Authority;
151-
cb.IsPasswordEncodeInBase64 = true;
151+
cb.IsPasswordEncodeInBase64 = false;
152152
}, cookie: c =>
153153
{
154154
if (!string.IsNullOrWhiteSpace(identityServerConfiguration.AuthCookieNamePrefix))

‎src/IdServer/SimpleIdServer.IdServer.Startup/IdServerConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public class IdServerConfiguration
277277
{
278278
Id = Guid.NewGuid().ToString(),
279279
IsSubordinate = false,
280-
Realm = IdServer.Constants.DefaultRealm,
280+
Realm = SimpleIdServer.IdServer.Constants.DefaultRealm,
281281
Sub = "http://localhost:7000",
282282
CreateDateTime = DateTime.UtcNow
283283
}

‎src/IdServer/SimpleIdServer.IdServer.Startup/appsettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"SCIMBaseUrl": "https://localhost:5003",
1212
"Authority": "https://localhost:5001",
1313
"DistributedCacheConfiguration": {
14-
"Type": "INMEMORY",
14+
"Type": "SQLSERVER",
1515
"ConnectionString": "Data Source=.;Initial Catalog=IdServer;Integrated Security=True;TrustServerCertificate=True",
1616
"InstanceName": ""
1717
},
1818
"StorageConfiguration": {
19-
"Type": "INMEMORY",
19+
"Type": "SQLSERVER",
2020
"ConnectionString": "Data Source=.;Initial Catalog=IdServer;Integrated Security=True;TrustServerCertificate=True"
2121
},
2222
"Facebook": {

0 commit comments

Comments
 (0)