aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Permission.StoreId to Permission.Scope

Browse Source
This commit is contained in:
nicolas.dorier
2020-06-07 23:17:48 +09:00
parent 0022e71dd4
commit 3fbe86c286
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
BTCPayServer.Client/Permissions.cs
View File

@@ -57,14 +57,14 @@ namespace BTCPayServer.Client
} }
public class Permission public class Permission
{ {
public static Permission Create(string policy, string storeId = null) public static Permission Create(string policy, string scope = null)
{ {
if (TryCreatePermission(policy, storeId, out var r)) if (TryCreatePermission(policy, scope, out var r))
return r; return r;
throw new ArgumentException("Invalid Permission"); throw new ArgumentException("Invalid Permission");
} }
public static bool TryCreatePermission(string policy, string storeId, out Permission permission) public static bool TryCreatePermission(string policy, string scope, out Permission permission)
{ {
permission = null; permission = null;
if (policy == null) if (policy == null)
@@ -72,9 +72,9 @@ namespace BTCPayServer.Client
policy = policy.Trim().ToLowerInvariant(); policy = policy.Trim().ToLowerInvariant();
if (!Policies.IsValidPolicy(policy)) if (!Policies.IsValidPolicy(policy))
return false; return false;
if (storeId != null && !Policies.IsStorePolicy(policy)) if (scope != null && !Policies.IsStorePolicy(policy))
return false; return false;
permission = new Permission(policy, storeId); permission = new Permission(policy, scope);
return true; return true;
} }
@@ -108,10 +108,10 @@ namespace BTCPayServer.Client
} }
} }
internal Permission(string policy, string storeId) internal Permission(string policy, string scope)
{ {
Policy = policy; Policy = policy;
StoreId = storeId; Scope = scope;
} }
public bool Contains(Permission subpermission) public bool Contains(Permission subpermission)
@@ -125,7 +125,7 @@ namespace BTCPayServer.Client
} }
if (!Policies.IsStorePolicy(subpermission.Policy)) if (!Policies.IsStorePolicy(subpermission.Policy))
return true; return true;
return StoreId == null || subpermission.StoreId == this.StoreId; return Scope == null || subpermission.Scope == this.Scope;
} }
public static IEnumerable<Permission> ToPermissions(string[] permissions) public static IEnumerable<Permission> ToPermissions(string[] permissions)
@@ -161,14 +161,14 @@ namespace BTCPayServer.Client
} }
} }
public string StoreId { get; } public string Scope { get; }
public string Policy { get; } public string Policy { get; }
public override string ToString() public override string ToString()
{ {
if (StoreId != null) if (Scope != null)
{ {
return $"{Policy}:{StoreId}"; return $"{Policy}:{Scope}";
} }
return Policy; return Policy;
} }

6
BTCPayServer.Tests/ApiKeysTests.cs
View File

@@ -192,7 +192,7 @@ namespace BTCPayServer.Tests
var canModifyAllStores = Permission.Create(Policies.CanModifyStoreSettings, null); var canModifyAllStores = Permission.Create(Policies.CanModifyStoreSettings, null);
var canModifyServer = Permission.Create(Policies.CanModifyServerSettings, null); var canModifyServer = Permission.Create(Policies.CanModifyServerSettings, null);
var unrestricted = Permission.Create(Policies.Unrestricted, null); var unrestricted = Permission.Create(Policies.Unrestricted, null);
var selectiveStorePermissions = permissions.Where(p => p.StoreId != null && p.Policy == Policies.CanModifyStoreSettings); var selectiveStorePermissions = permissions.Where(p => p.Scope != null && p.Policy == Policies.CanModifyStoreSettings);
if (permissions.Contains(canModifyAllStores) || selectiveStorePermissions.Any()) if (permissions.Contains(canModifyAllStores) || selectiveStorePermissions.Any())
{ {
var resultStores = var resultStores =
@@ -202,11 +202,11 @@ namespace BTCPayServer.Tests
foreach (var selectiveStorePermission in selectiveStorePermissions) foreach (var selectiveStorePermission in selectiveStorePermissions)
{ {
Assert.True(await TestApiAgainstAccessToken<bool>(accessToken, Assert.True(await TestApiAgainstAccessToken<bool>(accessToken,
$"{TestApiPath}/me/stores/{selectiveStorePermission.StoreId}/can-edit", $"{TestApiPath}/me/stores/{selectiveStorePermission.Scope}/can-edit",
tester.PayTester.HttpClient)); tester.PayTester.HttpClient));
Assert.Contains(resultStores, Assert.Contains(resultStores,
data => data.Id.Equals(selectiveStorePermission.StoreId, StringComparison.InvariantCultureIgnoreCase)); data => data.Id.Equals(selectiveStorePermission.Scope, StringComparison.InvariantCultureIgnoreCase));
} }
bool shouldBeAuthorized = false; bool shouldBeAuthorized = false;

4
BTCPayServer.Tests/TestAccount.cs
View File

@@ -77,8 +77,8 @@ namespace BTCPayServer.Tests
return p; return p;
}).GroupBy(permission => permission.Policy).Select(p => }).GroupBy(permission => permission.Policy).Select(p =>
{ {
var stores = p.Where(permission => !string.IsNullOrEmpty(permission.StoreId)) var stores = p.Where(permission => !string.IsNullOrEmpty(permission.Scope))
.Select(permission => permission.StoreId).ToList(); .Select(permission => permission.Scope).ToList();
return new ManageController.AddApiKeyViewModel.PermissionValueItem() return new ManageController.AddApiKeyViewModel.PermissionValueItem()
{ {
Permission = p.Key, Permission = p.Key,

4
BTCPayServer/Controllers/ManageController.APIKeys.cs
View File

@@ -128,10 +128,10 @@ namespace BTCPayServer.Controllers
else if (wanted?.Any()??false) else if (wanted?.Any()??false)
{ {
if (vm.SelectiveStores && Policies.IsStorePolicy(permissionValue.Permission) && if (vm.SelectiveStores && Policies.IsStorePolicy(permissionValue.Permission) &&
wanted.Any(permission => !string.IsNullOrEmpty(permission.StoreId))) wanted.Any(permission => !string.IsNullOrEmpty(permission.Scope)))
{ {
permissionValue.StoreMode = AddApiKeyViewModel.ApiKeyStoreMode.Specific; permissionValue.StoreMode = AddApiKeyViewModel.ApiKeyStoreMode.Specific;
permissionValue.SpecificStores = wanted.Select(permission => permission.StoreId).ToList(); permissionValue.SpecificStores = wanted.Select(permission => permission.Scope).ToList();
} }
else else
{ {