@econneq/gql-auth 1.2.10 → 1.2.11

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,iBAyDtD,CAAC"}

package/dist/api-factory.js

@@ -1,5 +1,5 @@
+import { removeEmptyFields } from "./functions.js";
 import { uploadGraphQLMutation } from "./upload-gql.js";
-import { removeEmptyFields } from "./utilsGeneral.js";
 export const ApiFactory = async (options) => {
     const { newData, editData, mutationName, modelName, successField = "title", query, router, params, reload = true, redirect, redirectPath, returnResponseField = false, returnResponseObject = false, getFileMap, token, config, onAlert } = options;
     const items = Array.isArray(newData || editData) ? (newData || editData) : [(newData || editData)];
@@ -8,16 +8,14 @@ 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];
             if (response?.data?.[mutationName]) {
                 successMessages.push(result?.[successField] || "operation successful ✅");

package/dist/authServer.d.ts

@@ -0,0 +1,5 @@
+import { JwtPayload } from "./index.js";
+export declare const getServerToken: () => Promise<string | null>;
+export declare const getServerUser: () => Promise<JwtPayload | null>;
+export declare const getPermissions: (list: string[], access: number, action?: string) => boolean;
+//# sourceMappingURL=authServer.d.ts.map

package/dist/authServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authServer.d.ts","sourceRoot":"","sources":["../src/authServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,eAAO,MAAM,cAAc,8BAG1B,CAAC;AAEF,eAAO,MAAM,aAAa,kCAUzB,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,YAqB7E,CAAC"}

package/dist/authServer.js

@@ -0,0 +1,40 @@
+// utils/authServer.ts
+import { cookies } from 'next/headers';
+import { jwtDecode } from "jwt-decode";
+export const getServerToken = async () => {
+    const cookieStore = await cookies();
+    return cookieStore.get("token")?.value || null;
+};
+export const getServerUser = async () => {
+    const token = await getServerToken();
+    if (!token)
+        return null;
+    try {
+        const user = jwtDecode(token);
+        return user;
+    }
+    catch (error) {
+        return null;
+    }
+};
+export const getPermissions = (list, access, action) => {
+    if (!list || list.length < 1)
+        return false;
+    try {
+        return list.some(entry => {
+            // If only num is provided, check if entry starts with that number followed by non-digits
+            if (access && !action) {
+                const regex = new RegExp(`^${access}(?!\\d)`);
+                return regex.test(entry);
+            }
+            // If both are provided, check for the exact combination
+            if (access && action) {
+                return entry === `${access}${action}`;
+            }
+            return false;
+        });
+    }
+    catch (error) {
+        return false;
+    }
+};

package/dist/client.d.ts

@@ -3,13 +3,10 @@ export default function getApolloClient(options?: {
     csrfToken?: string;
     cookie?: string;
 }, domain?: string | null, config?: {
-    protocol: string;
-    RootApi: string;
     Subdomains: {
         subdomain: string;
         processId?: string;
         widgetID?: string;
     }[];
-    apiKey: string;
 }): Promise<ApolloClient | null>;
 //# sourceMappingURL=client.d.ts.map

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;CAC5E,GACA,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgE9B"}

package/dist/client.js

@@ -5,20 +5,41 @@ 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 urlDomain = process.env.NEXT_PUBLIC_DOMAIN_URL || process.env.DOMAIN_URL; // e.g e-conneq.com
+    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 (!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;
-    const baseUrl = `${protocol + RootApi}`;
-    const uri = `${baseUrl}/graphql/`;
+    let uri;
+    let destUrl;
+    const sourceHost = `${protocol}${tenant?.subdomain || "public"}.${urlDomain}`;
+    if (isServer) {
+        destUrl = `http://${urlBackEndInt}`;
+        uri = `${destUrl}/graphql/`;
+    }
+    else {
+        uri = "/api/graphql";
+        destUrl = `${protocol}${urlBackEndExt}`;
+    }
+    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 dynamicHost = domain
-        ? `${domain}.${RootApi}`
-        : RootApi;
     const headers = {
         'Content-Type': 'application/json',
-        'X-API-KEY': apiKey,
+        // 'X-API-KEY': apiKey,
         ...(options?.cookie && { 'Cookie': options.cookie }),
         ...(csrfToken && { 'X-CSRFToken': csrfToken }),
         ...(tenant && {
@@ -26,13 +47,13 @@ export default async function getApolloClient(options, domain, config) {
             'X-Process-ID': tenant?.processId || "",
             'X-Widget-ID': tenant?.widgetID || "",
         }),
-        'Referer': baseUrl,
-        'Host': isServer ? dynamicHost : window.location.host,
+        'Referer': destUrl,
+        'Host': isServer ? sourceHost : window.location.host,
     };
     return new ApolloClient({
         link: new HttpLink({
             uri,
-            fetch, // Next.js polyfills fetch on server automatically
+            fetch,
             headers,
         }),
         cache: new InMemoryCache(),

package/dist/functions.d.ts

@@ -0,0 +1,6 @@
+import { JwtPayload } from "./index.js";
+export declare const logout: () => void;
+export declare const getToken: () => string | null;
+export declare const getUser: () => JwtPayload | null;
+export declare const removeEmptyFields: (obj: any) => any;
+//# sourceMappingURL=functions.d.ts.map

package/dist/functions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGxC,eAAO,MAAM,MAAM,YAclB,CAAC;AAEF,eAAO,MAAM,QAAQ,qBAKpB,CAAC;AAEF,eAAO,MAAM,OAAO,yBAInB,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,KAAK,GAAG,QAUzC,CAAC"}

package/dist/functions.js

@@ -0,0 +1,38 @@
+import Cookies from "js-cookie";
+import { jwtDecode } from "jwt-decode";
+export const logout = () => {
+    // 1. Clear Local Storage
+    localStorage.removeItem("token");
+    const tokenDeleteString = "token=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
+    document.cookie = tokenDeleteString;
+    // 3. Fallback: Clear ALL cookies (your original loop)
+    const cookies = document.cookie.split(";");
+    for (let i = 0; i < cookies.length; i++) {
+        const cookie = cookies[i];
+        const eqPos = cookie.indexOf("=");
+        const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim();
+        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;`;
+    }
+};
+export const getToken = () => {
+    if (typeof window === "undefined") {
+        return null;
+    }
+    return Cookies.get("token") || localStorage.getItem("token");
+};
+export const getUser = () => {
+    const token = getToken();
+    const user = token ? jwtDecode(token) : null;
+    return user;
+};
+export const removeEmptyFields = (obj) => {
+    const newObj = {};
+    for (const key in obj) {
+        // Keep File objects and non-empty values
+        if (obj[key] instanceof File ||
+            (obj[key] !== null && obj[key] !== undefined && obj[key] !== '')) {
+            newObj[key] = obj[key];
+        }
+    }
+    return newObj;
+};

package/dist/index.d.ts

@@ -1,14 +1,9 @@
-import { ReactNode } from "react";
 import { queryServerGraphQL } from './query-server.js';
 import { ApiFactory } from './api-factory.js';
 import { uploadGraphQLMutation } from './upload-gql.js';
 export { queryServerGraphQL, ApiFactory, uploadGraphQLMutation };
 export type ConfigType = {
-    protocol: string;
-    RootApi: string;
-    NoDomainRootApi: string;
     Subdomains: SubdomainItem[];
-    apiKey: string;
     fonts: string[];
 };
 export type SubdomainItem = {
@@ -21,10 +16,6 @@ export type ApolloOptions = {
     csrfToken?: string;
     cookie?: string;
 };
-export type SelectOptions = string | {
-    label: string;
-    value: string | number;
-};
 export interface InterLoginData {
     username: string;
     password: string;
@@ -47,39 +38,14 @@ export interface JwtPayload {
     is_active?: boolean;
     is_hod?: boolean;
     role?: string;
-    dept?: string[] | any;
+    depts?: string[] | any;
     page?: string[] | any;
     school?: number[] | any;
     domain?: number[] | any;
+    permissions?: string[];
     language?: string[];
     last_login?: any;
 }
-export interface InterField {
-    name: string;
-    label: string;
-    inputType: 'text' | "textarea" | 'number' | 'float' | 'search-select' | 'select' | 'file' | 'date' | 'password';
-    type: 'text' | 'textarea' | 'number' | 'float' | 'email' | 'date' | 'file' | 'password';
-    required?: boolean;
-    min?: number;
-    max?: number;
-    message?: string;
-    options?: {
-        value: string | number;
-        label: string;
-    }[];
-    show?: boolean;
-    sort?: boolean;
-    placeholder?: string;
-    acceptedFileType?: string;
-    icon?: ReactNode;
-    labelIcon?: ReactNode;
-}
-export interface InterFieldList {
-    rowId: number | string;
-    desktopCols: 1 | 2 | 3 | 4;
-    mobileCols: 1 | 2;
-    fields: InterField[];
-}
-export { capitalizeEachWord, errorLog, getToken, getUser, logout, getStoredFont, getTimeAgo, getLanguage, getTemplate, decodeUrlID, removeEmptyFields, Alert, validateFormFields, lastYears, formatText, } from './utilsGeneral.js';
-export { getProfile, getClass, getClassName, getLevel, getAcademicYear, getAcademicYearStudent } from './utilsSchool.js';
+export { getToken, getUser, logout, removeEmptyFields, } from './functions.js';
+export { getServerToken, getServerUser, getPermissions } from './authServer.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,qBAAqB,EAAE,CAAC;AAIjE,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAGD,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAGD,OAAO,EACL,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,iBAAiB,GAC7C,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,cAAc,EAAE,aAAa,EAAE,cAAc,EAC9C,MAAM,iBAAiB,CAAC"}

package/dist/index.js

@@ -1,8 +1,6 @@
-// 1. Export the Core Functions
 import { queryServerGraphQL } from './query-server.js';
 import { ApiFactory } from './api-factory.js';
 import { uploadGraphQLMutation } from './upload-gql.js';
 export { queryServerGraphQL, ApiFactory, uploadGraphQLMutation };
-// 3. Export Helper Utilities (Optional)
-export { capitalizeEachWord, errorLog, getToken, getUser, logout, getStoredFont, getTimeAgo, getLanguage, getTemplate, decodeUrlID, removeEmptyFields, Alert, validateFormFields, lastYears, formatText, } from './utilsGeneral.js';
-export { getProfile, getClass, getClassName, getLevel, getAcademicYear, getAcademicYearStudent } from './utilsSchool.js';
+export { getToken, getUser, logout, removeEmptyFields, } from './functions.js';
+export { getServerToken, getServerUser, getPermissions } from './authServer.js';

package/dist/query-server.d.ts

@@ -3,10 +3,7 @@ type ServerQueryArgs = {
     variables?: Record<string, any>;
     domain?: string | null;
     config: {
-        protocol: string;
-        RootApi: string;
         Subdomains: any[];
-        apiKey: string;
     };
 };
 export declare function queryServerGraphQL<T = any>({ query, variables, domain, config, }: ServerQueryArgs): Promise<T | null>;

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

@@ -1 +1 @@
-{"version":3,"file":"query-server.d.ts","sourceRoot":"","sources":["../src/query-server.ts"],"names":[],"mappings":"AAMA,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;KACnB,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

@@ -1,17 +1,11 @@
 // src/server-query.ts
-/// <reference types="next" />
 'use server';
 import { cookies } from 'next/headers';
 import getApolloClient from './client.js';
 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;
@@ -20,12 +14,9 @@ export async function queryServerGraphQL({ query, variables = {}, domain, config
             variables,
             fetchPolicy: 'no-cache',
         });
-        console.log("getting @e-conneq/gql-auth ........");
         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,15 +5,12 @@ type UploadGraphQLArgs = {
     token?: string;
     params: any;
     config: {
-        protocol: string;
-        RootApi: string;
         Subdomains: {
             subdomain: string;
             id: string | number;
             processId: string;
             widgetID: string;
         }[];
-        apiKey?: string;
     };
 };
 export declare function uploadGraphQLMutation({ query, variables, fileMap, token, params, config }: UploadGraphQLArgs): Promise<any>;

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;KAC/F,CAAC;CACH,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,EAC1C,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,EACL,MAAM,EACN,MAAM,EACP,EAAE,iBAAiB,gBAuEnB"}

package/dist/upload-gql.js

@@ -1,5 +1,15 @@
 export async function uploadGraphQLMutation({ query, variables, fileMap, token, params, config }) {
-    const { protocol, RootApi, Subdomains, apiKey } = config;
+    const isServer = typeof window === "undefined";
+    const { Subdomains } = config;
+    const BACKEND_URL_INT = process.env.BACKEND_URL_INT;
+    const API_KEY = process.env.API_KEY || "";
+    let API_LINK;
+    if (isServer) {
+        API_LINK = `${BACKEND_URL_INT}/graphql/`;
+    }
+    else {
+        API_LINK = `/api/graphql`;
+    }
     const formData = new FormData();
     const updatedVariables = { ...variables };
     // 1. Prepare GraphQL Multipart Request (Spec compliant)
@@ -20,25 +30,26 @@ 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"] = BACKEND_URL_INT || "";
+    }
     // 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 || "";
+        headers["X-API-KEY"] = API_KEY || "";
     }
-    // 4. Execute Fetch
+    if (!tenantData?.subdomain)
+        throw ("No Tenant Found ===================>");
     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.2.10",
+  "version": "1.2.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",