tnx-shared 5.2.3 → 5.2.4

package/assets/gulpfile.js

@@ -329,18 +329,10 @@ function generateEnvironmentTsFile(environment) {
 }
 
 function transformEnvironmentTsAndJsonFile(envName, input) {
-    return input.replaceAll('{{environmentName}}', envName).replaceAll('{{scopeName}}', angularSchemaObj.scopeName);
-}
-
-// obsolete, đọc config từ etcd nên cái này không cần gen nữa
-function generateApplicationJsonFile() {
-    if (!fs.existsSync(`${pathSharedAssets}/environments/${angularSchemaObj.scopeName}/application.json`)) {
-        return src(`${pathSharedAssets}/environments/application-template.json`)
-            .pipe(rename(`application.json`))
-            .pipe(dest(`${pathSharedAssets}/environments/${angularSchemaObj.scopeName}`));
-    }
-
-    return true;
+    return input
+        .replaceAll('{{environmentName}}', envName)
+        .replaceAll('{{scopeName}}', angularSchemaObj.scopeName)
+        .replaceAll('{{configService}}', angularSchemaObj.configService);
 }
 
 function generateEnvironmentJsonFile(environment) {

package/bundles/tnx-shared.umd.js

@@ -933,6 +933,9 @@
         EnvironmentService.prototype.getSignalr_ClientKey = function () {
             return this.environment.signalr.clientKey;
         };
+        EnvironmentService.prototype.getApiGateway = function () {
+            return this.environment.appMetadata.gateway;
+        };
         EnvironmentService.prototype.getGatewaySubpath = function () {
             return this.environment.appMetadata.gatewaySubpath;
         };
@@ -3321,6 +3324,9 @@
     };
     var mergeJSON = function (target, source) {
         var e_1, _a;
+        if (Object.keys(source).length == 0) {
+            return target;
+        }
         if (isArray(source)) {
             if (!isArray(target)) {
                 target = [];
@@ -3431,26 +3437,30 @@
         var commonMasterDataApi = window.commonMasterDataApi;
         var appXhr = new XMLHttpRequest();
         appXhr.open('GET', commonMasterDataApi + "v5/ConfigAndSetting/GetAppConfig", false);
-        appXhr.setRequestHeader('Cache-Control', 'no-cache, no-store, max-age=0');
+        // Gọi api của mình thì ko cần logic cache này, logic này do phía api quyết định xem có cache không và cache bao lâu
+        // appXhr.setRequestHeader('Cache-Control', 'no-cache, no-store, max-age=0');
         appXhr.send(null);
         var resGetAppConfig = appXhr.responseText;
         var op = JSON.parse(resGetAppConfig).data;
-        var res = [];
-        res.push(getEnvironmentByName(personalName, scopeName, customPath));
-        while (res.length > 0) {
-            var source = JSON.parse(res.shift());
-            op = mergeJSON(op, source);
-        }
-        if (op) {
-            if (op.apps) {
-                Object.keys(op.apps).forEach(function (appCode) {
-                    op.apps[appCode].code = appCode.toLowerCase();
-                });
-            }
-            if (op.services) {
-                Object.keys(op.services).forEach(function (appCode) {
-                    op.services[appCode].code = appCode.toLowerCase();
-                });
+        // Nếu là prod thì không cần đọc cấu hình từ json nữa
+        if (personalName != 'prod') {
+            var res = [];
+            res.push(getEnvironmentByName(personalName, scopeName, customPath));
+            while (res.length > 0) {
+                var source = JSON.parse(res.shift());
+                op = mergeJSON(op, source);
+            }
+            if (op) {
+                if (op.apps) {
+                    Object.keys(op.apps).forEach(function (appCode) {
+                        op.apps[appCode].code = appCode.toLowerCase();
+                    });
+                }
+                if (op.services) {
+                    Object.keys(op.services).forEach(function (appCode) {
+                        op.services[appCode].code = appCode.toLowerCase();
+                    });
+                }
             }
         }
         return op;
@@ -25303,7 +25313,7 @@
             this._environmentService = _environmentService;
         }
         SendAccessTokenInterceptor.prototype.intercept = function (request, next) {
-            if (!this._environmentService.getDisableAuthentication) {
+            if (!this._environmentService.getDisableAuthentication()) {
                 request = request.clone({
                     setHeaders: {
                         Authorization: "Bearer " + this.authenService.getAccessToken(),
@@ -25798,7 +25808,7 @@
                 ngxMask.NgxMaskModule.forRoot(),
                 i4.OAuthModule.forRoot({
                     resourceServer: {
-                        allowedUrls: [environment.apiDomain.gateway],
+                        allowedUrls: [environment.appMetadata.appGateway],
                         sendAccessToken: false,
                     },
                 }),