fixes admin login bug with lost cookie bug

Author: lazycipher

src/App.js

@@ -4,15 +4,17 @@ import "./App.css";
 import { Provider } from "react-redux";
 import store from "./store";
 import jwt_decode from "jwt-decode";
-import { setAuthToken } from "./utils/setAuthToken";
+import { allowCredentialsInHeader } from "./utils/allowCredentialsInHeader";
 import { setCurrentUser, logoutUser } from "./actions/authAction";
 import "./css/main.scss";
 import ReactGA from "react-ga";
 
+allowCredentialsInHeader()
+
 function App() {
   useEffect(() => {
     ReactGA.initialize("UA-173245995-1");
-    setAuthToken()
+    
   });
   return (
     <Provider store={store}>

src/actions/adminAction.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import { errorHandler } from '../utils/errorHandler'
 import { setRequestStatus } from '../utils/setRequestStatus'
 import { SET_ADMIN, GET_ADMIN } from './types'
-import { setAuthToken } from '../utils/setAuthToken'
 import jwt_decode from 'jwt-decode';
 import { setCurrentUser } from './authAction'
 import { BASE_URL } from './baseApi'
@@ -27,31 +26,27 @@ export const createAdmin = (adminInfo) => async (dispatch) => {
 export const loginAdmin = (adminInfo, history) => async (dispatch) => {
   try {
     const res = await axios.post(`${BASE_URL}/auth/login/`, adminInfo)
-   dispatch(setRequestStatus(false));
-   if (res.status === 200) {
+    dispatch(setRequestStatus(false));
+    if (res.status === 200) {
+      dispatch(setRequestStatus(true));
 
-     const token = res.data.token;
-     dispatch(setRequestStatus(true));
+      // update state with user
+      localStorage.setItem('userId', res.data.user)
+      dispatch(setCurrentUser(res.data.user._id));
 
-     localStorage.setItem("jwtToken", (token));
-     setAuthToken(token);
+      // update localStorage with admin status 
+      localStorage.setItem('username', `${res.data.user.name.firstName} ${res.data.user.name.lastName}`)
+      localStorage.setItem('admin', res.data.user.isAdmin)
+      localStorage.setItem('ticketModerator', res.data.user.isTicketsModerator)
+      localStorage.setItem('orgId', res.data.user.orgId);
 
-     // update state with user
-     const decodedData = await jwt_decode(token);
-     localStorage.setItem('userId', decodedData._id)
-     dispatch(setCurrentUser(decodedData));
-
-     // update localStorage with admin status 
-     localStorage.setItem('admin', true)
-
-     dispatch({
-       type: SET_ADMIN,
-       payload: true
-     })
-     
-     history.push("/dashboard");
+      dispatch({
+        type: SET_ADMIN,
+        payload: res.data.user.isAdmin
+      })
+    history.push("/dashboard");
    }
   } catch (error) {
     dispatch(errorHandler(error))
   }
-}
+}

src/actions/authAction.js

@@ -1,6 +1,5 @@
 import { SET_CURRENT_USER, GET_USER_PROFILE, PASSWORD_SUCCESSFULLY_CHANGED, PASSWORD_CHANGE_REQUEST_SUCCESS, SET_ADMIN } from './types';
 import axios from 'axios';
-import { setAuthToken } from '../utils/setAuthToken';
 import { errorHandler } from '../utils/errorHandler';
 import { setRequestStatus } from '../utils/setRequestStatus';
 import { BASE_URL } from './baseApi';
@@ -146,8 +145,6 @@ export const logoutUser = () => async (dispatch) => {
       const orgId = localStorage.getItem('orgId');
       localStorage.clear()
       localStorage.setItem('orgId', orgId)
-      // delete authorization from the header 
-      setAuthToken(false);
       // set user to {}
       setCurrentUser({});
       // move to home 

src/utils/allowCredentialsInHeader.js

@@ -0,0 +1,5 @@
+import axios from "axios";
+
+export const allowCredentialsInHeader = () => {
+  axios.defaults.withCredentials = true;
+}