tnx-shared 5.0.61 → 5.0.62

package/fesm2015/tnx-shared.js

@@ -135,7 +135,8 @@ ComCtxConstants.ROOT = {
     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',
@@ -7614,6 +7615,7 @@ class UserService extends BaseService {
         }
         else {
             this._applicationContext.getRootContext().replaySubscribeOnce(ComCtxConstants.ROOT.USER_READY, rs => {
+                const firstTimeLogin = rs;
                 const accessToken = this._oauthService.getAccessToken();
                 const 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
@@ -7655,7 +7657,12 @@ class UserService extends BaseService {
                         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);
+                    }
                 }, err => {
                 });
             });
@@ -8166,7 +8173,7 @@ GlobalService.ctorParameters = () => [];
 
 class PermissionService extends BaseService {
     constructor(http, injector, _moduleConfigService, _userService, _oauthService, _appContext) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/permission`);
+        super(http, injector, `${_moduleConfigService.getConfig().environment.authenticationSettings.coreVersion == 'v4' ? _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint : `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}`}/permission`);
         this._moduleConfigService = _moduleConfigService;
         this._userService = _userService;
         this._oauthService = _oauthService;
@@ -8312,6 +8319,10 @@ class PermissionService extends BaseService {
             }
         });
     }
+    clearPermissionCache(lstModule) {
+        const url = `${this.serviceUri}/ClearPermissionCache`;
+        return this.defaultPost(url, lstModule);
+    }
 }
 PermissionService.ɵprov = ɵɵdefineInjectable({ factory: function PermissionService_Factory() { return new PermissionService(ɵɵinject(HttpClient), ɵɵinject(INJECTOR), ɵɵinject(ModuleConfigService), ɵɵinject(UserService), ɵɵinject(OAuthService), ɵɵinject(ApplicationContextService)); }, token: PermissionService, providedIn: "root" });
 PermissionService.decorators = [
@@ -21433,10 +21444,13 @@ class MenuService {
             }
         });
     }
-    renderMenuByAppCode(appCode) {
+    renderMenuByAppCode(scopeName, appCode) {
         return __awaiter(this, void 0, void 0, function* () {
             this._menuItems = [];
-            const menuUrl = `assets/menus/${appCode.toLocaleLowerCase()}.json`;
+            let menuUrl = `assets/menus/${appCode.toLocaleLowerCase()}.json`;
+            if (scopeName) {
+                menuUrl = `assets/menus/${scopeName.toLocaleLowerCase()}/${appCode.toLocaleLowerCase()}.json`;
+            }
             fetch(menuUrl).then((rs) => __awaiter(this, void 0, void 0, function* () {
                 const menu = JSON.parse(yield rs.text());
                 this.setMenuItems(menu);
@@ -21595,7 +21609,7 @@ class AppMenuComponent {
             // 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 = link => `/${appCodeLowerCase}${link}`;
         }
-        this._menuService.renderMenuByAppCode(appCode);
+        this._menuService.renderMenuByAppCode(this.environment.scopeName, appCode);
         this.model = this._menuService.getMenuItems();
         this._router.events.pipe(filter(event => event instanceof NavigationEnd))
             .subscribe(event => {
@@ -23951,7 +23965,7 @@ ReportQueueComponent.propDecorators = {
 };
 
 class CommonAppComponentComponent {
-    constructor(_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) {
+    constructor(_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) {
         this._globalService = _globalService;
         this._commonService = _commonService;
         this.renderer = renderer;
@@ -23980,6 +23994,7 @@ class CommonAppComponentComponent {
         this._menuService = _menuService;
         this._primengConfig = _primengConfig;
         this._storageService = _storageService;
+        this._permissionService = _permissionService;
         this.showQuickNote = true;
         this.allowAnonymous = false;
         this._unsubscribeAll = new Subject();
@@ -24132,6 +24147,15 @@ class CommonAppComponentComponent {
         root.data.allowAnonymous = this.allowAnonymous;
         // get current User
         this._userService.populateCurrentUser();
+        this._componentContextService.subscribe(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE, () => __awaiter(this, void 0, void 0, function* () {
+            if (this.environment.authenticationSettings.coreVersion == 'v4') {
+                const clear = yield this.clearPermissionCacheByModule();
+                if (!clear.success) {
+                    this._notifierService.showWarning('Có vấn đề trong lúc clear cache quyền');
+                }
+            }
+            this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED);
+        }));
         this._componentContextService.subscribe(ComCtxConstants.ROOT.KEY_DOWN_ARROWLEFT, (e) => {
             if (document.activeElement === this.cancelButton.nativeElement) {
                 this.okButton.nativeElement.focus();
@@ -24636,6 +24660,17 @@ class CommonAppComponentComponent {
             }
         }
     }
+    clearPermissionCacheByModule() {
+        let appSwitcher = this._moduleConfigService.getConfig().environment.appMetadata.appSwitcher;
+        if (!appSwitcher || !appSwitcher.length) {
+            appSwitcher = [];
+        }
+        let lstModule = appSwitcher.map(x => x.code);
+        if (!lstModule) {
+            lstModule = [];
+        }
+        return this._permissionService.clearPermissionCache(lstModule);
+    }
 }
 CommonAppComponentComponent.decorators = [
     { type: Component, args: [{
@@ -24673,7 +24708,8 @@ CommonAppComponentComponent.ctorParameters = () => [
     { type: ConfirmationService },
     { type: MenuService },
     { type: PrimeNGConfig },
-    { type: StorageService }
+    { type: StorageService },
+    { type: PermissionService }
 ];
 CommonAppComponentComponent.propDecorators = {
     okButton: [{ type: ViewChild, args: ['okButton',] }],