use baseapi url from env for OAuth and authActions comments removed

Author: lazycipher

src/actions/authAction.js

@@ -7,7 +7,6 @@ import { BASE_URL } from './baseApi';
 import { customErrorHandler } from '../utils/customErrorHandler'
 let forgotPasswordToken = "";
 
-// load user
 export const loadUser = () => async(dispatch) => {
   try {
     const res = await axios.get(`${BASE_URL}/user/load_user`);
@@ -16,29 +15,22 @@ export const loadUser = () => async(dispatch) => {
       dispatch(setRequestStatus(true));
       localStorage.setItem('userId', res.data.user._id)
 
-      dispatch(setCurrentUser(res.data.user._id));
+      dispatch(setCurrentUser(res.data.user._id))
 
-      // Update user name in localStorage
+      // Update user name, role, orgId in localStorage
       localStorage.setItem('username', `${res.data.user.name.firstName} ${res.data.user.name.lastName}`)
-
-      // update user role in localStorage
       localStorage.setItem('admin', res.data.user.isAdmin)
-
-      // update user role in localStorage
       localStorage.setItem('ticketModerator', res.data.user.isTicketsModerator)
-
-      // store orgId in localStorage
-      localStorage.setItem('orgId', res.data.user.orgId);
+      localStorage.setItem('orgId', res.data.user.orgId)
 
       // if user is admin update admin in store 
       dispatch({
         type: SET_ADMIN,
         payload: res.data.user.isAdmin
       })
-      // window.location.href='/dashboard'
     }
   } catch(error) {
-    console.log('user loading', error)
+    console.log('error while loading user from localstorage', error)
     dispatch(errorHandler(error));
 }
 }
@@ -75,21 +67,13 @@ export const loginUser = (userInfo, history) => async (dispatch) => {
     if(res.status === 200){
 
       dispatch(setRequestStatus(true));
-      console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PRINTING RES.DATA.USER !!!!!!!!!!!!!!1");
-      console.log(res.data.user);
       localStorage.setItem('userId', res.data.user._id)
       dispatch(setCurrentUser(res.data.user._id));
 
-      // Update user name in localStorage
+      // Update user name, role, orgId in localStorage
       localStorage.setItem('username', `${res.data.user.name.firstName} ${res.data.user.name.lastName}`)
-
-      // update user role in localStorage
       localStorage.setItem('admin', res.data.user.isAdmin)
-
-      // update user role in localStorage
       localStorage.setItem('ticketModerator', res.data.user.isTicketsModerator)
-
-      // store orgId in localStorage
       localStorage.setItem('orgId', res.data.user.orgId);
 
       // if user is admin update admin in store 

src/user/auth/login/login.js

@@ -10,6 +10,10 @@ import { connect } from 'react-redux';
 import { getLoginOptions } from '../../../actions/orgAction'
 import { HashLink } from 'react-router-hash-link';
 import "./login.scss";
+import { BASE_URL } from '../../../actions/baseApi'
+
+const GITHUB_OAUTH_URL =  BASE_URL + '/user/auth/github' || "http://localhost:5000/user/auth/github"
+const GOOGLE_OAUTH_URL =  BASE_URL + '/user/auth/google' || "http://localhost:5000/user/auth/google"
 
 class Login extends Component {
   constructor(props) {
@@ -86,7 +90,7 @@ class Login extends Component {
               {Boolean(loginOptions?.google === true) ? (
                 <Col className = "button-column">
                 <a
-                  href="http://localhost:5000/user/auth/google"
+                  href={GOOGLE_OAUTH_URL}
                   style={{ padding: "1vh" }}
                 >
                   <Button
@@ -106,7 +110,7 @@ class Login extends Component {
               {Boolean(loginOptions?.github === true) ? (
                 <Col className="button-column" >
                 <a
-                  href="http://localhost:5000/user/auth/github"
+                  href={GITHUB_OAUTH_URL}
                   style={{ padding: "1vh" }}
                 >
                   <Button