@campxdev/shared 0.5.0 → 0.5.2

package/package.json

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

package/src/components/LoginForm.tsx

@@ -14,6 +14,8 @@ import {useState} from 'react'
 import {useForm} from 'react-hook-form'
 import {FormTextField} from './HookForm'
 
+const developmentOrigin = window.location.origin + '/campx_dev'
+
 export const StyledTextField = styled(FormTextField)(({theme}) => ({
 	'& .MuiInputBase-root': {
 		minHeight: '60px',
@@ -42,7 +44,7 @@ export function LoginForm() {
 				data: values,
 			})
 			Cookies.set('campx_session_key', res.data.cookie)
-			window.location.href = '/'
+			window.location.href = developmentOrigin
 		} catch (err) {
 			// eslint-disable-next-line no-console
 			console.log(err)

package/src/config/axios.ts

@@ -3,11 +3,10 @@ import _ from 'lodash'
 import {toast} from 'react-toastify'
 import Cookies from 'js-cookie'
 import {NetworkStore} from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
+import {isDevelopment} from '../constants'
 
-const isDevelopment =
-	process.env.NODE_ENV === 'development' ||
-	window.location.origin.split('.').slice(-2).join('.') === 'campx.dev'
 const sessionKey = Cookies.get('campx_session_key')
+const clientId = window.location.pathname.split('/')[0] ?? 'campx_dev'
 
 const formatParams = (params) => {
 	return Object.fromEntries(
@@ -21,12 +20,13 @@ const formatParams = (params) => {
 let axios = Axios.create({
 	baseURL: process.env.REACT_APP_API_HOST,
 	withCredentials: true,
-	...(isDevelopment &&
-		sessionKey && {
-			headers: {
+	headers: {
+		'x-tenent-id': isDevelopment ? 'campx_dev' : clientId,
+		...(isDevelopment &&
+			sessionKey && {
 				campx_session_key: sessionKey,
-			},
-		}),
+			}),
+	},
 })
 
 axios.interceptors.request.use(

package/src/contexts/Providers.tsx

@@ -7,10 +7,18 @@ import QueryClientProvider from './QueryClientProvider'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import {ToastContainer} from '../components'
 import LoginFormProvider from './LoginFormProvider'
+import {ReactNode} from 'react'
+import {isDevelopment} from '../constants'
 
-export default function Providers({children}) {
+export default function Providers({
+	children,
+	basename,
+}: {
+	children: ReactNode
+	basename?: string
+}) {
 	return (
-		<BrowserRouter>
+		<BrowserRouter basename={isDevelopment ? 'campx_dev' : basename}>
 			<QueryClientProvider>
 				<MuiThemeProvider>
 					<DialogProvider>