tnx-shared 5.1.310 → 5.1.311

package/bundles/tnx-shared.umd.js

@@ -11078,19 +11078,20 @@
             _this._oauthService = _oauthService;
             _this._appContext = _appContext;
             _this.storage = sessionStorage;
-            _this.delayCheckPermissions = [];
             _this.ignoreAdmin = false;
+            _this.delayCheckPermissions = [];
             _this.appCode = null;
-            _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint;
-            _this.ignoreAdmin = _this._moduleConfigService.getConfig().environment.isIgnoreAdmin;
-            _this.appCode = _this._moduleConfigService.getConfig().appCode;
+            _this._config = _this._moduleConfigService.getConfig();
+            _this.endPoint = _this._config.environment.apiDomain.authorizationEndpoint;
+            _this.ignoreAdmin = _this._config.environment.isIgnoreAdmin;
+            _this.appCode = _this._config.appCode;
             return _this;
         }
         PermissionService.prototype.clearPermissionCacheAll = function () {
             var _a, _b, _c;
-            var lstAppCodes = (_c = (_b = (_a = this._moduleConfigService.getConfig().environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(function (app) { return app.code; })) !== null && _c !== void 0 ? _c : [];
+            var lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(function (app) { return app.code; })) !== null && _c !== void 0 ? _c : [];
             var lstApiEndpoint = [];
-            var apiDomain = this._moduleConfigService.getConfig().environment.apiDomain;
+            var apiDomain = this._config.environment.apiDomain;
             for (var domainName in apiDomain) {
                 if (domainName.startsWith('-') || domainName.startsWith('1') || domainName == 'gateway')
                     continue;
@@ -11107,7 +11108,7 @@
             var url = this.serviceUri + "/GetCurrentUserPermission";
             return this.defaultGet(url);
         };
-        PermissionService.prototype.getAllBasePermission = function () {
+        PermissionService.prototype.getAllBasePermission = function (userId) {
             var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
                 var url, user, res, lstAppCodes, promiseArr, code, service, permissions, key, storageItem;
@@ -11121,10 +11122,14 @@
                                 || (user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin)) {
                                 return [2 /*return*/];
                             }
+                            if (userId && userId != '' && userId != this._commonService.guidEmpty()) {
+                                url += "?userId=" + userId;
+                                return [2 /*return*/, this.defaultGet(url)];
+                            }
                             return [4 /*yield*/, this.defaultGet(url)];
                         case 1:
                             res = _e.sent();
-                            lstAppCodes = (_c = (_b = (_a = this._moduleConfigService.getConfig().environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(function (app) { return app.code; })) !== null && _c !== void 0 ? _c : [];
+                            lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(function (app) { return app.code; })) !== null && _c !== void 0 ? _c : [];
                             if (!(!res.success || res.data == null)) return [3 /*break*/, 3];
                             promiseArr = [];
                             for (code in lstAppCodes) {
@@ -11264,9 +11269,10 @@
                 });
             }); });
         };
-        PermissionService.prototype.checkPermission = function (service, permission, resolve, reject) {
+        PermissionService.prototype.checkPermission = function (service, permissionToCheck, resolve, reject) {
             return __awaiter(this, void 0, void 0, function () {
                 var user;
+                var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0: return [4 /*yield*/, this._userService.getCurrentUser()];
@@ -11278,6 +11284,59 @@
                 });
             });
         };
+        PermissionService.prototype._checkPermission = function (userPermissions, permissionToCheck) {
+            var e_2, _e;
+            var isAuthorized = false;
+            // check quyền theo cách cũ nếu trường họp là phân quyền module
+            if (permissionToCheck.includes('MODULE')) {
+                return userPermissions.includes(permissionToCheck);
+            }
+            try {
+                for (var userPermissions_1 = __values(userPermissions), userPermissions_1_1 = userPermissions_1.next(); !userPermissions_1_1.done; userPermissions_1_1 = userPermissions_1.next()) {
+                    var userPermission = userPermissions_1_1.value;
+                    // Cắt chuỗi permission thành mảng để xem mỗi fragement có khớp nhau không
+                    var userPermissionFragments = userPermission.split('/');
+                    var permissionFragements = permissionToCheck.split('/');
+                    // Mảng khác độ dài thì thoát sớm
+                    if (userPermissionFragments.length != permissionFragements.length) {
+                        continue;
+                    }
+                    // biến flag ra hiệu người dùng authorized và out vòng
+                    var breakLoop = false;
+                    // nếu tất cả phần tử khớp nhau => permission này trùng và người dùng được authorized
+                    for (var index = 0; index < permissionFragements.length; index++) {
+                        var userFragement = userPermissionFragments[index];
+                        var permissionFragment = permissionFragements[index];
+                        // skip qua các phần tử có ký tự bắt đầu là '{'
+                        if (userFragement[0] == '{') {
+                            if (index == permissionFragements.length - 1) {
+                                isAuthorized = true;
+                                breakLoop = true;
+                            }
+                            continue;
+                        }
+                        if (userFragement.toLowerCase() != permissionFragment.toLowerCase()) {
+                            break;
+                        }
+                        if (index == permissionFragements.length - 1) {
+                            isAuthorized = true;
+                            breakLoop = true;
+                        }
+                    }
+                    if (breakLoop) {
+                        break;
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (userPermissions_1_1 && !userPermissions_1_1.done && (_e = userPermissions_1.return)) _e.call(userPermissions_1);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return isAuthorized;
+        };
         PermissionService.prototype.isAuthorizedByPermissions = function (permissions, operator, ignoreAdmin) {
             var _this = this;
             if (operator === void 0) { operator = 'OR'; }
@@ -35627,6 +35686,34 @@
             _this._moduleConfig = _moduleConfigService.getConfig();
             return _this;
         }
+        RoleService.prototype.getDetailCustom = function (id, pid) {
+            var url = this.serviceUri + "/GetDetailCustom/" + id + "?pid=" + pid;
+            return this.defaultGet(url);
+        };
+        RoleService.prototype.GetIdByUsers = function (model) {
+            var url = this.serviceUri + "/GetIdByUsers";
+            return this.defaultPost(url, model);
+        };
+        RoleService.prototype.GetIdByGroupUsers = function (model) {
+            var url = this.serviceUri + "/GetIdByGroupUsers";
+            return this.defaultPost(url, model);
+        };
+        RoleService.prototype.GetIntersectIdByGroupUsers = function (userIds) {
+            var url = this.serviceUri + "/GetIntersectIdByGroupUsers";
+            return this.defaultPost(url, userIds);
+        };
+        RoleService.prototype.GetIntersectDirectIdByGroupUsers = function (userIds) {
+            var url = this.serviceUri + "/GetIntersectDirectIdByGroupUsers";
+            return this.defaultPost(url, userIds);
+        };
+        RoleService.prototype.GetIntersectIdByUsers = function (userIds) {
+            var url = this.serviceUri + "/GetIntersectIdByUsers";
+            return this.defaultPost(url, userIds);
+        };
+        RoleService.prototype.GetIntersectDirectIdByUsers = function (userIds) {
+            var url = this.serviceUri + "/GetIntersectDirectIdByUsers";
+            return this.defaultPost(url, userIds);
+        };
         return RoleService;
     }(BaseService));
     RoleService.ɵprov = i0.ɵɵdefineInjectable({ factory: function RoleService_Factory() { return new RoleService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: RoleService, providedIn: "root" });