From 1d1033018559d0612caa558528b5e451bb57724b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 30 Nov 2019 08:26:48 +0100 Subject: [PATCH] Formatting. --- .../Areas/IdentityServer/Config/IdentityServerServices.cs | 1 + .../Config/Authentication/MicrosoftAuthenticationServices.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs index 74554242a..5231b29e7 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs +++ b/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs @@ -77,6 +77,7 @@ namespace Squidex.Areas.IdentityServer.Config services.AddIdentityServer(options => { options.UserInteraction.ErrorUrl = "/error/"; + if (!string.IsNullOrWhiteSpace(urlsOptions.BaseUrl)) { options.PublicOrigin = urlsOptions.BaseUrl; diff --git a/backend/src/Squidex/Config/Authentication/MicrosoftAuthenticationServices.cs b/backend/src/Squidex/Config/Authentication/MicrosoftAuthenticationServices.cs index d03814afa..aabd68f12 100644 --- a/backend/src/Squidex/Config/Authentication/MicrosoftAuthenticationServices.cs +++ b/backend/src/Squidex/Config/Authentication/MicrosoftAuthenticationServices.cs @@ -27,6 +27,7 @@ namespace Squidex.Config.Authentication if (!string.IsNullOrEmpty(tenantId)) { var resource = "https://graph.microsoft.com"; + options.AuthorizationEndpoint = $"https://login.microsoftonline.com/{tenantId}/oauth2/authorize?resource={resource}"; options.TokenEndpoint = $"https://login.microsoftonline.com/{tenantId}/oauth2/token?resource={resource}"; }