Browse Source

Fix auth.

pull/617/head
Sebastian 5 years ago
parent
commit
3e44ac21b9
  1. 2
      backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
  2. 7
      backend/src/Squidex/Config/Authentication/IdentityServerServices.cs

2
backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs

@ -124,7 +124,7 @@ namespace Squidex.Areas.Api.Controllers.Assets
if (asset != null && queries.Version > EtagVersion.Any && asset.Version != queries.Version) if (asset != null && queries.Version > EtagVersion.Any && asset.Version != queries.Version)
{ {
asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version); asset = await assetLoader.GetAsync(asset.AppId.Id, asset.Id, queries.Version);
} }
if (asset == null) if (asset == null)

7
backend/src/Squidex/Config/Authentication/IdentityServerServices.cs

@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Squidex.Hosting; using Squidex.Hosting;
using Squidex.Web; using Squidex.Web;
@ -49,7 +50,7 @@ namespace Squidex.Config.Authentication
}); });
} }
authBuilder.Services.Configure<OpenIdConnectOptions>((c, options) => authBuilder.Services.AddSingleton<IPostConfigureOptions<OpenIdConnectOptions>>(c => new PostConfigureOptions<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>
{ {
if (!string.IsNullOrWhiteSpace(identityOptions.AuthorityUrl)) if (!string.IsNullOrWhiteSpace(identityOptions.AuthorityUrl))
{ {
@ -69,7 +70,9 @@ namespace Squidex.Config.Authentication
options.Scope.Add(Constants.ProfileScope); options.Scope.Add(Constants.ProfileScope);
options.Scope.Add(Constants.RoleScope); options.Scope.Add(Constants.RoleScope);
options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
}); }));
authBuilder.AddOpenIdConnect();
authBuilder.AddPolicyScheme(Constants.ApiSecurityScheme, Constants.ApiSecurityScheme, options => authBuilder.AddPolicyScheme(Constants.ApiSecurityScheme, Constants.ApiSecurityScheme, options =>
{ {

Loading…
Cancel
Save