Merge pull request #14 from EasyOC/MethodInfoName

fix SwaggerUI Auth redirct url
EasyOC · Apr 8, 2023 · f3b8be7 · f3b8be7
2 parents 2bed25c + 9c9c120
commit f3b8be7
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 16 deletions.
diff --git 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
@@ -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.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,

diff --git 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
@@ -46,6 +46,6 @@ public async Task<IActionResult> Logout()
             }
 
             return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        } 
+        }
     }
 }
diff --git a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs
@@ -2,15 +2,13 @@
 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;
 using OrchardCore.Settings;
 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
@@ -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
@@ -30,7 +30,7 @@ public override void ConfigureServices(IServiceCollection services)
                 nameof(EocAccountController.LinkExternalLogin),
                 nameof(EocAccountController.ExternalLoginCallback),
                 nameof(EocAccountController.RegisterExternalLogin)
-                ); 
+                );
         }
 
     }