Browse Source

Use GUID for editionid.

pull/880/head
Halil ibrahim Kalkan 8 years ago
parent
commit
b630ddaf73
  1. 2
      framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs
  2. 2
      framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs
  3. 8
      framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs

2
framework/src/Volo.Abp.Features/Volo/Abp/Features/EditionFeatureValueProvider.cs

@ -26,7 +26,7 @@ namespace Volo.Abp.Features
return null; return null;
} }
return await FeatureStore.GetOrNullAsync(feature.Name, Name, editionId); return await FeatureStore.GetOrNullAsync(feature.Name, Name, editionId.Value.ToString("N"));
} }
} }
} }

2
framework/src/Volo.Abp.Features/Volo/Abp/Features/TenantFeatureValueProvider.cs

@ -19,7 +19,7 @@ namespace Volo.Abp.Features
public override async Task<string> GetOrNullAsync(FeatureDefinition feature) public override async Task<string> GetOrNullAsync(FeatureDefinition feature)
{ {
return await FeatureStore.GetOrNullAsync(feature.Name, Name, CurrentTenant.Id?.ToString()); return await FeatureStore.GetOrNullAsync(feature.Name, Name, CurrentTenant.Id?.ToString("N"));
} }
} }
} }

8
framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs

@ -92,7 +92,7 @@ namespace System.Security.Principal
return clientIdOrNull.Value; return clientIdOrNull.Value;
} }
public static string FindEditionId([NotNull] this ClaimsPrincipal principal) public static Guid? FindEditionId([NotNull] this ClaimsPrincipal principal)
{ {
Check.NotNull(principal, nameof(principal)); Check.NotNull(principal, nameof(principal));
@ -102,10 +102,10 @@ namespace System.Security.Principal
return null; 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)); Check.NotNull(identity, nameof(identity));
@ -117,7 +117,7 @@ namespace System.Security.Principal
return null; return null;
} }
return editionIdOrNull.Value; return Guid.Parse(editionIdOrNull.Value);
} }
} }
} }

Loading…
Cancel
Save