@econneq/gql-auth 1.0.17 → 1.0.18

package/dist/api-factory.d.ts

@@ -9,8 +9,6 @@ type SubmitOptions = {
     router: any;
     token?: string;
     config: {
-        protocol: string;
-        RootApi: string;
         Subdomains: any[];
     };
     onAlert: (options: {

package/dist/api-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-factory.d.ts","sourceRoot":"","sources":["../src/api-factory.ts"],"names":[],"mappings":"AAIA,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,GAAG,EAAE,CAAC;KACnB,CAAC;IACF,OAAO,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACjF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,SAAS,aAAa,iBA0DtD,CAAC"}
+{"version":3,"file":"api-factory.d.ts","sourceRoot":"","sources":["../src/api-factory.ts"],"names":[],"mappings":"AAIA,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,UAAU,EAAE,GAAG,EAAE,CAAC;KACnB,CAAC;IACF,OAAO,EAAE,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACjF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,SAAS,aAAa,iBA0DtD,CAAC"}

package/dist/api-factory.js

@@ -8,14 +8,13 @@ export const ApiFactory = async (options) => {
     let responseFieldData = null;
     for (const res of items) {
         try {
-            console.log("launching e-conneq/auth-gql ......");
             const response = await uploadGraphQLMutation({
                 query: query.loc?.source.body || "",
                 variables: removeEmptyFields(res),
                 fileMap: getFileMap ? getFileMap(res) : {},
-                params, // Pass domain params for multi-tenancy
+                params,
                 token,
-                config, // Pass global URLs and Subdomain list
+                config,
             });
             console.log("response e-conneq/auth-gql ......");
             const result = response?.data?.[mutationName]?.[modelName];

package/dist/client.d.ts

@@ -3,8 +3,6 @@ export default function getApolloClient(options?: {
     csrfToken?: string;
     cookie?: string;
 }, domain?: string | null, config?: {
-    protocol: string;
-    RootApi: string;
     Subdomains: {
         subdomain: string;
         processId?: string;

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,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,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,CAgD9B"}
+{"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,CA4D9B"}

package/dist/client.js

@@ -5,17 +5,29 @@ export default async function getApolloClient(options, domain, config) {
     if (!config)
         throw new Error("Configuration is required for getApolloClient");
     const isServer = typeof window === "undefined";
-    const { protocol, RootApi, Subdomains, apiKey } = config;
-    // 1. Find Tenant Data
+    const { Subdomains } = config;
+    const apiKey = process.env.API_KEY || "";
+    const protocol = process.env.PROTOCOL;
+    const production = process.env.NODE_ENV === "production";
+    const host = production ? process.env.INTERNAL_API_URL : process.env.EXTERNAL_API_URL;
+    if (!host)
+        throw new Error("Env (INTERNAL_API_URL or EXTERNAL_API_URL) is required");
+    if (!protocol)
+        throw new Error("Env (PROTOCOL) is required");
+    let uri;
+    console.log("client - isServer =====>", isServer);
+    if (isServer) {
+        uri = `${protocol}${host}/graphql/`;
+    }
+    else {
+        uri = "/api/graphql";
+    }
     const tenant = domain
         ? Subdomains.find((s) => s.subdomain.toLowerCase() === domain.toLowerCase())
         : null;
-    const baseUrl = `${protocol + RootApi}`;
-    const uri = `${baseUrl}/graphql/`;
+    const baseUrl = `${protocol + host}`;
     const csrfToken = options?.csrfToken || (!isServer ? Cookies.get("csrftoken") : "");
-    const dynamicHost = domain
-        ? `${domain}.${RootApi}`
-        : RootApi;
+    const dynamicHost = domain ? `${domain}.${host}` : host;
     const headers = {
         'Content-Type': 'application/json',
         'X-API-KEY': apiKey,
@@ -32,7 +44,7 @@ export default async function getApolloClient(options, domain, config) {
     return new ApolloClient({
         link: new HttpLink({
             uri,
-            fetch, // Next.js polyfills fetch on server automatically
+            fetch,
             headers,
         }),
         cache: new InMemoryCache(),

package/dist/query-server.d.ts

@@ -3,8 +3,6 @@ type ServerQueryArgs = {
     variables?: Record<string, any>;
     domain?: string | null;
     config: {
-        protocol: string;
-        RootApi: string;
         Subdomains: any[];
         apiKey: string;
     };

package/dist/query-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-server.d.ts","sourceRoot":"","sources":["../src/query-server.ts"],"names":[],"mappings":"AAKA,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,CAAC,GAAG,GAAG,EAAE,EAChD,KAAK,EACL,SAAc,EACd,MAAM,EACN,MAAM,GACP,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CA8BrC"}
+{"version":3,"file":"query-server.d.ts","sourceRoot":"","sources":["../src/query-server.ts"],"names":[],"mappings":"AAKA,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE;QACN,UAAU,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,CAAC,GAAG,GAAG,EAAE,EAChD,KAAK,EACL,SAAc,EACd,MAAM,EACN,MAAM,GACP,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAyBrC"}

package/dist/query-server.js

@@ -4,13 +4,8 @@ import { cookies } from 'next/headers';
 import getApolloClient from './client';
 export async function queryServerGraphQL({ query, variables = {}, domain, config, }) {
     try {
-        // 1. Get server-side cookies
         const cookieStore = await cookies();
         const cookieString = cookieStore.toString();
-        // 2. Call getApolloClient with the correct 3 arguments:
-        // Arg 1: options (cookies)
-        // Arg 2: domain (subdomain string)
-        // Arg 3: config (URLs and Subdomain array)
         const client = await getApolloClient({ cookie: cookieString }, domain, config);
         if (!client)
             return null;
@@ -23,7 +18,6 @@ export async function queryServerGraphQL({ query, variables = {}, domain, config
         return result?.data;
     }
     catch (err) {
-        // On the server, we console.error instead of using Swal
         console.error("GraphQL Server Error:", err);
         return null;
     }

package/dist/upload-gql.d.ts

@@ -5,8 +5,6 @@ type UploadGraphQLArgs = {
     token?: string;
     params: any;
     config: {
-        protocol: string;
-        RootApi: string;
         Subdomains: {
             subdomain: string;
             id: string | number;

package/dist/upload-gql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-gql.d.ts","sourceRoot":"","sources":["../src/upload-gql.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,EAC1C,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,EACL,MAAM,EACN,MAAM,EACP,EAAE,iBAAiB,gBA0DnB"}
+{"version":3,"file":"upload-gql.d.ts","sourceRoot":"","sources":["../src/upload-gql.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE;QACN,UAAU,EAAE;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,EAC1C,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,EACL,MAAM,EACN,MAAM,EACP,EAAE,iBAAiB,gBAwEnB"}

package/dist/upload-gql.js

@@ -1,5 +1,16 @@
 export async function uploadGraphQLMutation({ query, variables, fileMap, token, params, config }) {
-    const { protocol, RootApi, Subdomains, apiKey } = config;
+    const isServer = typeof window === "undefined";
+    const { Subdomains, apiKey } = config;
+    const protocol = process.env.PROTOCOL;
+    const production = process.env.NODE_ENV === "production";
+    const host = production ? process.env.INTERNAL_API_URL : process.env.EXTERNAL_API_URL;
+    let API_LINK;
+    if (isServer) {
+        API_LINK = `${protocol}${host}/graphql/`;
+    }
+    else {
+        API_LINK = `/api/graphql`;
+    }
     const formData = new FormData();
     const updatedVariables = { ...variables };
     // 1. Prepare GraphQL Multipart Request (Spec compliant)
@@ -20,25 +31,27 @@ export async function uploadGraphQLMutation({ query, variables, fileMap, token,
     // 2. Multi-tenant URL and Data Logic
     const requestedDomain = params?.domain || "";
     const tenantData = Subdomains.find((d) => d.subdomain.toLowerCase() === requestedDomain.toLowerCase());
-    // Determine URL: Use subdomain api if tenant exists, otherwise use root API
-    const API_LINK = `${protocol + RootApi}/graphql/`;
     // 3. Construct Headers
     const headers = {
         ...(token ? { "Authorization": `Bearer ${token}` } : {}),
         ...(apiKey ? { "X-API-KEY": apiKey } : {}),
     };
+    if (isServer) {
+        // headers["Host"] = requestedDomain ? `${requestedDomain}.${host}` : host;
+        headers["Host"] = host || "";
+    }
     // Inject specific tenant metadata into headers for Django to read
     if (tenantData) {
         headers["X-Tenant-ID"] = String(tenantData.subdomain);
         headers["X-Process-ID"] = tenantData.processId || "";
         headers["X-Widget-ID"] = tenantData.widgetID || "";
     }
-    // 4. Execute Fetch
+    console.log(`Host (upload.js) ==========: ${host}`);
+    console.log(`Mutation connecting to (upload.js) ==========: ${API_LINK}`);
     const res = await fetch(API_LINK, {
         method: "POST",
         headers,
         body: formData,
-        // credentials: "include" is important if you use cookies alongside headers
         credentials: "include",
     });
     return await res.json();

package/package.json

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