Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:add user role #118

Merged
merged 2 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 31 additions & 37 deletions Masa.Contrib.sln
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicAbility", "BasicAbilit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.BasicAbility.Scheduler", "src\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Scheduler\Masa.BuildingBlocks.BasicAbility.Scheduler.csproj", "{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE}"
EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.Scheduler.Tests", "test\Masa.Contrib.BasicAbility.Scheduler.Tests\Masa.Contrib.BasicAbility.Scheduler.Tests.csproj", "{5980D054-E2F3-4143-93D1-01993A955AE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.Scheduler", "src\BasicAbility\Masa.Contrib.BasicAbility.Scheduler\Masa.Contrib.BasicAbility.Scheduler.csproj", "{8D84666E-C79E-4D49-B73D-360E62D312EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Dispatcher.IntegrationEvents", "src\Dispatcher\Masa.Contrib.Dispatcher.IntegrationEvents\Masa.Contrib.Dispatcher.IntegrationEvents.csproj", "{7C4B88FA-3681-4C29-BC3F-0FDB111C5681}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Dispatcher.IntegrationEvents", "src\Dispatcher\Masa.Contrib.Dispatcher.IntegrationEvents\Masa.Contrib.Dispatcher.IntegrationEvents.csproj", "{7C4B88FA-3681-4C29-BC3F-0FDB111C5681}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests", "test\Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests\Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj", "{592297DE-DA72-452D-9D88-61EE882FE9A6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests", "test\Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests\Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj", "{592297DE-DA72-452D-9D88-61EE882FE9A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Identity.IdentityModel.Tests", "test\Masa.Contrib.Identity.IdentityModel.Tests\Masa.Contrib.Identity.IdentityModel.Tests.csproj", "{4E237346-F948-46AC-801B-492545978280}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -1239,38 +1240,6 @@ Global
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|Any CPU.Build.0 = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|x64.ActiveCfg = Release|Any CPU
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479}.Release|x64.Build.0 = Release|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|x64.ActiveCfg = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Debug|x64.Build.0 = Debug|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Release|Any CPU.Build.0 = Release|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Release|x64.ActiveCfg = Release|Any CPU
{D91C3145-C31C-4301-A493-96F94C903CF2}.Release|x64.Build.0 = Release|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Debug|x64.Build.0 = Debug|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Release|Any CPU.Build.0 = Release|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Release|x64.ActiveCfg = Release|Any CPU
{FD35BEFA-512C-4483-B5C0-ADCA35680315}.Release|x64.Build.0 = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|x64.Build.0 = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|Any CPU.Build.0 = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|x64.ActiveCfg = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|x64.Build.0 = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|x64.Build.0 = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|Any CPU.Build.0 = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|x64.ActiveCfg = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|x64.Build.0 = Release|Any CPU
{981E883E-CCDC-400B-8FB1-76E1E65C32AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{981E883E-CCDC-400B-8FB1-76E1E65C32AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{981E883E-CCDC-400B-8FB1-76E1E65C32AF}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -1287,6 +1256,22 @@ Global
{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE}.Release|Any CPU.Build.0 = Release|Any CPU
{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE}.Release|x64.ActiveCfg = Release|Any CPU
{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE}.Release|x64.Build.0 = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Debug|x64.Build.0 = Debug|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|Any CPU.Build.0 = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|x64.ActiveCfg = Release|Any CPU
{5980D054-E2F3-4143-93D1-01993A955AE7}.Release|x64.Build.0 = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Debug|x64.Build.0 = Debug|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|Any CPU.Build.0 = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|x64.ActiveCfg = Release|Any CPU
{8D84666E-C79E-4D49-B73D-360E62D312EF}.Release|x64.Build.0 = Release|Any CPU
{7C4B88FA-3681-4C29-BC3F-0FDB111C5681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C4B88FA-3681-4C29-BC3F-0FDB111C5681}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C4B88FA-3681-4C29-BC3F-0FDB111C5681}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -1303,6 +1288,14 @@ Global
{592297DE-DA72-452D-9D88-61EE882FE9A6}.Release|Any CPU.Build.0 = Release|Any CPU
{592297DE-DA72-452D-9D88-61EE882FE9A6}.Release|x64.ActiveCfg = Release|Any CPU
{592297DE-DA72-452D-9D88-61EE882FE9A6}.Release|x64.Build.0 = Release|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Debug|x64.ActiveCfg = Debug|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Debug|x64.Build.0 = Debug|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Release|Any CPU.Build.0 = Release|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Release|x64.ActiveCfg = Release|Any CPU
{4E237346-F948-46AC-801B-492545978280}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1450,13 +1443,14 @@ Global
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
{83FA668F-C838-4883-996D-AF2ECF00FDF8} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{5980D054-E2F3-4143-93D1-01993A955AE7} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{8D84666E-C79E-4D49-B73D-360E62D312EF} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
{981E883E-CCDC-400B-8FB1-76E1E65C32AF} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
{0D34A7F0-DC77-4789-A136-93089CBD15C3} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
{5980D054-E2F3-4143-93D1-01993A955AE7} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{8D84666E-C79E-4D49-B73D-360E62D312EF} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
{7C4B88FA-3681-4C29-BC3F-0FDB111C5681} = {FBD326D3-E59C-433E-A88E-14E179E3093D}
{592297DE-DA72-452D-9D88-61EE882FE9A6} = {38E6C400-90C0-493E-9266-C1602E229F1B}
{4E237346-F948-46AC-801B-492545978280} = {38E6C400-90C0-493E-9266-C1602E229F1B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40383055-CC50-4600-AD9A-53C14F620D03}
Expand Down
2 changes: 1 addition & 1 deletion src/BuildingBlocks/MASA.BuildingBlocks
Submodule MASA.BuildingBlocks updated 0 files
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Identity.IdentityModel.Const;
Expand All @@ -7,11 +7,13 @@ public class ClaimType
{
public const string DEFAULT_USER_ID = ClaimTypes.NameIdentifier;

public const string DEFAULT_USER_NAME = ClaimTypes.Name;
public const string DEFAULT_USER_NAME = ClaimTypes.Name;

public const string DEFAULT_USER_ROLE = ClaimTypes.Role;

public const string DEFAULT_TENANT_ID = $"{DEFAULT_PREFIX}/tenantid";

public const string DEFAULT_ENVIRONMENT = $"{DEFAULT_PREFIX}/environment";

private const string DEFAULT_PREFIX= "https://masastack.com/security/identity/claims";
private const string DEFAULT_PREFIX = "https://masastack.com/security/identity/claims";
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Identity.IdentityModel;

public sealed class DefaultIsolatedUserContext : UserContext, IIsolatedUserContext
internal class DefaultIsolatedUserContext : DefaultUserContext, IIsolatedUserContext
{
public string? TenantId => GetUser<IsolatedIdentityUser>()?.TenantId;

public string? Environment => GetUser<IsolatedIdentityUser>()?.Environment;

private readonly ICurrentPrincipalAccessor _currentPrincipalAccessor;

private readonly IOptionsMonitor<IdentityClaimOptions> _optionsMonitor;

public DefaultIsolatedUserContext(
ITypeConvertProvider typeConvertProvider,
ICurrentPrincipalAccessor currentPrincipalAccessor,
IOptionsMonitor<IdentityClaimOptions> optionsMonitor)
: base(typeConvertProvider)
IOptionsMonitor<IdentityClaimOptions> optionsMonitor,
ILoggerFactory? loggerFactory = null)
: base(typeConvertProvider, currentPrincipalAccessor, optionsMonitor, loggerFactory)
{
_currentPrincipalAccessor = currentPrincipalAccessor;
_optionsMonitor = optionsMonitor;
}

Expand All @@ -34,20 +32,19 @@ public DefaultIsolatedUserContext(

protected override IsolatedIdentityUser? GetUser()
{
var claimsPrincipal = _currentPrincipalAccessor.GetCurrentPrincipal();
if (claimsPrincipal == null)
return null;

var userId = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserId);
if (userId == null)
var identityUser = GetUserBasicInfo();
if (identityUser == null)
{
return null;
}

return new IsolatedIdentityUser
{
Id = userId,
UserName = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserName),
TenantId = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.TenantId),
Environment = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.Environment),
Id = identityUser.Id,
UserName = identityUser.UserName,
Roles = identityUser.Roles,
TenantId = ClaimsPrincipal?.FindClaimValue(_optionsMonitor.CurrentValue.TenantId),
Environment = ClaimsPrincipal?.FindClaimValue(_optionsMonitor.CurrentValue.Environment),
};
}
}
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

using Microsoft.Extensions.Logging;

namespace Masa.Contrib.Identity.IdentityModel;

public sealed class DefaultMultiEnvironmentUserContext: UserContext, IMultiEnvironmentUserContext
internal class DefaultMultiEnvironmentUserContext : DefaultUserContext, IMultiEnvironmentUserContext
{
public string? Environment => GetUser<MultiEnvironmentIdentityUser>()?.Environment;

private readonly ICurrentPrincipalAccessor _currentPrincipalAccessor;

private readonly IOptionsMonitor<IdentityClaimOptions> _optionsMonitor;

public DefaultMultiEnvironmentUserContext(
ITypeConvertProvider typeConvertProvider,
ICurrentPrincipalAccessor currentPrincipalAccessor,
IOptionsMonitor<IdentityClaimOptions> optionsMonitor)
: base(typeConvertProvider)
IOptionsMonitor<IdentityClaimOptions> optionsMonitor,
ILoggerFactory? loggerFactory = null)
: base(typeConvertProvider, currentPrincipalAccessor, optionsMonitor, loggerFactory)
{
_currentPrincipalAccessor = currentPrincipalAccessor;
_optionsMonitor = optionsMonitor;
}

protected override MultiEnvironmentIdentityUser? GetUser()
{
var claimsPrincipal = _currentPrincipalAccessor.GetCurrentPrincipal();
if (claimsPrincipal == null)
return null;

var userId = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserId);
if (userId == null)
var identityUser = GetUserBasicInfo();
if (identityUser == null)
{
return null;
}

return new MultiEnvironmentIdentityUser
{
Id = userId,
UserName = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserName),
Environment = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.Environment),
Id = identityUser.Id,
UserName = identityUser.UserName,
Roles = identityUser.Roles,
Environment = ClaimsPrincipal?.FindClaimValue(_optionsMonitor.CurrentValue.Environment),
};
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

using Microsoft.Extensions.Logging;

namespace Masa.Contrib.Identity.IdentityModel;

public class DefaultMultiTenantUserContext : UserContext, IMultiTenantUserContext
internal class DefaultMultiTenantUserContext : DefaultUserContext, IMultiTenantUserContext
{
public string? TenantId => GetUser<MultiTenantIdentityUser>()?.TenantId;

private readonly ICurrentPrincipalAccessor _currentPrincipalAccessor;

private readonly IOptionsMonitor<IdentityClaimOptions> _optionsMonitor;

public DefaultMultiTenantUserContext(
ITypeConvertProvider typeConvertProvider,
ICurrentPrincipalAccessor currentPrincipalAccessor,
IOptionsMonitor<IdentityClaimOptions> optionsMonitor)
: base(typeConvertProvider)
IOptionsMonitor<IdentityClaimOptions> optionsMonitor,
ILoggerFactory? loggerFactory = null)
: base(typeConvertProvider, currentPrincipalAccessor, optionsMonitor, loggerFactory)
{
_currentPrincipalAccessor = currentPrincipalAccessor;
_optionsMonitor = optionsMonitor;
}

Expand All @@ -32,19 +32,18 @@ public DefaultMultiTenantUserContext(

protected override MultiTenantIdentityUser? GetUser()
{
var claimsPrincipal = _currentPrincipalAccessor.GetCurrentPrincipal();
if (claimsPrincipal == null)
return null;

var userId = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserId);
if (userId == null)
var identityUser = GetUserBasicInfo();
if (identityUser == null)
{
return null;
}

return new MultiTenantIdentityUser
{
Id = userId,
UserName = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.UserName),
TenantId = claimsPrincipal.FindClaimValue(_optionsMonitor.CurrentValue.TenantId),
Id = identityUser.Id,
UserName = identityUser.UserName,
Roles = identityUser.Roles,
TenantId = ClaimsPrincipal?.FindClaimValue(_optionsMonitor.CurrentValue.TenantId),
};
}
}
Loading