tnx-shared 5.1.302 → 5.1.305

package/bundles/tnx-shared.umd.js

@@ -11099,7 +11099,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;
@@ -11113,6 +11113,10 @@
                                 || (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();
@@ -11264,7 +11268,26 @@
                         case 0: return [4 /*yield*/, this._userService.getCurrentUser()];
                         case 1:
                             user = (_e.sent());
-                            resolve(true);
+                            if (user && user.issuperuser && user.issuperuser.toLowerCase() == 'true') {
+                                resolve(true);
+                                return [2 /*return*/];
+                            }
+                            if (user && user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin) {
+                                resolve(true);
+                                return [2 /*return*/];
+                            }
+                            this.getPermissions(service).then(function (permissions) {
+                                if (permissions && permissions.length) {
+                                    var isAuthorized = permissions.includes(permission);
+                                    resolve(isAuthorized);
+                                }
+                                else {
+                                    console.log("L\u1ED7i kh\u00F4ng l\u1EA5y \u0111\u01B0\u1EE3c permission cho module: " + service);
+                                    resolve(false);
+                                }
+                            }, function (error) {
+                                reject(false);
+                            });
                             return [2 /*return*/];
                     }
                 });
@@ -35621,6 +35644,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" });