jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make canonicalScopeString return sorted array

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-06-27 14:07:25 -07:00
parent ce4424d115
commit d66dc11f01
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/accesscontrol.js
View File

@@ -13,7 +13,7 @@ exports = module.exports = {
SCOPE_USERS_READ: 'users:read',
SCOPE_USERS_MANAGE: 'users:manage',
SCOPE_APPSTORE: 'appstore',
VALID_SCOPES: [ 'apps', 'appstore', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'users' ],
VALID_SCOPES: [ 'apps', 'appstore', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'users' ], // keep this sorted
SCOPE_ANY: '*',
@@ -49,13 +49,16 @@ var assert = require('assert'),
debug = require('debug')('box:accesscontrol'),
_ = require('underscore');
// returns scopes that does not have wildcards and is sorted
function canonicalScopeString(scope) {
return scope === exports.SCOPE_ANY ? exports.VALID_SCOPES.join(',') : scope;
if (scope === exports.SCOPE_ANY) return exports.VALID_SCOPES.join(',');
return scope.split(',').sort().join(',');
}
function intersectScopes(allowedScopes, wantedScopes) {
assert(Array.isArray(allowedScopes), 'Expecting array');
assert(Array.isArray(wantedScopes), 'Expecting array');
assert(Array.isArray(allowedScopes), 'Expecting sorted array');
assert(Array.isArray(wantedScopes), 'Expecting sorted array');
return _.intersection(allowedScopes, wantedScopes);
}