From 8590d8f6949024d0606de535ac0da7c1210f2120 Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 12 May 2025 12:03:20 -0600 Subject: [PATCH] added white label client ids --- .env | 15 +++++++-------- src/app/App.tsx | 12 ++---------- src/pages/Fields.tsx | 1 - src/services/whiteLabel.ts | 12 ++++++------ 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.env b/.env index 11e1e80..6e8f870 100644 --- a/.env +++ b/.env @@ -4,17 +4,16 @@ VITE_APP_API_DEV_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1 #Auth0 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com -VITE_AUTH0_AUDIENCE=api.adaptiveagriculture.ca +VITE_AUTH0_AUDIENCE=api.brandxtech.ca VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 VITE_AUTH0_STAGING_CLIENT_ID=3ib460VvLwdeyse5iUSQfxkVdQaUmphP -# VITE_AUTH0_CLIENT_ID=3ib460VvLwdeyse5iUSQfxkVdQaUmphP -# VITE_AUTH0_AUDIENCE=stagingapi.brandxtech.ca -# VITE_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com -# VITE_APP_API_URL=https://stagingapi.brandxtech.ca/v1 -# VITE_APP_WS_URL=ws://stagingapi.brandxtech.ca/v1/live -# VITE_APP_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com -# VITE_APP_AUTH0_AUDIENCE=stagingapi.brandxtech.ca +VITE_AUTH0_BXT_CLIENT_ID=sLnqOu40uWfQT1lYSDYj2wYmlLEHRB74 +VITE_AUTH0_ADAPTIVE_AGRICULTURE_CLIENT_ID=5pUCkl2SfogkWmM244UDcLEUOp8EFdHd +VITE_AUTH0_ADAPTIVE_CONSTRUCTION_CLIENT_ID=32rABabJzXRvJiWivTmeKFgwFiqh4ok7 +VITE_AUTH0_AEROGROW_CLIENT_ID=KHl9ooUt1nia1RYw5n224dyggCXdbsSd +VITE_AUTH0_MIVENT_CLIENT_ID=VNALE7RW6l3dY5uYcxgwElZV0lcT25Fg +VITE_AUTH0_OMNIAIR_CLIENT_ID=IblmarD8wFafiD6doxTmOHQ6Bx3L9wWl #Branding (Default theme) VITE_APP_WEBSITE_TITLE="Adaptive Dashboard" diff --git a/src/app/App.tsx b/src/app/App.tsx index 4455232..46e7121 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -40,16 +40,8 @@ function App() { let domain: string | undefined = import.meta.env.VITE_AUTH0_CLIENT_DOMAIN; let audience: string | undefined = import.meta.env.VITE_AUTH0_AUDIENCE; - // let client_id = whiteLabel.auth0ClientId - let client_id = import.meta.env.VITE_AUTH0_CLIENT_ID; - // if (!client_id) client_id = import.meta.env.VITE_AUTH0_CLIENT_ID; - - //check the url for a code before auth0 causes a login re-direct - // if (window.location.pathname !== "/callback") { - // //set the code into local storage - // let code = new URLSearchParams(window.location.search).get("code"); - // sessionStorage.setItem("code", code || "") - // } + let client_id = whiteLabel.auth0ClientId + if (!client_id) client_id = import.meta.env.VITE_AUTH0_CLIENT_ID; const skipCallbacks = [ "/johndeere", diff --git a/src/pages/Fields.tsx b/src/pages/Fields.tsx index feae69b..dfda7f2 100644 --- a/src/pages/Fields.tsx +++ b/src/pages/Fields.tsx @@ -1,4 +1,3 @@ -import React from "react"; import PageContainer from "./PageContainer"; import FieldList from "field/FieldList"; import { Box } from "@mui/material"; diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts index eb5d7ff..22de3bf 100644 --- a/src/services/whiteLabel.ts +++ b/src/services/whiteLabel.ts @@ -123,7 +123,7 @@ const ADAPTIVE_AGRICULTURE_WHITE_LABEL: WhiteLabel = { // secondaryColour: "#FFFF00", signatureColour: "#272727", signatureAccentColour: "#fff", - auth0ClientId: import.meta.env.REACT_APP_AUTH0_ADAPTIVE_AGRICULTURE_CLIENT_ID, + auth0ClientId: import.meta.env.VITE_AUTH0_ADAPTIVE_AGRICULTURE_CLIENT_ID, redirectOnLogout: true, logoutRedirectTarget: "https://adaptiveagriculture.ca", darkLogo: AdapativeAgLogo, @@ -163,7 +163,7 @@ const AEROGROW_WHITE_LABEL: WhiteLabel = { secondaryColour: "cyan", signatureColour: "#fff", signatureAccentColour: "#000", - auth0ClientId: import.meta.env.REACT_APP_AUTH0_AEROGROW_CLIENT_ID, + auth0ClientId: import.meta.env.VITE_AUTH0_AEROGROW_CLIENT_ID, redirectOnLogout: true, logoutRedirectTarget: "https://www.aerogrowmanufacturing.com", darkLogo: AeroGrowDarkLogo, @@ -189,7 +189,7 @@ const MIVENT_WHITE_LABEL: WhiteLabel = { secondaryColour: "yellow", signatureColour: "#272727", signatureAccentColour: "#fff", - auth0ClientId: import.meta.env.REACT_APP_AUTH0_MIVENT_CLIENT_ID, + auth0ClientId: import.meta.env.VITE_AUTH0_MIVENT_CLIENT_ID, redirectOnLogout: true, logoutRedirectTarget: "https://mivent.ca", darkLogo: MiVentLightLogo, @@ -207,7 +207,7 @@ const ADAPTIVE_CONSTRUCTION_WHITE_LABEL: WhiteLabel = { secondaryColour: "blue", signatureColour: "#272727", signatureAccentColour: "#fff", - auth0ClientId: import.meta.env.REACT_APP_AUTH0_ADAPTIVE_CONSTRUCTION_CLIENT_ID, + auth0ClientId: import.meta.env.VITE_AUTH0_ADAPTIVE_CONSTRUCTION_CLIENT_ID, redirectOnLogout: true, logoutRedirectTarget: "https://adaptiveconstruction.ca", darkLogo: AdConLogo, @@ -233,7 +233,7 @@ const OMNIAIR_WHITE_LABEL: WhiteLabel = { secondaryColour: "yellow", signatureColour: "#272727", signatureAccentColour: "#fff", - auth0ClientId: import.meta.env.REACT_APP_AUTH0_OMNIAIR_CLIENT_ID, + auth0ClientId: import.meta.env.VITE_AUTH0_OMNIAIR_CLIENT_ID, redirectOnLogout: true, logoutRedirectTarget: "https://omniairsystems.com", darkLogo: MiPCALogo, @@ -259,7 +259,7 @@ const whitelabels = new Map([ ["brandxducks", BXT_WHITE_LABEL], ["brandxtech", BXT_WHITE_LABEL], ["aerogrowmanufacturing", AEROGROW_WHITE_LABEL], - ["localhost", STAGING_WHITELABEL], + ["localhost", BXT_WHITE_LABEL], ["staging", STAGING_WHITELABEL], ["10.0", ADAPTIVE_CONSTRUCTION_WHITE_LABEL], ["mivent", MIVENT_WHITE_LABEL],