@bitblit/ratchet-warden-common 6.1.184-alpha → 6.1.185-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -189,7 +189,7 @@ export class WardenUtils {
|
|
|
189
189
|
let rval = false;
|
|
190
190
|
const roleIds = inRoleIds ? inRoleIds.map(r => StringRatchet.trimToNull(r)?.toLowerCase()) : null;
|
|
191
191
|
if (user && roleIds && roleIds.length > 0) {
|
|
192
|
-
const hasMap = user ? roleIds.map(r => !!user
|
|
192
|
+
const hasMap = user ? roleIds.map(r => !!(user?.globalRoleIds || []).find(gr => StringRatchet.trimToEmpty(gr).toLowerCase() === r)) : [false];
|
|
193
193
|
rval = combineWithAnd ? BooleanRatchet.allTrue(hasMap) : BooleanRatchet.anyTrue(hasMap);
|
|
194
194
|
}
|
|
195
195
|
return rval;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warden-utils.js","sourceRoot":"","sources":["../../../src/common/util/warden-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"warden-utils.js","sourceRoot":"","sources":["../../../src/common/util/warden-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bitblit/ratchet-warden-common",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.185-alpha",
|
|
4
4
|
"description": "Typescript library to simplify using simplewebauthn and secondary auth methods over GraphQL",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -47,12 +47,12 @@
|
|
|
47
47
|
},
|
|
48
48
|
"license": "Apache-2.0",
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@bitblit/ratchet-common": "6.1.
|
|
50
|
+
"@bitblit/ratchet-common": "6.1.185-alpha",
|
|
51
51
|
"@simplewebauthn/browser": "13.2.2",
|
|
52
52
|
"jwt-decode": "4.0.0"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
|
-
"@bitblit/ratchet-common": "^6.1.
|
|
55
|
+
"@bitblit/ratchet-common": "^6.1.185-alpha",
|
|
56
56
|
"@simplewebauthn/browser": "^13.2.2",
|
|
57
57
|
"jwt-decode": "^4.0.0"
|
|
58
58
|
}
|
|
@@ -226,7 +226,7 @@ export class WardenUtils {
|
|
|
226
226
|
let rval: boolean = false;
|
|
227
227
|
const roleIds: string[] = inRoleIds ? inRoleIds.map(r=>StringRatchet.trimToNull(r)?.toLowerCase()) : null
|
|
228
228
|
if (user && roleIds && roleIds.length > 0) {
|
|
229
|
-
const hasMap: boolean[] = user ? roleIds.map(r=>!!user
|
|
229
|
+
const hasMap: boolean[] = user ? roleIds.map(r=>!!(user?.globalRoleIds || []).find(gr=>StringRatchet.trimToEmpty(gr).toLowerCase()===r)) : [false];
|
|
230
230
|
rval = combineWithAnd ? BooleanRatchet.allTrue(hasMap) : BooleanRatchet.anyTrue(hasMap);
|
|
231
231
|
}
|
|
232
232
|
return rval;
|