Merge pull request #899 from InseeFr/fix/review-typings

feat: remiew types for auth
InseeFr · Aug 26, 2024 · 4db9545 · 4db9545
2 parents 1fa11a7 + 110a742
commit 4db9545
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/src/packages/auth/components/auth.spec.js → src/packages/auth/components/auth.spec.tsx b/src/packages/auth/components/auth.spec.js → src/packages/auth/components/auth.spec.tsx
@@ -1,13 +1,13 @@
 import { AuthDumb, mapStateToProps } from './auth';
 import { render } from '@testing-library/react';
 import { LOADING } from '../../sdk/constants';
+import { ReduxModel } from '../../redux/model';
 
 describe('AuthDumb', () => {
 	it('should return the fallback if the user is not authorized', () => {
 		const { container } = render(
 			<AuthDumb
-				children={'children'}
-				fallback={'fallback'}
+				fallback="fallback"
 				userRoles={['roles']}
 				roles={['roles1']}
 				loadUserStamp={jest.fn()}
@@ -20,8 +20,7 @@ describe('AuthDumb', () => {
 	it('should return the children if the user is authorized', () => {
 		const { container } = render(
 			<AuthDumb
-				children={'children'}
-				fallback={'fallback'}
+				fallback="fallback"
 				userRoles={['roles']}
 				roles={['roles']}
 				loadUserStamp={jest.fn()}
@@ -35,11 +34,11 @@ describe('AuthDumb', () => {
 	it('should return the children if the user is authorized via a complementary check', () => {
 		const { container } = render(
 			<AuthDumb
-				children={'children'}
-				fallback={'fallback'}
+				fallback="fallback"
 				userRoles={['roles']}
 				roles={[['roles', () => true]]}
 				loadUserStamp={jest.fn()}
+				userStamp="stamp"
 			>
 				Children
 			</AuthDumb>
@@ -50,8 +49,7 @@ describe('AuthDumb', () => {
 	it('should return the fallback if the user is not authorized via a complementary check', () => {
 		const { container } = render(
 			<AuthDumb
-				children={'children'}
-				fallback={'fallback'}
+				fallback="fallback"
 				userRoles={['roles']}
 				roles={[['roles', () => false]]}
 				loadUserStamp={jest.fn()}
@@ -61,15 +59,31 @@ describe('AuthDumb', () => {
 		);
 		expect(container.innerHTML).toEqual('fallback');
 	});
+
+	it('should return the fallback if the user does not have a stamp via a complementary check', () => {
+		const { container } = render(
+			<AuthDumb
+				fallback="fallback"
+				userRoles={['roles']}
+				roles={[['roles', () => true]]}
+				loadUserStamp={jest.fn()}
+			>
+				Children
+			</AuthDumb>
+		);
+		expect(container.innerHTML).toEqual('fallback');
+	});
 });
 
 describe('mapStateToProps', () => {
 	it('should return the user object', () => {
 		const state = {
 			app: {
 				auth: {
+					type: 'type',
 					user: {
-						roles: 'roles',
+						roles: ['roles'],
+						stamp: 'stamp',
 					},
 				},
 			},
@@ -79,9 +93,9 @@ describe('mapStateToProps', () => {
 					stamp: 'stamp',
 				},
 			},
-		};
+		} as unknown as ReduxModel;
 		expect(mapStateToProps(state)).toEqual({
-			userRoles: 'roles',
+			userRoles: ['roles'],
 			userStamp: 'stamp',
 			isLoading: true,
 		});

diff --git a/src/packages/auth/components/auth.ts b/src/packages/auth/components/auth.ts
@@ -48,8 +48,11 @@ export function AuthDumb({
 	}, [userStamp, isLoading, loadUserStamp]);
 	const isAuthorized = !!roles.find((role) => {
 		if (Array.isArray(role)) {
-			const [r, check] = role;
-			return userRoles?.includes(r) && check(userStamp!);
+			if (!!userStamp) {
+				const [r, check] = role;
+				return userRoles?.includes(r) && check(userStamp);
+			}
+			return false;
 		}
 		return userRoles?.includes(role);
 	});