bruce-models 4.5.3 → 4.5.4

package/dist/bruce-models.umd.js

@@ -90,6 +90,7 @@
         Api.DEFAULT_CACHE_DURATION = 60 * 1000;
         // The template client account is a container for default settings to reference.
         Api.TEMPLATE_ACCOUNT_ID = "template";
+        Api.SUPER_ACCOUNT_ID = "hypeportal";
         // Default session token header.
         Api.ACCESS_TOKEN_HEADER = "X-Access-Token";
         /**
@@ -10749,27 +10750,53 @@
          * @returns
          */
         function IsPermEnabled(params) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             let { session, accountId, perm } = params;
             if (!perm) {
                 throw ("Perm is required.");
             }
             perm = perm.toLocaleUpperCase();
-            const perms = (_b = (_a = session === null || session === void 0 ? void 0 : session.User) === null || _a === void 0 ? void 0 : _a.AccessPermissions) === null || _b === void 0 ? void 0 : _b.find(x => x["ClientAccount.ID"] == accountId);
+            accountId = accountId.toLowerCase();
+            // First we'll scan the user object for the account ID.
+            if ((_b = (_a = session === null || session === void 0 ? void 0 : session.User) === null || _a === void 0 ? void 0 : _a.AccessPermissions) === null || _b === void 0 ? void 0 : _b.length) {
+                for (let i = 0; i < session.User.AccessPermissions.length; i++) {
+                    const aPerms = session.User.AccessPermissions[i];
+                    const permsAccountId = String(aPerms["ClientAccount.ID"]).toLowerCase();
+                    // Found account, woo.
+                    if (permsAccountId == accountId) {
+                        // Check against the loaded perm array.
+                        // In newer version this always exists, but in some legacy versions it MIGHT not,
+                        //therefor we also do a group check after..
+                        if ((_c = aPerms.EnabledFeatures) === null || _c === void 0 ? void 0 : _c.length) {
+                            return aPerms.EnabledFeatures.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
+                        }
+                        // Fallback to group check.
+                        if (((_d = aPerms.UserGroups) === null || _d === void 0 ? void 0 : _d.length) && typeof aPerms.UserGroups[0] != "string") {
+                            for (let j = 0; j < aPerms.UserGroups.length; j++) {
+                                const group = aPerms.UserGroups[j];
+                                if ((_e = group === null || group === void 0 ? void 0 : group.Features) === null || _e === void 0 ? void 0 : _e.length) {
+                                    const gPerms = group.Features;
+                                    if (gPerms && gPerms.findIndex(x => x.toLocaleUpperCase() == perm) > -1) {
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // Fallback to the session perm info.
+            // This is deprecated and old as it's only for one account.
+            const perms = session === null || session === void 0 ? void 0 : session.AccessPermissions;
             if (!perms) {
                 return false;
             }
-            if (!perms.UserGroups) {
-                perms.UserGroups = [];
+            const pAccountId = String(perms["ClientAccount.ID"]).toLowerCase();
+            if (pAccountId != accountId) {
+                return false;
             }
-            for (let i = 0; i < perms.UserGroups.length; i++) {
-                const group = perms.UserGroups[i];
-                if (typeof group != "string") {
-                    const features = group.Features;
-                    if (features && features.findIndex(x => x.toLocaleUpperCase() == perm) > -1) {
-                        return true;
-                    }
-                }
+            if ((_f = perms.EnabledFeatures) === null || _f === void 0 ? void 0 : _f.length) {
+                return perms.EnabledFeatures.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
             }
             return false;
         }
@@ -10791,22 +10818,35 @@
                 return false;
             }
             perm = perm.toLocaleUpperCase();
-            // We'll look for 'HypeportalAccessPermisssions' first.
-            if ((_a = session.HypeportalAccessPermisssions) === null || _a === void 0 ? void 0 : _a.EnabledFeatures) {
-                const perms = session.HypeportalAccessPermisssions.EnabledFeatures;
-                return perms.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
-            }
-            // Fallback to looking through groups.
-            // This is important if the user directly logged into "hypeportal" as the response differs.
-            else if ((_c = (_b = session.User) === null || _b === void 0 ? void 0 : _b.AccessPermissions) === null || _c === void 0 ? void 0 : _c.length) {
-                const perms = session.User.AccessPermissions.find(x => String(x["ClientAccount.ID"]).toLowerCase() == "hypeportal");
-                if ((_d = perms === null || perms === void 0 ? void 0 : perms.UserGroups) === null || _d === void 0 ? void 0 : _d.length) {
-                    for (let j = 0; j < perms.UserGroups.length; j++) {
-                        const group = perms.UserGroups[j];
-                        if (typeof group != "string") {
-                            const features = group.Features;
-                            if (features && features.findIndex(x => x.toLocaleUpperCase() == perm) > -1) {
-                                return true;
+            // First we'll scan the included super perms.
+            const superPerms = session.HypeportalAccessPermisssions;
+            if ((_a = superPerms === null || superPerms === void 0 ? void 0 : superPerms.EnabledFeatures) === null || _a === void 0 ? void 0 : _a.length) {
+                return superPerms.EnabledFeatures.findIndex(x => x.toLocaleUpperCase() == perm) > -1;
+            }
+            // Now we'll fallback to digging through group to find the super group.
+            if ((_c = (_b = session === null || session === void 0 ? void 0 : session.User) === null || _b === void 0 ? void 0 : _b.AccessPermissions) === null || _c === void 0 ? void 0 : _c.length) {
+                for (let i = 0; i < session.User.AccessPermissions.length; i++) {
+                    const perms = session.User.AccessPermissions[i];
+                    // Newer API versions always specify accountId in the collections.
+                    // If it's set we can do a super account check early.
+                    if (perms["ClientAccount.ID"] != null) {
+                        const pAccountId = String(perms["ClientAccount.ID"]).toLowerCase();
+                        if (pAccountId != exports.Api.SUPER_ACCOUNT_ID) {
+                            continue;
+                        }
+                    }
+                    if ((_d = perms === null || perms === void 0 ? void 0 : perms.UserGroups) === null || _d === void 0 ? void 0 : _d.length) {
+                        for (let j = 0; j < perms.UserGroups.length; j++) {
+                            const group = perms.UserGroups[j];
+                            if (typeof group != "string") {
+                                const gAccountId = String(group["ClientAccount.ID"]).toLowerCase();
+                                if (gAccountId != exports.Api.SUPER_ACCOUNT_ID) {
+                                    continue;
+                                }
+                                const features = group.Features;
+                                if (features && features.findIndex(x => x.toLocaleUpperCase() == perm) > -1) {
+                                    return true;
+                                }
                             }
                         }
                     }
@@ -11066,7 +11106,7 @@
                 if ((_a = data.AccessPermissions) === null || _a === void 0 ? void 0 : _a.length) {
                     for (let i = 0; i < data.AccessPermissions.length; i++) {
                         const perm = data.AccessPermissions[i];
-                        if (!perm["UserGroup.ID"] && perm.UserGroups) {
+                        if (!perm["UserGroup.ID"] && perm.UserGroups && typeof perm.UserGroups != "string") {
                             perm["UserGroup.ID"] = [];
                             for (let j = 0; j < perm.UserGroups.length; j++) {
                                 perm["UserGroup.ID"].push(perm.UserGroups[j].ID);
@@ -13415,7 +13455,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.5.3";
+    const VERSION = "4.5.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;