tnx-shared 5.0.61 → 5.0.63

package/bundles/tnx-shared.umd.js

@@ -395,7 +395,8 @@
         MENU_CHANGED: 'MENU_CHANGED',
         ADVANCE_SEARCH_INIT_WITHOUT_UPDATE_ROUTER: 'ADVANCE_SEARCH_INIT_WITHOUT_UPDATE_ROUTER',
         SHOW_WAIT_BOX: 'SHOW_WAIT_BOX',
-        SHOW_REJECT_CONFIRM: 'SHOW_REJECT_CONFIRM'
+        SHOW_REJECT_CONFIRM: 'SHOW_REJECT_CONFIRM',
+        NEED_CLEAR_PERMISSION_CACHE: 'NEED_CLEAR_PERMISSION_CACHE'
     };
     ComCtxConstants.ROOT_USMART = {
         SHOW_CONFIG_DATA_DEFAULT: 'SHOW_CONFIG_DATA_DEFAULT',
@@ -8940,6 +8941,7 @@
             }
             else {
                 this._applicationContext.getRootContext().replaySubscribeOnce(ComCtxConstants.ROOT.USER_READY, function (rs) {
+                    var firstTimeLogin = rs;
                     var accessToken = _this._oauthService.getAccessToken();
                     var decoded = JWT.default(accessToken);
                     // Chuyển đổi sang dùng instanceId nếu đăng nhập bằng identityv4 nhưng phải sử dụng base userOrgv5
@@ -8981,7 +8983,12 @@
                             localStorage.setItem(_this.CURRENT_USER_KEY, JSON.stringify(user));
                         }
                         _this._applicationContext.getRootContext().data.currentUser = user;
-                        _this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED, true);
+                        if (firstTimeLogin) {
+                            _this._applicationContext.getRootContext().fireEvent(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE);
+                        }
+                        else {
+                            _this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED, true);
+                        }
                     }, function (err) {
                     });
                 });
@@ -9541,9 +9548,12 @@
             _this.delayCheckPermissions = [];
             _this.ignoreAdmin = false;
             _this.appCode = null;
+            if (_moduleConfigService.getConfig().environment.authenticationSettings.coreVersion == 'v4') {
+                _this.serviceUri = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint + "/permission";
+            }
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint;
-            _this.ignoreAdmin = _this._moduleConfigService.getConfig().environment.isIgnoreAdmin;
             _this.appCode = _this._moduleConfigService.getConfig().appCode;
+            _this.ignoreAdmin = _this._moduleConfigService.getConfig().environment.isIgnoreAdmin;
             return _this;
         }
         /**
@@ -9765,6 +9775,10 @@
                 }
             });
         };
+        PermissionService.prototype.clearPermissionCache = function (lstModule) {
+            var url = this.serviceUri + "/ClearPermissionCache";
+            return this.defaultPost(url, lstModule);
+        };
         return PermissionService;
     }(BaseService));
     PermissionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PermissionService_Factory() { return new PermissionService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(UserService), i0.ɵɵinject(i4.OAuthService), i0.ɵɵinject(ApplicationContextService)); }, token: PermissionService, providedIn: "root" });
@@ -20728,13 +20742,16 @@
                 });
             });
         };
-        MenuService.prototype.renderMenuByAppCode = function (appCode) {
+        MenuService.prototype.renderMenuByAppCode = function (scopeName, appCode) {
             return __awaiter(this, void 0, void 0, function () {
                 var menuUrl;
                 var _this = this;
                 return __generator(this, function (_a) {
                     this._menuItems = [];
                     menuUrl = "assets/menus/" + appCode.toLocaleLowerCase() + ".json";
+                    if (scopeName) {
+                        menuUrl = "assets/menus/" + scopeName.toLocaleLowerCase() + "/" + appCode.toLocaleLowerCase() + ".json";
+                    }
                     fetch(menuUrl).then(function (rs) { return __awaiter(_this, void 0, void 0, function () {
                         var menu, _a, _b;
                         return __generator(this, function (_c) {
@@ -20888,7 +20905,7 @@
                 // Nếu là môi trường triển khai thì cộng thêm tiền tố phân hệ vào router link để có thể chuột phải mở tab mới
                 funcSetNewTabLink = function (link) { return "/" + appCodeLowerCase + link; };
             }
-            this._menuService.renderMenuByAppCode(appCode);
+            this._menuService.renderMenuByAppCode(this.environment.scopeName, appCode);
             this.model = this._menuService.getMenuItems();
             this._router.events.pipe(operators.filter(function (event) { return event instanceof i3.NavigationEnd; }))
                 .subscribe(function (event) {
@@ -23449,7 +23466,7 @@
     };
 
     var CommonAppComponentComponent = /** @class */ (function () {
-        function CommonAppComponentComponent(_globalService, _commonService, renderer, translate, _oauthService, _authenService, _userService, _router, _title, _signalRService, _storageUpdatedService, _customRouteService, _applicationContext, _componentContextService, _activatedRoute, _deviceDetectorService, _cd, _tnClientService, _coreConfigService, _notifierService, _entityMetadataService, _moduleConfigService, _translateService, _messageService, _confirmService, _menuService, _primengConfig, _storageService) {
+        function CommonAppComponentComponent(_globalService, _commonService, renderer, translate, _oauthService, _authenService, _userService, _router, _title, _signalRService, _storageUpdatedService, _customRouteService, _applicationContext, _componentContextService, _activatedRoute, _deviceDetectorService, _cd, _tnClientService, _coreConfigService, _notifierService, _entityMetadataService, _moduleConfigService, _translateService, _messageService, _confirmService, _menuService, _primengConfig, _storageService, _permissionService) {
             var _this = this;
             this._globalService = _globalService;
             this._commonService = _commonService;
@@ -23479,6 +23496,7 @@
             this._menuService = _menuService;
             this._primengConfig = _primengConfig;
             this._storageService = _storageService;
+            this._permissionService = _permissionService;
             this.showQuickNote = true;
             this.allowAnonymous = false;
             this._unsubscribeAll = new rxjs.Subject();
@@ -23632,6 +23650,25 @@
             root.data.allowAnonymous = this.allowAnonymous;
             // get current User
             this._userService.populateCurrentUser();
+            this._componentContextService.subscribe(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE, function () { return __awaiter(_this, void 0, void 0, function () {
+                var clear;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!(this.environment.authenticationSettings.coreVersion == 'v4')) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.clearPermissionCacheByModule()];
+                        case 1:
+                            clear = _a.sent();
+                            if (!clear.success) {
+                                this._notifierService.showWarning('Có vấn đề trong lúc clear cache quyền');
+                            }
+                            _a.label = 2;
+                        case 2:
+                            this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED);
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
             this._componentContextService.subscribe(ComCtxConstants.ROOT.KEY_DOWN_ARROWLEFT, function (e) {
                 if (document.activeElement === _this.cancelButton.nativeElement) {
                     _this.okButton.nativeElement.focus();
@@ -24147,6 +24184,17 @@
                 }
             }
         };
+        CommonAppComponentComponent.prototype.clearPermissionCacheByModule = function () {
+            var appSwitcher = this._moduleConfigService.getConfig().environment.appMetadata.appSwitcher;
+            if (!appSwitcher || !appSwitcher.length) {
+                appSwitcher = [];
+            }
+            var lstModule = appSwitcher.map(function (x) { return x.code; });
+            if (!lstModule) {
+                lstModule = [];
+            }
+            return this._permissionService.clearPermissionCache(lstModule);
+        };
         return CommonAppComponentComponent;
     }());
     CommonAppComponentComponent.decorators = [
@@ -24185,7 +24233,8 @@
         { type: i1.ConfirmationService },
         { type: MenuService },
         { type: i1.PrimeNGConfig },
-        { type: StorageService }
+        { type: StorageService },
+        { type: PermissionService }
     ]; };
     CommonAppComponentComponent.propDecorators = {
         okButton: [{ type: i0.ViewChild, args: ['okButton',] }],