migration

Author: MacKentoch

front/src/mock/userInfo.json

@@ -0,0 +1,13 @@
+export const userMock = Object.freeze({
+  token:
+    'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJkZW1vIiwiaWF0IjoxNTAyMzA3MzU0LCJleHAiOjE3MjMyMzIxNTQsImF1ZCI6ImRlbW8tZGVtbyIsInN1YiI6ImRlbW8iLCJHaXZlbk5hbWUiOiJKb2huIiwiU3VybmFtZSI6IkRvZSIsIkVtYWlsIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJSb2xlIjpbIlN1cGVyIGNvb2wgZGV2IiwibWFnaWMgbWFrZXIiXX0.6FjgLCypaqmRp4tDjg_idVKIzQw16e-z_rjA3R94IqQ',
+  user: {
+    id: 111,
+    login: 'john.doe@fake.mail',
+    firstname: 'John',
+    lastname: 'Doe',
+    isAdmin: true,
+  },
+});
+
+export default userMock;

front/src/mock/userInfo.ts

@@ -6,7 +6,7 @@ import Row from 'reactstrap/lib/Row';
 import Col from 'reactstrap/lib/Col';
 import { appConfig } from '../../config/appConfig';
 import { getLocationOrigin } from '../../services/API/fetchTools';
-import userInfoMock from '../../mock/userInfo.json';
+import userInfoMock from '../../mock/userInfo.js';
 import { AuthContextProps } from '../../contexts/auth/consumerHOC';
 import FadeInEntrance from '../../components/fadeInEntrance';
 
@@ -52,42 +52,39 @@ function Login({
     [],
   );
 
-  const handlesOnLogin = async (event: React.MouseEvent<HTMLButtonElement>) => {
-    event && event.preventDefault();
+  const handlesOnLogin = useCallback(
+    async (event: React.MouseEvent<HTMLButtonElement>) => {
+      event && event.preventDefault();
+
+      try {
+        setIsLogging(true);
+        const response = await logUser(email, password);
+        const {
+          data: { token, user },
+        } = response;
+
+        setToken(token);
+        setUserInfo(user);
 
-    const { history, setToken, setUserInfo } = this.props;
-    const { email, password } = this.state;
-
-    const userLogin = {
-      login: email,
-      password: password,
-    };
-
-    try {
-      this.setState({ isLogging: true });
-      const response = await logUser(userLogin);
-      const {
-        data: { token, user },
-      } = response;
-
-      setToken(token);
-      setUserInfo(user);
-
-      this.setState({ isLogging: false });
-
-      history.push({ pathname: '/' }); // back to Home
-    } catch (error) {
-      this.setState({ isLogging: false });
-      /* eslint-disable no-console */
-      console.log('login went wrong..., error: ', error);
-      /* eslint-enable no-console */
-    }
-  };
+        history.push({ pathname: '/' }); // back to Home
+      } catch (error) {
+        /* eslint-disable no-console */
+        console.log('login went wrong..., error: ', error);
+        /* eslint-enable no-console */
+      } finally {
+        setIsLogging(false);
+      }
+    },
+    [history, setToken, setUserInfo, email, password],
+  );
   // #endregion
 
   // #region log user request
   const logUser = useCallback(
-    async (login: string = '', password: string = '') => {
+    async (
+      login: string = '',
+      password: string = '',
+    ): Promise<{ data: { user: Partial<User>; token: string } }> => {
       const __SOME_LOGIN_API__ = 'login';
       const url = `${getLocationOrigin()}/${__SOME_LOGIN_API__}`;
       const method = 'post';
@@ -107,7 +104,7 @@ function Login({
       }
 
       try {
-        const response = await axios.request({
+        const response = await axios.request<{ token: string; user: any }>({
           method,
           url,
           withCredentials: true,
@@ -120,9 +117,9 @@ function Login({
           ...options,
         });
 
-        return Promise.resolve(response);
+        return response;
       } catch (error) {
-        return Promise.reject(error);
+        throw error;
       }
     },
     [],

front/src/pages/login/Login.tsx

@@ -1,8 +1,8 @@
 declare type User = {
-  id: string;
+  id: string | number;
   login: string;
   firstname: string;
   lastname: string;
   token: string;
-  isAuthenticated: boolean;
+  isAuthenticated?: boolean;
 };