diff --git a/Squidex.sln.DotSettings b/Squidex.sln.DotSettings index 48f31adfc..235489b1a 100644 --- a/Squidex.sln.DotSettings +++ b/Squidex.sln.DotSettings @@ -8,17 +8,22 @@ False True + False True + False True + False True + False True + True @@ -27,6 +32,7 @@ + <?xml version="1.0" encoding="utf-16"?><Profile name="Header"><CSUpdateFileHeader>True</CSUpdateFileHeader></Profile> <?xml version="1.0" encoding="utf-16"?><Profile name="Namespaces"><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSUpdateFileHeader>True</CSUpdateFileHeader></Profile> <?xml version="1.0" encoding="utf-16"?><Profile name="Typescript"><JsInsertSemicolon>True</JsInsertSemicolon><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs></Profile> diff --git a/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs index 58263f4b9..82295c3a5 100644 --- a/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs @@ -30,7 +30,6 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator private readonly MyUrlsOptions urlOptions; private SwaggerJsonSchemaGenerator schemaGenerator; private JsonSchemaResolver schemaResolver; - private SwaggerGenerator swaggerGenerator; private SwaggerDocument document; public SchemasSwaggerGenerator(IHttpContextAccessor context, SwaggerSettings settings, IOptions urlOptions) @@ -47,8 +46,6 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator schemaGenerator = new SwaggerJsonSchemaGenerator(settings); schemaResolver = new SwaggerSchemaResolver(document, settings); - swaggerGenerator = new SwaggerGenerator(schemaGenerator, settings, schemaResolver); - GenerateSchemasOperations(schemas, app); await GenerateDefaultErrorsAsync(); diff --git a/src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml b/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml similarity index 93% rename from src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml rename to src/Squidex/Areas/Api/Views/Shared/Docs.cshtml index 15b0e282a..f836e53fd 100644 --- a/src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml +++ b/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml @@ -35,6 +35,6 @@ - + \ No newline at end of file diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs index 9cd2ff034..ed9bf1ac3 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs @@ -158,8 +158,7 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account { var allowPasswordAuth = identityOptions.Value.AllowPasswordAuth; - var externalSchemes = await signInManager.GetExternalAuthenticationSchemesAsync(); - var externalProviders = externalSchemes.Select(x => new ExternalProvider(x.Name, x.DisplayName)).ToList(); + var externalProviders = await signInManager.GetExternalProvidersAsync(); var vm = new LoginVM { diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs b/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs index 09528a0b2..eb54037fa 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs @@ -6,8 +6,11 @@ // All rights reserved. // ========================================================================== +using System.Collections.Generic; +using System.Linq; using System.Security.Claims; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Identity; using Squidex.Shared.Users; @@ -23,5 +26,16 @@ namespace Squidex.Areas.IdentityServer.Controllers return externalLogin; } + + public static async Task> GetExternalProvidersAsync(this SignInManager signInManager) + { + var externalSchemes = await signInManager.GetExternalAuthenticationSchemesAsync(); + var externalProviders = + externalSchemes + .Where(x => x.Name != CookieAuthenticationDefaults.AuthenticationScheme) + .Select(x => new ExternalProvider(x.Name, x.DisplayName)).ToList(); + + return externalProviders; + } } } diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs index 1ea73d5b8..dd08b4dfb 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs @@ -180,8 +180,7 @@ namespace Squidex.Areas.IdentityServer.Controllers.Profile private async Task GetProfileVM(IUser user, ChangeProfileModel model = null, string errorMessage = null, string successMessage = null) { - var externalSchemes = await signInManager.GetExternalAuthenticationSchemesAsync(); - var externalProviders = externalSchemes.Select(x => new ExternalProvider(x.Name, x.DisplayName)).ToList(); + var externalProviders = await signInManager.GetExternalProvidersAsync(); var result = new ProfileVM { diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml index 318d9cc0e..0e80cdc89 100644 --- a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml +++ b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml @@ -94,7 +94,7 @@ } -@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count() == 1) +@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count == 1) {