quidproquo-webserver 0.0.52 → 0.0.54

package/lib/qpqWebServerUtils.d.ts

@@ -16,7 +16,8 @@ export declare const getWebEntryFullPath: (qpqConfig: QPQConfig, webEntryQPQWebS
 export declare const getWebEntrySeoFullPath: (qpqConfig: QPQConfig, webEntryQPQWebServerConfigSetting: WebEntryQPQWebServerConfigSetting) => string;
 export declare const getApiEntryFullPath: (qpqConfig: QPQConfig, apiConfig: ApiQPQWebServerConfigSetting) => string;
 export declare const getSubdomainRedirects: (configs: QPQConfig) => SubdomainRedirectQPQWebServerConfigSetting[];
-export declare const getFeatureDomainName: (configs: QPQConfig) => string;
+export declare const getEnvironmentDomainName: (configs: QPQConfig) => string;
+export declare const getBaseDomainName: (qpqConfig: QPQConfig) => string;
 export declare const getServiceDomainName: (qpqConfig: QPQConfig) => string;
 export declare const getHeaderValue: (header: string, headers: HttpEventHeaders) => string | null;
 export declare const getAllowedOrigins: (configs: QPQConfig, route: RouteOptions) => string[];

package/lib/qpqWebServerUtils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJsonEventResponse = exports.fromJsonEventRequest = exports.getCorsHeaders = exports.getAllowedOrigins = exports.getHeaderValue = exports.getServiceDomainName = exports.getFeatureDomainName = exports.getSubdomainRedirects = exports.getApiEntryFullPath = exports.getWebEntrySeoFullPath = exports.getWebEntryFullPath = exports.getWebEntry = exports.getDomainName = exports.getAllSrcEntries = exports.getAllOpenApiSpecs = exports.getAllSeo = exports.getAllRoutes = void 0;
+exports.toJsonEventResponse = exports.fromJsonEventRequest = exports.getCorsHeaders = exports.getAllowedOrigins = exports.getHeaderValue = exports.getServiceDomainName = exports.getBaseDomainName = exports.getEnvironmentDomainName = exports.getSubdomainRedirects = exports.getApiEntryFullPath = exports.getWebEntrySeoFullPath = exports.getWebEntryFullPath = exports.getWebEntry = exports.getDomainName = exports.getAllSrcEntries = exports.getAllOpenApiSpecs = exports.getAllSeo = exports.getAllRoutes = void 0;
 const path = __importStar(require("path"));
 const quidproquo_core_1 = require("quidproquo-core");
 const QPQConfig_1 = require("./config/QPQConfig");
@@ -87,19 +87,28 @@ const getSubdomainRedirects = (configs) => {
     return subdomainRedirects;
 };
 exports.getSubdomainRedirects = getSubdomainRedirects;
-const getFeatureDomainName = (configs) => {
-    const feature = (0, qpqCoreUtils_1.getAppFeature)(configs);
+const getEnvironmentDomainName = (configs) => {
+    const environment = (0, qpqCoreUtils_1.getApplicationModuleEnvironment)(configs);
     const apexDomainName = (0, exports.getDomainName)(configs);
-    if (feature === 'production') {
+    if (environment === 'production') {
         return apexDomainName;
     }
-    return `${feature}.${apexDomainName}`;
+    return `${environment}.${apexDomainName}`;
+};
+exports.getEnvironmentDomainName = getEnvironmentDomainName;
+const getBaseDomainName = (qpqConfig) => {
+    const environmentDomain = (0, exports.getEnvironmentDomainName)(qpqConfig);
+    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    if (feature) {
+        return `${feature}.${environmentDomain}`;
+    }
+    return environmentDomain;
 };
-exports.getFeatureDomainName = getFeatureDomainName;
+exports.getBaseDomainName = getBaseDomainName;
 const getServiceDomainName = (qpqConfig) => {
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const featureDomain = (0, exports.getFeatureDomainName)(qpqConfig);
-    return `${appName}.${featureDomain}`;
+    const service = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const domainBase = (0, exports.getBaseDomainName)(qpqConfig);
+    return `${service}.${domainBase}`;
 };
 exports.getServiceDomainName = getServiceDomainName;
 const getHeaderValue = (header, headers) => {
@@ -113,7 +122,7 @@ const getHeaderValue = (header, headers) => {
 exports.getHeaderValue = getHeaderValue;
 const getAllowedOrigins = (configs, route) => {
     // Root domain
-    const rootDomain = `https://${(0, exports.getFeatureDomainName)(configs)}`;
+    const rootDomain = `https://${(0, exports.getBaseDomainName)(configs)}`;
     // generic settings
     const defaultRouteSettings = quidproquo_core_1.qpqCoreUtils.getConfigSettings(configs, QPQConfig_1.QPQWebServerConfigSettingType.DefaultRouteOptions) || [];
     const defaultAllowedOrigins = defaultRouteSettings.reduce((acc, cur) => [...acc, ...(cur.routeOptions.allowedOrigins || [])], []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-webserver",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",