@campxdev/shared 0.5.14 → 0.5.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@campxdev/shared",
-	"version": "0.5.14",
+	"version": "0.5.16",
 	"main": "./exports.ts",
 	"scripts": {
 		"start": "react-scripts start",

package/src/config/axios.ts

@@ -6,7 +6,7 @@ import {NetworkStore} from '../components/ErrorBoundary/GlobalNetworkLoadingIndi
 import {isDevelopment} from '../constants'
 
 const sessionKey = Cookies.get('campx_session_key')
-const clientId = window.location.pathname.split('/')[0] ?? 'campx_dev'
+const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
 
 const formatParams = (params) => {
 	return Object.fromEntries(

package/src/contexts/Providers.tsx

@@ -13,6 +13,7 @@ import useAppInit from '../hooks/useAppInit'
 import Cookies from 'js-cookie'
 
 export const campxTenantKey = Cookies.get('campx_tenant')
+export const urlTenantKey = window.location.pathname.split('/')[1]
 
 export default function Providers({children}: {children: ReactNode}) {
 	const {isInvalid} = useAppInit()
@@ -47,6 +48,11 @@ const InvalidClientKey = () => {
 			}}
 		>
 			<h1>Invalid Tenant Key</h1>
+			{!isDevelopment && (
+				<a href='https://id.campx.in'>
+					<p>Login to continue</p>
+				</a>
+			)}
 		</div>
 	)
 }

package/src/hooks/useAppInit.ts

@@ -1,12 +1,14 @@
 import Cookies from 'js-cookie'
 import {useEffect, useState} from 'react'
 import {isDevelopment} from '../constants'
-import {campxTenantKey} from '../contexts/Providers'
+import {campxTenantKey, urlTenantKey} from '../contexts/Providers'
+
+const validTenant = campxTenantKey && urlTenantKey
 
 export default function useAppInit() {
 	const [isInvalid, setIsInvalid] = useState(false)
 	useEffect(() => {
-		if (!isDevelopment && !campxTenantKey) {
+		if (!isDevelopment && !validTenant) {
 			setIsInvalid(true)
 		}