@acceleratxr/core_sdk
Advanced tools
Comparing version
@@ -15,3 +15,3 @@ "use strict"; | ||
exports.languages = languages_1.default; | ||
const merge = require("deepmerge"); | ||
const merge = require("lodash/merge"); | ||
const i18n = require("i18next"); | ||
@@ -49,3 +49,3 @@ const en_1 = require("./en"); | ||
}); | ||
yield i18n.init(Object.assign(Object.assign({}, initOptions), { resources: merge(exports.I18N_RESOURCES, overiddenResources) })); | ||
yield i18n.init(Object.assign(Object.assign({}, initOptions), { resources: merge(overiddenResources, exports.I18N_RESOURCES) })); | ||
return i18n; | ||
@@ -52,0 +52,0 @@ }); |
@@ -229,3 +229,3 @@ "use strict"; | ||
return __awaiter(this, void 0, void 0, function* () { | ||
const result = yield this.apiClient.get("/dependencies/" + service); | ||
const result = yield this.apiClient.get(`${this.config.getBaseServicePath(ScriptService)}/${service}/dependencies`); | ||
if (result.status >= 200 && result.status < 300) { | ||
@@ -232,0 +232,0 @@ return result.data; |
@@ -62,5 +62,6 @@ "use strict"; | ||
* @param action The action that the user desires permission for. | ||
* @param bypassTrustedRolesCheck Whether or not to bypass the trusted role check - defaults to false | ||
* @returns `true` if the user has at least one of the permissions granted for the given entity, otherwise `false`. | ||
*/ | ||
hasPermission(user, acl, action) { | ||
hasPermission(user, acl, action, bypassTrustedRolesCheck = false) { | ||
return __awaiter(this, void 0, void 0, function* () { | ||
@@ -73,3 +74,3 @@ let result = true; | ||
// it may be an organization id in which case we want to also check for organizational trusted users. | ||
if (_1.UserUtils.hasRoles(user, this.config.trustedRoles, typeof acl === "string" ? acl : acl.uid)) { | ||
if (!bypassTrustedRolesCheck && _1.UserUtils.hasRoles(user, this.config.trustedRoles, typeof acl === "string" ? acl : acl.uid)) { | ||
return true; | ||
@@ -76,0 +77,0 @@ } |
@@ -27,5 +27,6 @@ import { AccessControlList, ACLAction, ACLRecord } from "../models/AccessControlList"; | ||
* @param action The action that the user desires permission for. | ||
* @param bypassTrustedRolesCheck Whether or not to bypass the trusted role check - defaults to false | ||
* @returns `true` if the user has at least one of the permissions granted for the given entity, otherwise `false`. | ||
*/ | ||
hasPermission(user: JWTUser | User | undefined, acl: AccessControlList | string, action: ACLAction): Promise<boolean>; | ||
hasPermission(user: JWTUser | User | undefined, acl: AccessControlList | string, action: ACLAction, bypassTrustedRolesCheck?: boolean): Promise<boolean>; | ||
/** | ||
@@ -32,0 +33,0 @@ * Retrieves the access control list with the associated identifier and populates the parent(s). |
{ | ||
"name": "@acceleratxr/core_sdk", | ||
"version": "2.1.0-rc.1", | ||
"version": "2.1.0-rc.2", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "author": "Jean-Philippe Steinmetz <info@acceleratxr.com>", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
5737880
0.01%214764
0