[000] fix build

hopps-app · Jan 2, 2025 · 3d60476 · 3d60476
1 parent 4c0697b
commit 3d60476
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/frontend/spa/src/components/InvoicesTable/InvoicesTable.tsx b/frontend/spa/src/components/InvoicesTable/InvoicesTable.tsx
@@ -69,8 +69,8 @@ const InvoicesTable = ({ invoices }: Props) => {
                 filterParams: { items: getBommelFilterItems() },
                 flex: 1,
             },
-            { headerName: 'Creditor', field: 'creditor', filter: 'agTextColumnFilter', flex: 2 },
-            { headerName: 'Submitter', field: 'submitter', filter: 'agTextColumnFilter', flex: 2 },
+            // { headerName: 'Creditor', field: 'creditor', filter: 'agTextColumnFilter', flex: 2 },
+            // { headerName: 'Submitter', field: 'submitter', filter: 'agTextColumnFilter', flex: 2 },
             {
                 headerName: 'Amount',
                 field: 'amount',

diff --git a/frontend/spa/src/services/auth/AuthService.ts b/frontend/spa/src/services/auth/AuthService.ts
@@ -1,3 +1,5 @@
+import { pick } from 'lodash';
+
 import { KeycloakServiceProvider } from '@/services/auth/keycloakServiceProvider.ts';
 import { AuthServiceProvider } from '@/services/auth/AuthServiceProvider.ts';
 import { useStore } from '@/store/store.ts';
@@ -64,15 +66,8 @@ export class AuthService {
         return localStorage.getItem('AUTH_TOKEN_REFRESH') || undefined;
     }
 
-    async setAuthUser(userData: { name: string; email: string } | null) {
-        useStore.getState().setUser(
-            userData !== null
-                ? {
-                      name: userData.name,
-                      email: userData.email,
-                  }
-                : null
-        );
+    async setAuthUser(userData: { id: string; name: string; email: string } | null) {
+        useStore.getState().setUser(userData !== null ? pick(userData, ['id', 'name', 'email']) : null);
         await this.loadUserOrganisation();
         useStore.getState().setIsAuthenticated(!!userData);
     }

diff --git a/frontend/spa/src/services/auth/__tests__/AuthService.test.ts b/frontend/spa/src/services/auth/__tests__/AuthService.test.ts
@@ -75,7 +75,7 @@ describe('AuthService', () => {
     });
 
     it('should set auth user', async () => {
-        const userData = { name: 'John Doe', email: '[email protected]' };
+        const userData = { id: 'id', name: 'John Doe', email: '[email protected]' };
         vi.spyOn(authService, 'loadUserOrganisation').mockResolvedValue(undefined);
         await authService.setAuthUser(userData);
 

diff --git a/frontend/spa/src/services/auth/keycloakServiceProvider.ts b/frontend/spa/src/services/auth/keycloakServiceProvider.ts
@@ -32,7 +32,7 @@ export class KeycloakServiceProvider implements AuthServiceProvider {
             this.authService.setAuthTokens(this.keycloak.token, this.keycloak.refreshToken);
 
             try {
-                const data = (await this.keycloak.loadUserInfo()) as { name: string; email: string };
+                const data = (await this.keycloak.loadUserInfo()) as { id: string; name: string; email: string };
                 await this.authService.setAuthUser(data);
             } catch (e) {
                 await this.authService.setAuthUser(null);