@econneq/gql-auth 1.2.4 → 1.2.6

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAGvE,wBAA8B,eAAe,CAC3C,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EACjD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EACtB,MAAM,CAAC,EAAE;IACP,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC3E,MAAM,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAkE9B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAGvE,wBAA8B,eAAe,CAC3C,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EACjD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EACtB,MAAM,CAAC,EAAE;IACP,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC3E,MAAM,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgE9B"}

package/dist/client.js

@@ -7,37 +7,35 @@ export default async function getApolloClient(options, domain, config) {
     const isServer = typeof window === "undefined";
     const { Subdomains } = config;
     const apiKey = process.env.API_KEY || "";
-    const protocol = process.env.NEXT_PUBLIC_PROTOCOL || process.env.PROTOCOL;
-    const hostInt = process.env.NEXT_PUBLIC_INTERNAL_API_URL || process.env.INTERNAL_API_URL; // e.g api:8000 (docker) or 127.0.0.1:8100 (VPS host) or localhost:8001 (local host)
     const urlDomain = process.env.NEXT_PUBLIC_DOMAIN_URL || process.env.DOMAIN_URL; // e.g e-conneq.com
-    const urlBackEnd = process.env.NEXT_PUBLIC_BACKEND_URL || process.env.BACKEND_URL; // e.g https://admin.e-conneq.com
-    if (!protocol)
-        throw new Error("Env (PROTOCOL) is required");
-    if (!hostInt)
-        throw new Error("Env (INTERNAL_API_URL) is required");
+    const protocol = process.env.NEXT_PUBLIC_PROTOCOL || process.env.PROTOCOL; // e.g https:// or e.g http://
+    const urlBackEndInt = process.env.NEXT_PUBLIC_BACKEND_URL_INT || process.env.BACKEND_URL_INT; // e.g api:8000 (docker) or 127.0.0.1:8100 (VPS host) or localhost:8001 (local host)
+    const urlBackEndExt = process.env.NEXT_PUBLIC_BACKEND_URL_EXT || process.env.BACKEND_URL_EXT; // e.g https://admin.e-conneq.com
     if (!urlDomain)
         throw new Error("Env (DOMAIN_URL) is required");
-    if (!urlBackEnd)
-        throw new Error("Env (BACKEND_URL) is required");
+    if (!protocol)
+        throw new Error("Env (PROTOCOL) is required");
+    if (!urlBackEndInt)
+        throw new Error("Env (BACKEND_URL_INT) is required");
+    if (!urlBackEndExt)
+        throw new Error("Env (BACKEND_URL_EXT) is required");
     const tenant = domain
         ? Subdomains.find((s) => s.subdomain.toLowerCase() === domain.toLowerCase())
         : null;
     let uri;
-    let baseUrl;
+    let destUrl;
     const sourceHost = `${protocol}${tenant?.subdomain || "public"}.${urlDomain}`;
     if (isServer) {
-        // Use the internal host for the physical connection
-        baseUrl = `http://${hostInt}`;
-        uri = `${baseUrl}/graphql/`;
+        destUrl = `http://${urlBackEndInt}`;
+        uri = `${destUrl}/graphql/`;
     }
     else {
         uri = "/api/graphql";
-        // Use the EXTERNAL host for the logical Identity (Host Header)
-        baseUrl = `${urlBackEnd}`;
+        destUrl = `${protocol}${urlBackEndExt}`;
     }
-    console.log("uri", uri);
-    console.log("baseUrl", baseUrl);
-    console.log("sourceHost", sourceHost);
+    console.log("g-auth uri ==============", uri);
+    console.log("g-auth sourceHost =======", sourceHost);
+    console.log("g-auth destinationHost ==========", destUrl);
     const csrfToken = options?.csrfToken || (!isServer ? Cookies.get("csrftoken") : "");
     const headers = {
         'Content-Type': 'application/json',
@@ -49,7 +47,7 @@ export default async function getApolloClient(options, domain, config) {
             'X-Process-ID': tenant?.processId || "",
             'X-Widget-ID': tenant?.widgetID || "",
         }),
-        'Referer': baseUrl,
+        'Referer': destUrl,
         'Host': isServer ? sourceHost : window.location.host,
     };
     return new ApolloClient({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@econneq/gql-auth",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",