From b630ddaf73975eef360566632e8a2fa96d3f0baf Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 14 Mar 2019 14:24:22 +0300 Subject: [PATCH] Use GUID for editionid. --- .../Volo/Abp/Features/EditionFeatureValueProvider.cs | 2 +- .../Volo/Abp/Features/TenantFeatureValueProvider.cs | 2 +- .../Security/Principal/AbpClaimsIdentityExtensions.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs index c84f2d52c6..8ce1332ecb 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs @@ -26,7 +26,7 @@ namespace Volo.Abp.Features return null; } - return await FeatureStore.GetOrNullAsync(feature.Name, Name, editionId); + return await FeatureStore.GetOrNullAsync(feature.Name, Name, editionId.Value.ToString("N")); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs index 73b07b6e88..211174516c 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.Features public override async Task GetOrNullAsync(FeatureDefinition feature) { - return await FeatureStore.GetOrNullAsync(feature.Name, Name, CurrentTenant.Id?.ToString()); + return await FeatureStore.GetOrNullAsync(feature.Name, Name, CurrentTenant.Id?.ToString("N")); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs index d6b7189542..694fb7baa6 100644 --- a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs +++ b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs @@ -92,7 +92,7 @@ namespace System.Security.Principal return clientIdOrNull.Value; } - public static string FindEditionId([NotNull] this ClaimsPrincipal principal) + public static Guid? FindEditionId([NotNull] this ClaimsPrincipal principal) { Check.NotNull(principal, nameof(principal)); @@ -102,10 +102,10 @@ namespace System.Security.Principal return null; } - return editionIdOrNull.Value; + return Guid.Parse(editionIdOrNull.Value); } - public static string FindEditionId([NotNull] this IIdentity identity) + public static Guid? FindEditionId([NotNull] this IIdentity identity) { Check.NotNull(identity, nameof(identity)); @@ -117,7 +117,7 @@ namespace System.Security.Principal return null; } - return editionIdOrNull.Value; + return Guid.Parse(editionIdOrNull.Value); } } }