@econneq/gql-auth 1.2.5 → 1.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/client.d.ts.map +1 -1
  2. package/dist/client.js +12 -14
  3. package/dist/index.d.ts +0 -3
  4. package/dist/index.d.ts.map +1 -1
  5. package/dist/upload-gql.d.ts +0 -1
  6. package/dist/upload-gql.d.ts.map +1 -1
  7. package/dist/upload-gql.js +8 -8
  8. package/package.json +1 -1
package/dist/client.d.ts.map CHANGED
@@ -1 +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"}
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,CAgE9B"}
package/dist/client.js CHANGED
@@ -6,42 +6,40 @@ export default async function getApolloClient(options, domain, config) {
6
6
  throw new Error("Configuration is required for getApolloClient");
7
7
  const isServer = typeof window === "undefined";
8
8
  const { Subdomains } = config;
9
- const apiKey = process.env.API_KEY || "";
9
+ // const apiKey = process.env.API_KEY || "";
10
10
  const urlDomain = process.env.NEXT_PUBLIC_DOMAIN_URL || process.env.DOMAIN_URL; // e.g e-conneq.com
11
11
  const protocol = process.env.NEXT_PUBLIC_PROTOCOL || process.env.PROTOCOL; // e.g https:// or e.g http://
12
- 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)
13
- const urlBackEndExt = process.env.NEXT_PUBLIC_BACKEND_EXTERNAL_URL || process.env.BACKEND_EXTERNAL_URL; // e.g https://admin.e-conneq.com
12
+ 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)
13
+ const urlBackEndExt = process.env.NEXT_PUBLIC_BACKEND_URL_EXT || process.env.BACKEND_URL_EXT; // e.g https://admin.e-conneq.com
14
14
  if (!urlDomain)
15
15
  throw new Error("Env (DOMAIN_URL) is required");
16
16
  if (!protocol)
17
17
  throw new Error("Env (PROTOCOL) is required");
18
18
  if (!urlBackEndInt)
19
- throw new Error("Env (BACKEND_INTERNAL_URL) is required");
19
+ throw new Error("Env (BACKEND_URL_INT) is required");
20
20
  if (!urlBackEndExt)
21
- throw new Error("Env (BACKEND_EXTERNAL_URL) is required");
21
+ throw new Error("Env (BACKEND_URL_EXT) is required");
22
22
  const tenant = domain
23
23
  ? Subdomains.find((s) => s.subdomain.toLowerCase() === domain.toLowerCase())
24
24
  : null;
25
25
  let uri;
26
- let baseUrl;
26
+ let destUrl;
27
27
  const sourceHost = `${protocol}${tenant?.subdomain || "public"}.${urlDomain}`;
28
28
  if (isServer) {
29
- // Use the internal host for the physical connection
30
- baseUrl = `http://${urlBackEndInt}`;
31
- uri = `${baseUrl}/graphql/`;
29
+ destUrl = `http://${urlBackEndInt}`;
30
+ uri = `${destUrl}/graphql/`;
32
31
  }
33
32
  else {
34
33
  uri = "/api/graphql";
35
- // Use the EXTERNAL host for the logical Identity (Host Header)
36
- baseUrl = `${urlBackEndExt}`;
34
+ destUrl = `${protocol}${urlBackEndExt}`;
37
35
  }
38
36
  console.log("g-auth uri ==============", uri);
39
- console.log("g-auth baseUrl ==========", baseUrl);
40
37
  console.log("g-auth sourceHost =======", sourceHost);
38
+ console.log("g-auth destinationHost ==========", destUrl);
41
39
  const csrfToken = options?.csrfToken || (!isServer ? Cookies.get("csrftoken") : "");
42
40
  const headers = {
43
41
  'Content-Type': 'application/json',
44
- 'X-API-KEY': apiKey,
42
+ // 'X-API-KEY': apiKey,
45
43
  ...(options?.cookie && { 'Cookie': options.cookie }),
46
44
  ...(csrfToken && { 'X-CSRFToken': csrfToken }),
47
45
  ...(tenant && {
@@ -49,7 +47,7 @@ export default async function getApolloClient(options, domain, config) {
49
47
  'X-Process-ID': tenant?.processId || "",
50
48
  'X-Widget-ID': tenant?.widgetID || "",
51
49
  }),
52
- 'Referer': baseUrl,
50
+ 'Referer': destUrl,
53
51
  'Host': isServer ? sourceHost : window.location.host,
54
52
  };
55
53
  return new ApolloClient({
package/dist/index.d.ts CHANGED
@@ -3,10 +3,7 @@ import { ApiFactory } from './api-factory.js';
3
3
  import { uploadGraphQLMutation } from './upload-gql.js';
4
4
  export { queryServerGraphQL, ApiFactory, uploadGraphQLMutation };
5
5
  export type ConfigType = {
6
- protocol: string;
7
- RootApi: string;
8
6
  Subdomains: SubdomainItem[];
9
- apiKey: string;
10
7
  fonts: string[];
11
8
  };
12
9
  export type SubdomainItem = {
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"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,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,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"}
1
+ {"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/upload-gql.d.ts CHANGED
@@ -11,7 +11,6 @@ type UploadGraphQLArgs = {
11
11
  processId: string;
12
12
  widgetID: string;
13
13
  }[];
14
- apiKey?: string;
15
14
  };
16
15
  };
17
16
  export declare function uploadGraphQLMutation({ query, variables, fileMap, token, params, config }: UploadGraphQLArgs): Promise<any>;
package/dist/upload-gql.d.ts.map CHANGED
@@ -1 +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,gBAsEnB"}
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;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 CHANGED
@@ -1,13 +1,11 @@
1
1
  export async function uploadGraphQLMutation({ query, variables, fileMap, token, params, config }) {
2
2
  const isServer = typeof window === "undefined";
3
- const { Subdomains, apiKey } = config;
4
- const protocol = process.env.PROTOCOL;
5
- const production = process.env.NODE_ENV === "production";
6
- const host = production ? process.env.INTERNAL_API_URL : process.env.EXTERNAL_API_URL;
3
+ const { Subdomains } = config;
4
+ const BACKEND_URL_INT = process.env.BACKEND_URL_INT;
5
+ const API_KEY = process.env.API_KEY || "";
7
6
  let API_LINK;
8
7
  if (isServer) {
9
- // API_LINK = `$http://${host}/graphql/`;
10
- API_LINK = `/api/graphql/`;
8
+ API_LINK = `${BACKEND_URL_INT}/graphql/`;
11
9
  }
12
10
  else {
13
11
  API_LINK = `/api/graphql`;
@@ -35,17 +33,19 @@ export async function uploadGraphQLMutation({ query, variables, fileMap, token,
35
33
  // 3. Construct Headers
36
34
  const headers = {
37
35
  ...(token ? { "Authorization": `Bearer ${token}` } : {}),
38
- ...(apiKey ? { "X-API-KEY": apiKey } : {}),
39
36
  };
40
37
  if (isServer) {
41
- headers["Host"] = host || "";
38
+ headers["Host"] = BACKEND_URL_INT || "";
42
39
  }
43
40
  // Inject specific tenant metadata into headers for Django to read
44
41
  if (tenantData) {
45
42
  headers["X-Tenant-ID"] = String(tenantData.subdomain);
46
43
  headers["X-Process-ID"] = tenantData.processId || "";
47
44
  headers["X-Widget-ID"] = tenantData.widgetID || "";
45
+ headers["X-API-KEY"] = API_KEY || "";
48
46
  }
47
+ if (!tenantData?.subdomain)
48
+ throw ("No Tenant Found ===================>");
49
49
  const res = await fetch(API_LINK, {
50
50
  method: "POST",
51
51
  headers,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@econneq/gql-auth",
3
- "version": "1.2.5",
3
+ "version": "1.2.8",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",