fix front end api

beyondessential · Jun 18, 2023 · c2e9c67 · c2e9c67
1 parent 8fad698
commit c2e9c67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/tupaia-web/src/api/api.ts b/packages/tupaia-web/src/api/api.ts
@@ -6,7 +6,7 @@
 import axios from 'axios';
 import FetchError from './fetchError';
 
-export const API_URL = import.meta.env.REACT_APP_TUPAIA_WEB_API_URL || 'http://localhost:8100';
+export const API_URL = import.meta.env.REACT_APP_TUPAIA_WEB_API_URL || 'http://localhost:8100/v1';
 
 // withCredentials needs to be set for cookies to save @see https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials
 axios.defaults.withCredentials = true;

diff --git a/packages/tupaia-web/src/api/queries/useUser.ts b/packages/tupaia-web/src/api/queries/useUser.ts
@@ -8,10 +8,13 @@ import { get } from '../api';
 
 export const useUser = () => {
   const userResponse = useQuery('getUser', () => get('getUser'));
-  const { data } = userResponse;
+  const { data: user } = userResponse;
+
+  const name = `${user?.first_name} ${user?.last_name}`;
 
   return {
     ...userResponse,
-    isLoggedIn: !!data?.email,
+    data: { ...user, name },
+    isLoggedIn: !!user?.email,
   };
 };