diff --git a/Directory.Build.props b/Directory.Build.props index c903099..4d9f187 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,6 +4,6 @@ 7.0.0 8.0.0 1.2.0-preview.2 - 1.1.1-preview.10 + 1.2.1-preview.1 diff --git a/src/Masa.Stack.Components/Extensions/ServiceCollectionExtensions.cs b/src/Masa.Stack.Components/Extensions/ServiceCollectionExtensions.cs index d8c8869..0fe6215 100644 --- a/src/Masa.Stack.Components/Extensions/ServiceCollectionExtensions.cs +++ b/src/Masa.Stack.Components/Extensions/ServiceCollectionExtensions.cs @@ -1,6 +1,4 @@ -using Masa.Blazor.Core.I18n; - -namespace Masa.Stack.Components; +namespace Masa.Stack.Components; public static class ServiceCollectionExtensions { @@ -37,8 +35,8 @@ private static async Task AddMasaStackComponentsServiceAsync(IServiceCollection services.AddAutoInject(); services.AddMasaIdentity(options => { - options.UserName = "name"; - options.UserId = "sub"; + options.UserName = IdentityClaimConsts.USER_NAME; + options.UserId = IdentityClaimConsts.USER_ID; options.Role = IdentityClaimConsts.ROLES; options.Environment = IdentityClaimConsts.ENVIRONMENT; options.Mapping(nameof(MasaUser.CurrentTeamId), IdentityClaimConsts.CURRENT_TEAM); diff --git a/src/Masa.Stack.Components/_Imports.cs b/src/Masa.Stack.Components/_Imports.cs index 56a7ffa..6393a36 100644 --- a/src/Masa.Stack.Components/_Imports.cs +++ b/src/Masa.Stack.Components/_Imports.cs @@ -2,16 +2,18 @@ global using IdentityModel.Client; global using Mapster; global using Masa.Blazor; +global using Masa.Blazor.Core; +global using Masa.Blazor.Core.I18n; global using Masa.Blazor.Presets; global using Masa.BuildingBlocks.Authentication.Identity; global using Masa.BuildingBlocks.Caching; global using Masa.BuildingBlocks.Configuration; global using Masa.BuildingBlocks.StackSdks.Auth; global using Masa.BuildingBlocks.StackSdks.Auth.Contracts; -global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts; global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Enum; global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model; global using Masa.BuildingBlocks.StackSdks.Config; +global using Masa.BuildingBlocks.StackSdks.Config.Consts; global using Masa.BuildingBlocks.StackSdks.Isolation; global using Masa.BuildingBlocks.StackSdks.Mc.Enum; global using Masa.BuildingBlocks.StackSdks.Mc.Model; @@ -71,5 +73,3 @@ global using System.Text.Json.Nodes; global using System.Text.Json.Serialization; global using System.Text.RegularExpressions; -global using Masa.Blazor.Core; -global using Masa.Stack.Components.Standalone; \ No newline at end of file