getting client id from white label

.env

@@ -6,4 +6,18 @@ VITE_APP_API_DEV_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1
 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com
 VITE_AUTH0_AUDIENCE=api.brandxtech.ca
 VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1
-VITE_AUTH0_STAGING_CLIENT_ID=3ib460VvLwdeyse5iUSQfxkVdQaUmphP
+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
+
+#Branding (Default theme)
+VITE_APP_WEBSITE_TITLE="Adaptive Dashboard"
+VITE_APP_PRIMARY_COLOUR=blue
+VITE_APP_SECONDARY_COLOUR=blueGrey
+VITE_APP_SIGNATURE_COLOUR="#323232"

package.json

@@ -7,7 +7,7 @@
     "start": "vite",
     "start-local": "VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_APP_API_URL=http://localhost:50052/v1 VITE_APP_WS_URL=ws://localhost:50052/v1/live VITE_APP_BILLING_URL=http://localhost:50053/v1 VITE_APP_RECLUSE_URL=http://localhost:50054/v1 VITE_APP_GITLAB_URL=http://localhost:50055/v1 vite",
     "start-dev": "VITE_APP_API_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 vite",
-    "start-staging": "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",
+    "start-staging": "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",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
     "preview": "vite preview",

src/app/App.tsx

@@ -5,7 +5,6 @@ import HTTPProvider from 'providers/http'
 import { useState } from 'react'
 import LoadingScreen from './LoadingScreen'
 import UserWrapper from './UserWrapper'
-import { CssBaseline } from '@mui/material'
 import { getWhitelabel } from 'services/whiteLabel'
 import { AppThemeProvider } from 'theme/AppThemeProvider'
 
@@ -42,7 +41,9 @@ 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 = import.meta.env.VITE_AUTH0_DEV_CLIENT_ID;
+  let client_id = whiteLabel.auth0ClientId
+  if (!client_id) client_id = import.meta.env.VITE_AUTH0_DEV_CLIENT_ID;
+  // let client_id = import.meta.env.VITE_AUTH0_CLIENT_ID;
 
   console.log("Domain: " + domain)
   console.log("Audience: " + audience)

src/services/whiteLabel.ts

@@ -70,12 +70,12 @@ interface WhiteLabel {
 // };
 
 const STAGING_WHITELABEL: WhiteLabel = {
-  name: import.meta.env.REACT_APP_WEBSITE_TITLE,
+  name: import.meta.env.VITE_APP_WEBSITE_TITLE,
-  primaryColour: import.meta.env.REACT_APP_PRIMARY_COLOUR,
+  primaryColour: import.meta.env.VITE_APP_PRIMARY_COLOUR,
-  secondaryColour: import.meta.env.REACT_APP_SECONDARY_COLOUR,
+  secondaryColour: import.meta.env.VITE_APP_SECONDARY_COLOUR,
-  signatureColour: import.meta.env.REACT_APP_SIGNATURE_COLOUR,
+  signatureColour: import.meta.env.VITE_APP_SIGNATURE_COLOUR,
   signatureAccentColour: "#fff",
-  auth0ClientId: import.meta.env.REACT_APP_AUTH0_STAGING_CLIENT_ID,
+  auth0ClientId: import.meta.env.VITE_AUTH0_STAGING_CLIENT_ID,
   redirectOnLogout: false,
   logoutRedirectTarget: "",
   darkLogo: DefaultDarkLogo,
@@ -259,7 +259,7 @@ const whitelabels = new Map<string, WhiteLabel>([
   ["brandxducks", BXT_WHITE_LABEL],
   ["brandxtech", BXT_WHITE_LABEL],
   ["aerogrowmanufacturing", AEROGROW_WHITE_LABEL],
-  ["localhost", BXT_WHITE_LABEL],
+  ["localhost", STAGING_WHITELABEL],
   ["staging", STAGING_WHITELABEL],
   ["10.0", ADAPTIVE_CONSTRUCTION_WHITE_LABEL],
   ["mivent", MIVENT_WHITE_LABEL],