@econneq/gql-auth 1.2.3 → 1.2.5

package/dist/authServer.d.ts

@@ -1,5 +1,5 @@
 import { JwtPayload } from ".";
 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;
+export declare const getPermissions: (list: string[], access: number, action?: string) => boolean;
 //# sourceMappingURL=authServer.d.ts.map

package/dist/authServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authServer.d.ts","sourceRoot":"","sources":["../src/authServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,eAAO,MAAM,cAAc,8BAG1B,CAAC;AAEF,eAAO,MAAM,aAAa,kCAUzB,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,EAAE,QAAQ,MAAM,EAAE,QAAQ,MAAM,YAqB5E,CAAC"}
+{"version":3,"file":"authServer.d.ts","sourceRoot":"","sources":["../src/authServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAE/B,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

@@ -24,7 +24,7 @@ export const getPermissions = (list, access, action) => {
         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}[a-zA-Z]+$`);
+                const regex = new RegExp(`^${access}(?!\\d)`);
                 return regex.test(entry);
             }
             // If both are provided, check for the exact combination

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,CA8D9B"}
+{"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"}

package/dist/client.js

@@ -7,31 +7,37 @@ 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;
-    const hostExt = process.env.NEXT_PUBLIC_EXTERNAL_API_URL || process.env.EXTERNAL_API_URL;
-    if (!hostInt)
-        throw new Error("Env (INTERNAL_API_URL) is required");
-    if (!hostExt)
-        throw new Error("Env (EXTERNAL_API_URL) is required");
+    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_INTERNAL_URL || process.env.BACKEND_INTERNAL_URL; // 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_EXTERNAL_URL || process.env.BACKEND_EXTERNAL_URL; // 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_INTERNAL_URL) is required");
+    if (!urlBackEndExt)
+        throw new Error("Env (BACKEND_EXTERNAL_URL) is required");
+    const tenant = domain
+        ? Subdomains.find((s) => s.subdomain.toLowerCase() === domain.toLowerCase())
+        : null;
     let uri;
     let baseUrl;
-    let dynamicHost;
+    const sourceHost = `${protocol}${tenant?.subdomain || "public"}.${urlDomain}`;
     if (isServer) {
-        uri = `http://${hostInt}/graphql/`;
-        baseUrl = `http://${hostInt}`;
-        dynamicHost = domain ? `${domain}.${hostInt}` : hostInt;
+        // Use the internal host for the physical connection
+        baseUrl = `http://${urlBackEndInt}`;
+        uri = `${baseUrl}/graphql/`;
     }
     else {
         uri = "/api/graphql";
-        baseUrl = `${protocol + hostExt}`;
-        dynamicHost = domain ? `${domain}.${hostExt}` : hostExt;
+        // Use the EXTERNAL host for the logical Identity (Host Header)
+        baseUrl = `${urlBackEndExt}`;
     }
-    const tenant = domain
-        ? Subdomains.find((s) => s.subdomain.toLowerCase() === domain.toLowerCase())
-        : null;
+    console.log("g-auth uri ==============", uri);
+    console.log("g-auth baseUrl ==========", baseUrl);
+    console.log("g-auth sourceHost =======", sourceHost);
     const csrfToken = options?.csrfToken || (!isServer ? Cookies.get("csrftoken") : "");
     const headers = {
         'Content-Type': 'application/json',
@@ -44,7 +50,7 @@ export default async function getApolloClient(options, domain, config) {
             'X-Widget-ID': tenant?.widgetID || "",
         }),
         'Referer': baseUrl,
-        'Host': isServer ? dynamicHost : window.location.host,
+        'Host': isServer ? sourceHost : window.location.host,
     };
     return new ApolloClient({
         link: new HttpLink({

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,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,gBAqEnB"}
+{"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,gBAsEnB"}

package/dist/upload-gql.js

@@ -6,7 +6,8 @@ export async function uploadGraphQLMutation({ query, variables, fileMap, token,
     const host = production ? process.env.INTERNAL_API_URL : process.env.EXTERNAL_API_URL;
     let API_LINK;
     if (isServer) {
-        API_LINK = `http://${host}/graphql/`;
+        // API_LINK = `$http://${host}/graphql/`;
+        API_LINK = `/api/graphql/`;
     }
     else {
         API_LINK = `/api/graphql`;

package/package.json

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