From 23f381065ab4d54fadb3cd3bca736032e80dec53 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Wed, 30 Sep 2020 19:01:07 +0200
Subject: [PATCH] fix: settings

---
 .../authentication/authentication.actions.js  | 113 +++++++++++-------
 .../authentication/authentication.reducer.js  |  10 +-
 client/src/store/settings/settings.actions.js |   6 +-
 3 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/client/src/store/authentication/authentication.actions.js b/client/src/store/authentication/authentication.actions.js
index 3e51d8a7e..361146cb0 100644
--- a/client/src/store/authentication/authentication.actions.js
+++ b/client/src/store/authentication/authentication.actions.js
@@ -2,53 +2,66 @@ import ApiService from 'services/ApiService';
 import t from 'store/types';
 
 export function login({ form }) {
-  return (dispatch) => new Promise((resolve, reject) => {
-    ApiService.post('auth/login', form).then((response) => {
-      const { data } = response;
+  return (dispatch) =>
+    new Promise((resolve, reject) => {
+      ApiService.post('auth/login', form)
+        .then((response) => {
+          const { data } = response;
 
-      if (data.token && data.user) {
-        dispatch({
-          type: t.LOGIN_SUCCESS,
-          payload: {
-            user: data.user,
-            token: data.token,
-          },            
+          if (data.token && data.user) {
+            dispatch({
+              type: t.LOGIN_SUCCESS,
+              payload: {
+                user: data.user,
+                token: data.token,
+                tenant: data.tenant,
+              },
+            });
+          }
+          resolve(response);
+        })
+        .catch((error) => {
+          const { response } = error;
+          const { data } = response;
+          const { errors = [] } = data;
+
+          reject(errors);
         });
-      }
-      resolve(response);
-    }).catch((error) => {
-      const { response } = error;
-      const { data } = response;
-      const { errors = [] } = data;
-
-      reject(errors);
     });
-  });
 }
 
 export const logout = () => {
-  return dispatch => dispatch({
-    type: t.LOGOUT, 
-  });
+  return (dispatch) =>
+    dispatch({
+      type: t.LOGOUT,
+    });
 };
 
 export const register = ({ form }) => {
   return (dispatch) => {
     return new Promise((resolve, reject) => {
       ApiService.post('auth/register', form)
-        .then((response) => { resolve(response); })
-        .catch(error => { reject(error.response.data.errors || []); })
-    })
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error.response.data.errors || []);
+        });
+    });
   };
-}
+};
 
 export const resetPassword = ({ form, token }) => {
   return (dispatch) => {
     return new Promise((resolve, reject) => {
       ApiService.post(`auth/reset/${token}`, form)
-        .then((response) => { resolve(response); })
-        .catch(error => { reject(error.response.data.errors || []); })
-    })
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error.response.data.errors || []);
+        });
+    });
   };
 };
 
@@ -56,24 +69,38 @@ export const sendResetPassword = (email) => {
   return (dispatch) => {
     return new Promise((resolve, reject) => {
       ApiService.post('auth/send_reset_password', email)
-        .then((response) => { resolve(response); })
-        .catch(error => { reject(error.response.data.errors || []); })
-    })
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error.response.data.errors || []);
+        });
+    });
   };
 };
 
 export const inviteAccept = ({ form, token }) => {
-  return (dispatch) => new Promise((resolve, reject) => {
-    ApiService.post(`invite/accept/${token}`, { ...form })
-      .then((response) => { resolve(response); })
-      .catch((error) => { reject(error.response.data.errors || []) });
-  });
+  return (dispatch) =>
+    new Promise((resolve, reject) => {
+      ApiService.post(`invite/accept/${token}`, { ...form })
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error.response.data.errors || []);
+        });
+    });
 };
 
 export const inviteMetaByToken = ({ token }) => {
-  return (dispatch) => new Promise((resolve, reject) => {
-    ApiService.get(`invite/invited/${token}`)
-      .then((response) => { resolve(response); })
-      .catch((error) => { reject(error.response.data.errors || []) });
-  }); 
-}
\ No newline at end of file
+  return (dispatch) =>
+    new Promise((resolve, reject) => {
+      ApiService.get(`invite/invited/${token}`)
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error.response.data.errors || []);
+        });
+    });
+};
diff --git a/client/src/store/authentication/authentication.reducer.js b/client/src/store/authentication/authentication.reducer.js
index 0f8d84967..15a4d281f 100644
--- a/client/src/store/authentication/authentication.reducer.js
+++ b/client/src/store/authentication/authentication.reducer.js
@@ -1,4 +1,4 @@
-import {createReducer} from '@reduxjs/toolkit';
+import { createReducer } from '@reduxjs/toolkit';
 import t from 'store/types';
 
 const initialState = {
@@ -11,10 +11,10 @@ const initialState = {
 
 export default createReducer(initialState, {
   [t.LOGIN_SUCCESS]: (state, action) => {
-    const { token, user } = action.payload;
+    const { token, user, tenant } = action.payload;
     state.token = token;
     state.user = user;
-    state.organization = user.tenant.organization_id;
+    state.organization = tenant.organization_id;
   },
 
   [t.LOGIN_FAILURE]: (state, action) => {
@@ -34,5 +34,5 @@ export default createReducer(initialState, {
 
 export const isAuthenticated = (state) => !!state.authentication.token;
 export const hasErrorType = (state, errorType) => {
-  return state.authentication.errors.find(e => e.type === errorType);
-};
\ No newline at end of file
+  return state.authentication.errors.find((e) => e.type === errorType);
+};
diff --git a/client/src/store/settings/settings.actions.js b/client/src/store/settings/settings.actions.js
index 608241584..b72b5f47b 100644
--- a/client/src/store/settings/settings.actions.js
+++ b/client/src/store/settings/settings.actions.js
@@ -3,18 +3,18 @@ import t from 'store/types';
 
 export const submitOptions = ({ form }) => {
   return (dispatch) => {
-    return ApiService.post('options', form);
+    return ApiService.post('settings', form);
   };
 };
 
 export const FetchOptions = ({ form }) => {
   return (dispatch) =>
     new Promise((resolve, reject) => {
-      ApiService.get('options')
+      ApiService.get('settings')
         .then((response) => {
           dispatch({
             type: t.SETTING_SET,
-            options: response.data.options,
+            options: response.data.settings,
           });
           resolve(response);
         })