mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-21 20:02:03 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -55,7 +55,7 @@ Groups.removeEphemeralGroups = function (groups) {
|
||||
return groups;
|
||||
};
|
||||
|
||||
const isPrivilegeGroupRegex = /^cid:\d+:privileges:[\w\-:]+$/;
|
||||
const isPrivilegeGroupRegex = /^cid:(?:\d+|admin):privileges:[\w\-:]+$/;
|
||||
Groups.isPrivilegeGroup = function (groupName) {
|
||||
return isPrivilegeGroupRegex.test(groupName);
|
||||
};
|
||||
|
||||
@@ -1404,4 +1404,20 @@ describe('Groups', () => {
|
||||
assert(!groupData['cover:url']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('isPrivilegeGroup', () => {
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid:1:privileges:topics:find'), true);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid:1:privileges:groups:topics:find'), true);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid:0:privileges:groups:search:users'), true);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid:admin:privileges:admin:users'), true);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid::privileges:admin:users'), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('cid:string:privileges:admin:users'), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('admin'), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup('registered-users'), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup(''), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup(null), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup(undefined), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup(false), false);
|
||||
assert.strictEqual(Groups.isPrivilegeGroup(true), false);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user