Merge pull request #81 from stellar/sdp-multitenant

Multi-tenant Merge to Develop

src/api/getDisbursementDetails.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiDisbursement } from "types";
 
 export const getDisbursementDetails = async (
@@ -11,6 +12,7 @@ export const getDisbursementDetails = async (
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
   });
 

src/api/getDisbursementDrafts.ts

@@ -1,6 +1,7 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
 import { UI_STATUS_DISBURSEMENT_DRAFT } from "constants/settings";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiDisbursements } from "types";
 
 export const getDisbursementDrafts = async (
@@ -14,6 +15,7 @@ export const getDisbursementDrafts = async (
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
     },
   );

src/api/getDisbursementInstructions.ts

@@ -1,5 +1,6 @@
 import { API_URL } from "constants/envVariables";
 import { SESSION_EXPIRED } from "constants/settings";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 
 export const getDisbursementInstructions = async (
   token: string,
@@ -11,6 +12,7 @@ export const getDisbursementInstructions = async (
       method: "GET",
       headers: {
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
     },
   );

src/api/getDisbursementReceivers.ts

@@ -1,6 +1,7 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { handleSearchParams } from "api/handleSearchParams";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiDisbursementReceivers, PaginationParams } from "types";
 
 export const getDisbursementReceivers = async (
@@ -17,6 +18,7 @@ export const getDisbursementReceivers = async (
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
     },
   );

src/api/getDisbursements.ts

@@ -2,6 +2,7 @@ import { handleApiResponse } from "api/handleApiResponse";
 import { handleSearchParams } from "api/handleSearchParams";
 import { API_URL } from "constants/envVariables";
 import { UI_STATUS_DISBURSEMENT } from "constants/settings";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiDisbursements, PaymentsSearchParams } from "types";
 
 export const getDisbursements = async (
@@ -23,6 +24,7 @@ export const getDisbursements = async (
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
   });
 

src/api/getOrgInfo.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiOrgInfo } from "types";
 
 export const getOrgInfo = async (token: string): Promise<ApiOrgInfo> => {
@@ -8,6 +9,7 @@ export const getOrgInfo = async (token: string): Promise<ApiOrgInfo> => {
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
   });
 

src/api/getOrgLogo.ts

@@ -1,7 +1,15 @@
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 
-export async function getOrgLogo(): Promise<string> {
-  const response = await fetch(`${API_URL}/organization/logo`);
+export async function getOrgLogo(token: string): Promise<string> {
+  const response = await fetch(`${API_URL}/organization/logo`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
+    },
+  });
 
   const responseBlob = await response.blob();
   return URL.createObjectURL(responseBlob);

src/api/getProfileInfo.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiProfileInfo } from "types";
 
 export const getProfileInfo = async (
@@ -10,6 +11,7 @@ export const getProfileInfo = async (
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
   });
 

src/api/patchDisbursementStatus.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { DisbursementStatus } from "types";
 
 export const patchDisbursementStatus = async (
@@ -14,6 +15,7 @@ export const patchDisbursementStatus = async (
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
       body: JSON.stringify({
         status,

src/api/patchOrgInfo.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { sanitizeObject } from "helpers/sanitizeObject";
 import { OrgUpdateInfo } from "types";
 
@@ -45,6 +46,7 @@ export const patchOrgInfo = async (
     method: "PATCH",
     headers: {
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
     body: formData,
   });

src/api/patchProfileInfo.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { sanitizeObject } from "helpers/sanitizeObject";
 
 export const patchProfileInfo = async (
@@ -24,6 +25,7 @@ export const patchProfileInfo = async (
     method: "PATCH",
     headers: {
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
     body: JSON.stringify(fieldsToSubmit),
   });

src/api/patchUserRole.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { UserRole } from "types";
 
 export const patchUserRole = async (
@@ -12,6 +13,7 @@ export const patchUserRole = async (
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
     body: JSON.stringify({
       user_id: userId,

src/api/postDisbursement.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { ApiDisbursement, Disbursement } from "types";
 
 export const postDisbursement = async (
@@ -11,14 +12,16 @@ export const postDisbursement = async (
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(),
     },
     body: JSON.stringify({
       name: disbursement.name,
       wallet_id: disbursement.wallet.id,
       asset_id: disbursement.asset.id,
       country_code: disbursement.country.code,
       verification_field: disbursement.verificationField || "",
-      sms_registration_message_template: disbursement.smsRegistrationMessageTemplate,
+      sms_registration_message_template:
+        disbursement.smsRegistrationMessageTemplate,
     }),
   });
 

src/api/postDisbursementFile.ts

@@ -1,5 +1,6 @@
 import { handleApiResponse } from "api/handleApiResponse";
 import { API_URL } from "constants/envVariables";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 
 export const postDisbursementFile = async (
   token: string,
@@ -15,6 +16,7 @@ export const postDisbursementFile = async (
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
       body: formData,
     },

src/api/refreshToken.ts

@@ -2,6 +2,7 @@ import { differenceInMinutes, fromUnixTime } from "date-fns";
 import { API_URL } from "constants/envVariables";
 import { SESSION_EXPIRED } from "constants/settings";
 import { parseJwt } from "helpers/parseJwt";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 
 export const refreshToken = async (token: string): Promise<string> => {
   const jwt = parseJwt(token);
@@ -16,6 +17,7 @@ export const refreshToken = async (token: string): Promise<string> => {
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "SDP-Tenant-Name": getSdpTenantName(),
       },
     });
 

src/apiQueries/useForgotPasswordLink.ts

@@ -1,16 +1,22 @@
 import { useMutation } from "@tanstack/react-query";
 import { API_URL } from "constants/envVariables";
 import { fetchApi } from "helpers/fetchApi";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { AppError } from "types";
 
 type ForgotPasswordLinkProps = {
+  organizationName: string;
   email: string;
   recaptchaToken: string;
 };
 
 export const useForgotPasswordLink = () => {
   const mutation = useMutation({
-    mutationFn: ({ email, recaptchaToken }: ForgotPasswordLinkProps) => {
+    mutationFn: ({
+      organizationName,
+      email,
+      recaptchaToken,
+    }: ForgotPasswordLinkProps) => {
       return fetchApi(
         `${API_URL}/forgot-password`,
         {
@@ -19,8 +25,13 @@ export const useForgotPasswordLink = () => {
             email,
             recaptcha_token: recaptchaToken,
           }),
+          headers: {
+            "SDP-Tenant-Name": getSdpTenantName(organizationName),
+          },
+        },
+        {
+          withoutAuth: true,
         },
-        { withoutAuth: true },
       );
     },
     cacheTime: 0,
@@ -30,9 +41,13 @@ export const useForgotPasswordLink = () => {
     ...mutation,
     error: mutation.error as AppError,
     data: mutation.data as { message: string },
-    mutateAsync: async ({ email, recaptchaToken }: ForgotPasswordLinkProps) => {
+    mutateAsync: async ({
+      organizationName,
+      email,
+      recaptchaToken,
+    }: ForgotPasswordLinkProps) => {
       try {
-        await mutation.mutateAsync({ email, recaptchaToken });
+        await mutation.mutateAsync({ organizationName, email, recaptchaToken });
       } catch (e) {
         // do nothing
       }

src/apiQueries/useResetPassword.ts

@@ -2,16 +2,22 @@ import { useMutation } from "@tanstack/react-query";
 import { API_URL } from "constants/envVariables";
 import { fetchApi } from "helpers/fetchApi";
 import { normalizeApiError } from "helpers/normalizeApiError";
+import { getSdpTenantName } from "helpers/getSdpTenantName";
 import { AppError } from "types";
 
 type ResetPasswordProps = {
+  organizationName: string;
   password: string;
   resetToken: string;
 };
 
 export const useResetPassword = () => {
   const mutation = useMutation({
-    mutationFn: ({ password, resetToken }: ResetPasswordProps) => {
+    mutationFn: ({
+      organizationName,
+      password,
+      resetToken,
+    }: ResetPasswordProps) => {
       return fetchApi(
         `${API_URL}/reset-password`,
         {
@@ -20,6 +26,9 @@ export const useResetPassword = () => {
             password,
             reset_token: resetToken,
           }),
+          headers: {
+            "SDP-Tenant-Name": getSdpTenantName(organizationName),
+          },
         },
         {
           withoutAuth: true,
@@ -46,9 +55,13 @@ export const useResetPassword = () => {
     ...mutation,
     error: mutation.error as AppError,
     data: mutation.data as boolean,
-    mutateAsync: async ({ password, resetToken }: ResetPasswordProps) => {
+    mutateAsync: async ({
+      organizationName,
+      password,
+      resetToken,
+    }: ResetPasswordProps) => {
       try {
-        await mutation.mutateAsync({ password, resetToken });
+        await mutation.mutateAsync({ organizationName, password, resetToken });
       } catch (e) {
         // do nothing
       }

src/constants/settings.ts

@@ -11,6 +11,8 @@ export const LOCAL_STORAGE_SESSION_TOKEN = "sdp_session";
 export const LOCAL_STORAGE_DEVICE_ID = "sdp_deviceID";
 export const UI_STATUS_DISBURSEMENT = "STARTED,PAUSED,COMPLETED";
 export const UI_STATUS_DISBURSEMENT_DRAFT = "DRAFT,READY";
+export const ORG_NAME_INFO_TEXT =
+  "You can find your organization name in the invitation email";
 
 export const CANCELED_PAYMENT_STATUS = "CANCELED";
 export const READY_PAYMENT_STATUS = "READY";

src/helpers/fetchApi.ts

@@ -5,11 +5,13 @@ import { localStorageSessionToken } from "helpers/localStorageSessionToken";
 import { parseJwt } from "helpers/parseJwt";
 import { normalizeApiError } from "helpers/normalizeApiError";
 import { AnyObject } from "types";
+import { getSdpTenantName } from "./getSdpTenantName";
 
 type FetchApiOptions = {
   withoutAuth?: boolean;
   omitContentType?: boolean;
   customCallback?: (request: Response) => void;
+  organizationName?: string;
 };
 
 export const fetchApi = async (
@@ -42,6 +44,7 @@ export const fetchApi = async (
     config.headers = {
       ...config.headers,
       Authorization: `Bearer ${token}`,
+      "SDP-Tenant-Name": getSdpTenantName(options?.organizationName),
       ...(!options?.omitContentType
         ? {
             "Content-Type":

src/helpers/formatDisbursements.ts

@@ -55,5 +55,6 @@ export const formatDisbursement = (
       timestamp: h.timestamp,
       userId: h.user_id,
     })),
-  smsRegistrationMessageTemplate: disbursement.sms_registration_message_template,
+  smsRegistrationMessageTemplate:
+    disbursement.sms_registration_message_template,
 });

src/helpers/getSdpTenantName.ts

@@ -0,0 +1,2 @@
+export const getSdpTenantName = (organizationName?: string): string =>
+  organizationName ?? window.location.hostname.split(".")[0];