From 3e44ac21b9fba49f1a18d900ae517aa1e226123e Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Thu, 7 Jan 2021 16:10:52 +0100
Subject: [PATCH] Fix auth.

---
 .../Areas/Api/Controllers/Assets/AssetContentController.cs | 2 +-
 .../Config/Authentication/IdentityServerServices.cs        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
index 06197ced9..5f51dd0bc 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
+++ b/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)
             {
-                asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version);
+                asset = await assetLoader.GetAsync(asset.AppId.Id, asset.Id, queries.Version);
             }
 
             if (asset == null)
diff --git a/backend/src/Squidex/Config/Authentication/IdentityServerServices.cs b/backend/src/Squidex/Config/Authentication/IdentityServerServices.cs
index 59370a1c7..56578232c 100644
--- a/backend/src/Squidex/Config/Authentication/IdentityServerServices.cs
+++ b/backend/src/Squidex/Config/Authentication/IdentityServerServices.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Squidex.Hosting;
 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))
                 {
@@ -69,7 +70,9 @@ namespace Squidex.Config.Authentication
                 options.Scope.Add(Constants.ProfileScope);
                 options.Scope.Add(Constants.RoleScope);
                 options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-            });
+            }));
+
+            authBuilder.AddOpenIdConnect();
 
             authBuilder.AddPolicyScheme(Constants.ApiSecurityScheme, Constants.ApiSecurityScheme, options =>
             {