tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cleanup

pull/169/head
Sebastian Stehle 9 years ago
parent
8c3f269a52
commit
62a0b6d1c4
11 changed files with 29 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Squidex.sln.DotSettings
  2. 3
      src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs
  3. 2
      src/Squidex/Areas/Api/Views/Shared/Docs.cshtml
  4. 3
      src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
  5. 14
      src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs
  6. 3
      src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs
  7. 2
      src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
  8. 5
      src/Squidex/Areas/Portal/Middlewares/PortalRedirectMiddleware.cs
  9. 6
      src/Squidex/Config/Authentication/AuthenticationServices.cs
  10. 4
      src/Squidex/Config/Domain/SerializationServices.cs
  11. 2
      src/Squidex/Config/Orleans/ClientServices.cs

6
Squidex.sln.DotSettings
View File

@ -8,17 +8,22 @@
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ehtml/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ehtml/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ejs/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ejs/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ejson/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ejson/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Escss/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Escss/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ets/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ets/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002E_002A/@EntryIndexedValue">True</s:Boolean>
@ -27,6 +32,7 @@
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Header/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Header"&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Namespaces/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Namespaces"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Typescript/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Typescript"&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;/Profile&gt;</s:String>

3
src/Squidex/Areas/Api/Controllers/Content/Generator/SchemasSwaggerGenerator.cs
View File

@ -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<MyUrlsOptions> 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();

2
src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml → src/Squidex/Areas/Api/Views/Shared/Docs.cshtml
View File

@ -35,6 +35,6 @@
<body>
<redoc spec-url="@Url.Content(Model.Specification)"></redoc>
<script src="/scripts/redoc.min.js"></script>
<script src="~/scripts/redoc.min.js"></script>
</body>
</html>

3
src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
View File

@ -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
{

14
src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs
View File

@ -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<List<ExternalProvider>> GetExternalProvidersAsync(this SignInManager<IUser> 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;
}
}
}

3
src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs
View File

@ -180,8 +180,7 @@ namespace Squidex.Areas.IdentityServer.Controllers.Profile
private async Task<ProfileVM> 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
{

2
src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
View File

@ -94,7 +94,7 @@
}
</div>
@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count() == 1)
@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count == 1)
{
<script>
var redirectButtons = document.getElementsByClassName("redirect-button");

5
src/Squidex/Areas/Portal/Middlewares/PortalRedirectMiddleware.cs
View File

@ -16,12 +16,9 @@ namespace Squidex.Areas.Portal.Middlewares
public sealed class PortalRedirectMiddleware
{
private readonly IAppPlanBillingManager appPlansBillingManager;
private readonly RequestDelegate next;
public PortalRedirectMiddleware(RequestDelegate next, IAppPlanBillingManager appPlansBillingManager)
public PortalRedirectMiddleware(IAppPlanBillingManager appPlansBillingManager)
{
this.next = next;
this.appPlansBillingManager = appPlansBillingManager;
}

6
src/Squidex/Config/Authentication/AuthenticationServices.cs
View File

@ -57,13 +57,13 @@ namespace Squidex.Config.Authentication
authBuilder.AddOpenIdConnect(options =>
{
options.Authority = apiAuthorityUrl;
options.ClientId = Constants.InternalClientId;
options.ClientSecret = Constants.InternalClientSecret;
options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
options.Authority = apiAuthorityUrl;
options.RequireHttpsMetadata = identityOptions.RequiresHttps;
options.Scope.Add(Constants.RoleScope);
options.SaveTokens = true;
options.Scope.Add(Constants.RoleScope);
options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
});
}

4
src/Squidex/Config/Domain/SerializationServices.cs
View File

@ -35,7 +35,7 @@ namespace Squidex.Config.Domain
get { return SerializerSettings; }
}
private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling)
private static void ConfigureJson(JsonSerializerSettings settings, TypeNameHandling typeNameHandling)
{
settings.SerializationBinder = new TypeNameSerializationBinder(TypeNameRegistry);
@ -64,8 +64,6 @@ namespace Squidex.Config.Domain
settings.TypeNameHandling = typeNameHandling;
settings.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
return settings;
}
static SerializationServices()

2
src/Squidex/Config/Orleans/ClientServices.cs
View File

@ -31,8 +31,6 @@ namespace Squidex.Config.Orleans
services.AddSingletonAs(c =>
{
var configuration = ClientConfiguration.LocalhostSilo();
var client = new ClientBuilder()
.UseConfiguration(ClientConfiguration.LocalhostSilo().WithJsonSerializer())
.UseDashboard()

Write Preview
Loading…
Cancel
Save