From 812f579507ad2963337743e97ff3744f048f7db0 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Thu, 16 Mar 2023 08:26:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyOC.ReplaceAction/ActionReplaceOption.cs | 3 --- src/Modules/EasyOC.ReplaceAction/Startup.cs | 1 - .../EasyOC.Users/Controllers/EocAccountController.cs | 10 ++++------ .../Controllers/EocOpenIdAccessController.cs | 2 +- .../Handlers/EocScriptExternalLoginEventHandler.cs | 2 -- src/Modules/EasyOC.Users/Models/UpdateUserContext.cs | 1 - src/Modules/EasyOC.Users/Startup.cs | 2 +- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs b/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs index d8ddc2e..ac800f4 100644 --- a/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs +++ b/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs @@ -1,7 +1,4 @@ using Microsoft.AspNetCore.Mvc.Controllers; -using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; namespace EasyOC.ReplaceAction diff --git a/src/Modules/EasyOC.ReplaceAction/Startup.cs b/src/Modules/EasyOC.ReplaceAction/Startup.cs index 0f5c24d..df06566 100644 --- a/src/Modules/EasyOC.ReplaceAction/Startup.cs +++ b/src/Modules/EasyOC.ReplaceAction/Startup.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -using System; namespace EasyOC.ReplaceAction { diff --git a/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs b/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs index 4e90c97..49014d4 100644 --- a/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs +++ b/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs @@ -1,3 +1,4 @@ +using EasyOC.Users.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.DataProtection; @@ -8,25 +9,22 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; +using OrchardCore; using OrchardCore.DisplayManagement.Notify; using OrchardCore.Entities; using OrchardCore.Modules; using OrchardCore.Scripting; using OrchardCore.Settings; using OrchardCore.Users; +using OrchardCore.Users.Controllers; using OrchardCore.Users.Events; using OrchardCore.Users.Handlers; using OrchardCore.Users.Models; using OrchardCore.Users.Services; using OrchardCore.Users.ViewModels; -using OrchardCore.Workflows.Services; using System.Security.Claims; -using SignInResult = Microsoft.AspNetCore.Identity.SignInResult; - using IWorkflowManager = OrchardCore.Workflows.Services.IWorkflowManager; -using OrchardCore; -using OrchardCore.Users.Controllers; -using EasyOC.Users.Models; +using SignInResult = Microsoft.AspNetCore.Identity.SignInResult; namespace EasyOC.Users.Controllers { diff --git a/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs b/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs index 34f7e49..c3621d9 100644 --- a/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs +++ b/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs @@ -46,6 +46,6 @@ public async Task Logout() } return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme); - } + } } } diff --git a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs index 1559f18..be29052 100644 --- a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs +++ b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using OrchardCore.Entities; using OrchardCore.Scripting; @@ -10,7 +9,6 @@ using OrchardCore.Users; using OrchardCore.Users.Handlers; using OrchardCore.Users.Models; -using OrchardCore.Workflows.Helpers; namespace EasyOC.Users.Handlers { diff --git a/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs b/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs index b84bf7f..96f262a 100644 --- a/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs +++ b/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json.Linq; using OrchardCore.Users; using OrchardCore.Users.Handlers; -using System.Security.Claims; namespace EasyOC.Users.Models { diff --git a/src/Modules/EasyOC.Users/Startup.cs b/src/Modules/EasyOC.Users/Startup.cs index 6ecde26..3c60563 100644 --- a/src/Modules/EasyOC.Users/Startup.cs +++ b/src/Modules/EasyOC.Users/Startup.cs @@ -30,7 +30,7 @@ public override void ConfigureServices(IServiceCollection services) nameof(EocAccountController.LinkExternalLogin), nameof(EocAccountController.ExternalLoginCallback), nameof(EocAccountController.RegisterExternalLogin) - ); + ); } } From 9c9c1207e6809a5dcf31d284d1c9a2040af55311 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Sat, 8 Apr 2023 20:49:44 +0800 Subject: [PATCH 2/2] use full redirect url --- src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json b/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json index c0101f7..cf0a164 100644 --- a/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json +++ b/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json @@ -41,7 +41,7 @@ "name": "OpenIdApplication", "ClientId": "SwaggerClient", "ConsentType": "implicit", - "RedirectUris": "/Swagger/oauth2-redirect.html", + "RedirectUris": "http://localhost/Swagger/oauth2-redirect.html", "AllowAuthorizationCodeFlow": true, "AllowLogoutEndpoint": false, "AllowPasswordFlow": false,