Merge pull request #250 from karrioapi/debub-multi-tenant

(debug) multi-tenant setup

src/components/descriptions/shipment-preview.tsx

@@ -1,4 +1,5 @@
 import { ShipmentComponent } from '@/modules/Shipments/shipment';
+import ConfirmModal from '@/components/confirm-modal';
 import { useLocation } from '@/lib/helper';
 import React, { useState } from 'react';
 
@@ -41,7 +42,9 @@ const ShipmentPreview: React.FC<ShipmentPreviewComponent> = ({ children }) => {
  {(isActive && shipmentId) && <div className="modal-card is-medium-modal">
  <section className="modal-card-body px-5 pt-0 pb-6">
 
- <ShipmentComponent shipmentId={shipmentId} />
+ <ConfirmModal>
+ <ShipmentComponent shipmentId={shipmentId} />
+ </ConfirmModal>
 
  </section>
  </div>}

src/lib/client.tsx

@@ -71,8 +71,7 @@ function requestInterceptor(session?: SessionType) {
 }
 
 function setupRestClient(host: string, session?: SessionType): KarrioClient {
- const url = host[host.length - 1] === '/' ? host.slice(0, -1) : host;
- const client = new KarrioClient({ basePath: `${url || ''}` });
+ const client = new KarrioClient({ basePath: url$`${host || ''}` });
 
  client.axios.interceptors.request.use(requestInterceptor(session));
 

src/lib/data-fetching/index.ts

@@ -1,4 +1,4 @@
-import { UserContextDataType, Metadata, PortalSessionType, References, SessionType, SubscriptionType, OrgContextDataType, TenantType } from "@/lib/types";
+import { UserContextDataType, Metadata, PortalSessionType, SessionType, SubscriptionType, OrgContextDataType, TenantType } from "@/lib/types";
 import { GetServerSideProps, GetServerSidePropsContext, NextApiRequest, NextApiResponse } from "next";
 import { createServerError, isNone, ServerErrorCode, url$ } from "@/lib/helper";
 import { getSession } from "next-auth/react";
@@ -18,13 +18,12 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
  const pathname = ctx.resolvedUrl;
 
  const orgId = ((session as any)?.orgId as string) || null;
- const testMode = ((session as any)?.testMode as boolean);
 
  const metadata = await loadAPIMetadata(ctx).catch(_ => _);
  const data = await loadContextData(session, metadata.metadata);
  const subscription = await checkSubscription(session, metadata.metadata);
 
- await setSessionCookies(ctx, metadata.metadata, testMode, orgId);
+ await setSessionCookies(ctx, orgId);
 
  if (needValidSubscription(subscription)) {
  return {
@@ -49,7 +48,7 @@ export async function loadAPIMetadata(ctx: RequestContext): Promise<{ metadata?:
  const { data: metadata } = await axios.get<Metadata>(API_URL);
 
  // TODO:: implement version compatibility check here.
- await setSessionCookies(ctx as any, metadata);
+ await setSessionCookies(ctx as any);
  resolve({ metadata });
  } catch (e: any | Response) {
  logger.error(`Failed to fetch API metadata from (${API_URL})`);
@@ -110,21 +109,10 @@ export async function loadContextData(session: SessionType, metadata: Metadata):
  }
 }
 
-export async function setSessionCookies(ctx: GetServerSidePropsContext, metadata?: Metadata, testMode?: boolean, orgId?: string | null) {
+export async function setSessionCookies(ctx: GetServerSidePropsContext, orgId?: string | null) {
  // Sets the authentication orgId cookie if the session has one
  if (ctx.res && !!orgId) {
- ctx.res.setHeader('Set-Cookie', `orgId=${orgId}`);
- }
- if (!!ctx.params?.site) {
- ctx.res.setHeader('Set-Cookie', `appUrl=${ctx.params?.site}`);
- }
- if (!!metadata?.HOST) {
- const host = publicRuntimeConfig?.MULTI_TENANT ? metadata.HOST : publicRuntimeConfig?.KARRIO_PUBLIC_URL
- ctx.res.setHeader('Set-Cookie', `apiUrl=${host}`);
- ctx.res.setHeader('Set-Cookie', `apiHOST=${metadata.HOST}`);
- }
- if (!!testMode) {
- ctx.res.setHeader('Set-Cookie', `testMode=${testMode}`);
+ ctx.res.setHeader('Set-Cookie', `orgId=${orgId}; path=${ctx.resolvedUrl || '/'}`);
  }
 }
 
@@ -214,20 +202,16 @@ async function getAPIURL(ctx: RequestContext) {
  }
 
  const params = (ctx as GetServerSidePropsContext).params;
- const cookies = (ctx.req as NextApiRequest).cookies;
- const apiHost = cookies ? cookies['apiHOST'] : null;
- const host = cookies ? cookies['HOST'] : null;
+ const headers = (ctx.req as NextApiRequest).headers;
+ const host = headers ? headers.host : null;
  const site = params ? params.site : null;
 
- if (!!site === false && !!apiHost === true) return apiHost;
-
  const app_domain = (site || host) as string;
  const tenant = (publicRuntimeConfig?.MULTI_TENANT && !!app_domain
  ? (await loadTenantInfo({ app_domain }))
  : null
  );
- const APIURL = (
- !!serverRuntimeConfig?.TENANT_ENV_KEY
+ const APIURL = (!!serverRuntimeConfig?.TENANT_ENV_KEY
  ? (tenant?.api_domains || []).find(d => d.includes(serverRuntimeConfig?.TENANT_ENV_KEY))
  : (tenant?.api_domains || [])[0]
  );
@@ -236,7 +220,6 @@ async function getAPIURL(ctx: RequestContext) {
 }
 
 
-
 const USER_DATA_QUERY = `{
  user {
  email

src/lib/data-fetching/tracker.ts

@@ -2,24 +2,30 @@ import { loadAPIMetadata } from "@/lib/data-fetching";
 import { KarrioClient } from "@karrio/rest";
 import { KARRIO_API } from "@/lib/client";
 import { GetServerSideProps } from "next";
+import { url$ } from "@/lib/helper";
+import logger from "@/lib/logger";
 
 
 export const getServerSideProps: GetServerSideProps = async (ctx) => {
  const { res, params } = ctx;
  const id = params?.id as string;
  const metadata = await loadAPIMetadata(ctx).catch(_ => _);
- const client = new KarrioClient({ basePath: `${metadata.metadata?.HOST || KARRIO_API}` });
+ const client = new KarrioClient({ basePath: url$`${metadata.metadata?.HOST || KARRIO_API}` });
 
  try {
  // Retrieve tracker by id
  const data = await client.trackers.retrieves({ idOrTrackingNumber: id })
  .then(({ data }) => ({ tracker: JSON.parse(JSON.stringify(data)) }))
- .catch(_ => ({ message: `No Tracker ID nor Tracking Number found for ${id}` }));
+ .catch(_ => {
+ console.log(_)
+ return ({ message: `No Tracker ID nor Tracking Number found for ${id}` });
+ });
 
  res.setHeader('Cache-Control', 'public, s-maxage=10, stale-while-revalidate=59')
 
  return { props: { id, ...metadata, ...data } };
  } catch (e) {
+ logger.error(e, "Failed to retrieve tracking info");
  return { props: { id, ...metadata, ...(e as {}) } };
  }
 };

src/lib/helper.ts

@@ -274,8 +274,11 @@ export const parseJwt = (token: string): any => {
 export function url$(strings: TemplateStringsArray, ...keys: any[]) {
  const base = (keys || []).reduce((acc, key, i) => acc + strings[i] + key, '');
  const template = `${base}${strings[strings.length - 1]}`;
-
- return template.replace(/([^:])(\/\/+)/g, '$1/');
+
+ const _url = template.replace(/([^:])(\/\/+)/g, '$1/')
+ const url = _url[_url.length - 1] === '/' ? _url.slice(0, -1) : _url;
+
+ return url;
 }
 
 export function gqlstr(node: ReturnType<typeof gql>): string {