@constructive-io/graphql-server 4.40.1 → 4.40.2

package/esm/middleware/api.js

@@ -111,6 +111,21 @@ const resolveModuleSettings = async (registry, ctx) => {
 // =============================================================================
 const isApiError = (result) => !!result && typeof result.errorHtml === 'string';
 const parseCommaSeparatedHeader = (value) => value.split(',').map((s) => s.trim()).filter(Boolean);
+const getPrivateHeaderMode = (headers) => {
+    if (headers.apiName)
+        return 'api-name-header';
+    if (headers.schemata)
+        return 'schemata-header';
+    if (headers.metaSchema)
+        return 'meta-schema-header';
+    return null;
+};
+const getRoutingHeaders = (req) => ({
+    schemata: req.get('X-Schemata'),
+    apiName: req.get('X-Api-Name'),
+    metaSchema: req.get('X-Meta-Schema'),
+    databaseId: req.get('X-Database-Id'),
+});
 const getUrlDomains = (req) => {
     const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
     const parsed = parseUrl(fullUrl);
@@ -127,14 +142,16 @@ export const getSvcKey = (opts, req) => {
     const { domain, subdomains } = getUrlDomains(req);
     const baseKey = subdomains.filter((n) => n !== 'www').concat(domain).join('.');
     if (opts.api?.isPublic === false) {
-        if (req.get('X-Api-Name')) {
-            return `api:${req.get('X-Database-Id')}:${req.get('X-Api-Name')}`;
+        const headers = getRoutingHeaders(req);
+        const mode = getPrivateHeaderMode(headers);
+        if (mode === 'api-name-header') {
+            return `api:${headers.databaseId}:${headers.apiName}`;
         }
-        if (req.get('X-Schemata')) {
-            return `schemata:${req.get('X-Database-Id')}:${req.get('X-Schemata')}`;
+        if (mode === 'schemata-header') {
+            return `schemata:${headers.databaseId}:${headers.schemata}`;
         }
-        if (req.get('X-Meta-Schema')) {
-            return `metaschema:api:${req.get('X-Database-Id')}`;
+        if (mode === 'meta-schema-header') {
+            return `metaschema:api:${headers.databaseId}`;
         }
     }
     return baseKey;
@@ -193,12 +210,7 @@ const determineMode = (ctx) => {
     if (opts.api?.enableServicesApi === false)
         return 'services-disabled';
     if (opts.api?.isPublic === false) {
-        if (headers.schemata)
-            return 'schemata-header';
-        if (headers.apiName)
-            return 'api-name-header';
-        if (headers.metaSchema)
-            return 'meta-schema-header';
+        return getPrivateHeaderMode(headers) ?? 'domain-lookup';
     }
     return 'domain-lookup';
 };
@@ -320,12 +332,7 @@ export const getApiConfig = async (opts, req) => {
         domain,
         subdomain,
         cacheKey,
-        headers: {
-            schemata: req.get('X-Schemata'),
-            apiName: req.get('X-Api-Name'),
-            metaSchema: req.get('X-Meta-Schema'),
-            databaseId: req.get('X-Database-Id'),
-        },
+        headers: getRoutingHeaders(req),
     };
     // Validate schemas upfront for modes that need them
     const apiOpts = opts.api || {};

package/middleware/api.js

@@ -117,6 +117,21 @@ const resolveModuleSettings = async (registry, ctx) => {
 // =============================================================================
 const isApiError = (result) => !!result && typeof result.errorHtml === 'string';
 const parseCommaSeparatedHeader = (value) => value.split(',').map((s) => s.trim()).filter(Boolean);
+const getPrivateHeaderMode = (headers) => {
+    if (headers.apiName)
+        return 'api-name-header';
+    if (headers.schemata)
+        return 'schemata-header';
+    if (headers.metaSchema)
+        return 'meta-schema-header';
+    return null;
+};
+const getRoutingHeaders = (req) => ({
+    schemata: req.get('X-Schemata'),
+    apiName: req.get('X-Api-Name'),
+    metaSchema: req.get('X-Meta-Schema'),
+    databaseId: req.get('X-Database-Id'),
+});
 const getUrlDomains = (req) => {
     const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
     const parsed = (0, url_domains_1.parseUrl)(fullUrl);
@@ -134,14 +149,16 @@ const getSvcKey = (opts, req) => {
     const { domain, subdomains } = getUrlDomains(req);
     const baseKey = subdomains.filter((n) => n !== 'www').concat(domain).join('.');
     if (opts.api?.isPublic === false) {
-        if (req.get('X-Api-Name')) {
-            return `api:${req.get('X-Database-Id')}:${req.get('X-Api-Name')}`;
+        const headers = getRoutingHeaders(req);
+        const mode = getPrivateHeaderMode(headers);
+        if (mode === 'api-name-header') {
+            return `api:${headers.databaseId}:${headers.apiName}`;
         }
-        if (req.get('X-Schemata')) {
-            return `schemata:${req.get('X-Database-Id')}:${req.get('X-Schemata')}`;
+        if (mode === 'schemata-header') {
+            return `schemata:${headers.databaseId}:${headers.schemata}`;
         }
-        if (req.get('X-Meta-Schema')) {
-            return `metaschema:api:${req.get('X-Database-Id')}`;
+        if (mode === 'meta-schema-header') {
+            return `metaschema:api:${headers.databaseId}`;
         }
     }
     return baseKey;
@@ -201,12 +218,7 @@ const determineMode = (ctx) => {
     if (opts.api?.enableServicesApi === false)
         return 'services-disabled';
     if (opts.api?.isPublic === false) {
-        if (headers.schemata)
-            return 'schemata-header';
-        if (headers.apiName)
-            return 'api-name-header';
-        if (headers.metaSchema)
-            return 'meta-schema-header';
+        return getPrivateHeaderMode(headers) ?? 'domain-lookup';
     }
     return 'domain-lookup';
 };
@@ -328,12 +340,7 @@ const getApiConfig = async (opts, req) => {
         domain,
         subdomain,
         cacheKey,
-        headers: {
-            schemata: req.get('X-Schemata'),
-            apiName: req.get('X-Api-Name'),
-            metaSchema: req.get('X-Meta-Schema'),
-            databaseId: req.get('X-Database-Id'),
-        },
+        headers: getRoutingHeaders(req),
     };
     // Validate schemas upfront for modes that need them
     const apiOpts = opts.api || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "4.40.1",
+  "version": "4.40.2",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -90,5 +90,5 @@
     "nodemon": "^3.1.14",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "8b9a410cb57ddbd0fa685c6177b979a97178bd4e"
+  "gitHead": "ed31ed2aa63fcd2d42acec6f27e672dd300a3959"
 }