From eb750f21f214692703e69eade53dbd01f08b7881 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 9 Jul 2019 15:40:48 +0200 Subject: [PATCH] Constant for frontend client. --- src/Squidex.Domain.Apps.Entities/Context.cs | 3 ++- src/Squidex.Shared/DefaultClients.cs | 14 ++++++++++++++ src/Squidex.Web/Constants.cs | 3 ++- src/Squidex/appsettings.json | 2 +- .../Contents/ContentQueryServiceTests.cs | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 src/Squidex.Shared/DefaultClients.cs diff --git a/src/Squidex.Domain.Apps.Entities/Context.cs b/src/Squidex.Domain.Apps.Entities/Context.cs index 2dea67ac7..106b54f15 100644 --- a/src/Squidex.Domain.Apps.Entities/Context.cs +++ b/src/Squidex.Domain.Apps.Entities/Context.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Security.Claims; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Security; +using Squidex.Shared; using Squidex.Shared.Identity; namespace Squidex.Domain.Apps.Entities @@ -39,7 +40,7 @@ namespace Squidex.Domain.Apps.Entities public bool IsFrontendClient { - get { return User != null && User.IsInClient("squidex-frontend"); } + get { return User != null && User.IsInClient(DefaultClients.Frontend); } } } } diff --git a/src/Squidex.Shared/DefaultClients.cs b/src/Squidex.Shared/DefaultClients.cs new file mode 100644 index 000000000..554685565 --- /dev/null +++ b/src/Squidex.Shared/DefaultClients.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Shared +{ + public static class DefaultClients + { + public const string Frontend = "squidex-frontend"; + } +} diff --git a/src/Squidex.Web/Constants.cs b/src/Squidex.Web/Constants.cs index 770c8a435..0c10bd520 100644 --- a/src/Squidex.Web/Constants.cs +++ b/src/Squidex.Web/Constants.cs @@ -6,6 +6,7 @@ // ========================================================================== using Squidex.Infrastructure; +using Squidex.Shared; namespace Squidex.Web { @@ -31,7 +32,7 @@ namespace Squidex.Web public static readonly string ProfileScope = "squidex-profile"; - public static readonly string FrontendClient = "squidex-frontend"; + public static readonly string FrontendClient = DefaultClients.Frontend; public static readonly string InternalClientId = "squidex-internal"; diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index be7ea89eb..d60842db4 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -497,7 +497,7 @@ }, /*" - * A list of configuration valeus that should be exposed from the info endpoint and in the UI. + * A list of configuration values that should be exposed from the info endpoint and in the UI. */ "exposedConfiguration": { "version": "squidex:version" diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs index 00a7d83f5..b98cdea04 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs @@ -465,7 +465,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { if (isFrontend) { - identity.AddClaim(new Claim(OpenIdClaims.ClientId, "squidex-frontend")); + identity.AddClaim(new Claim(OpenIdClaims.ClientId, DefaultClients.Frontend)); } if (allowSchema)