Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions src/contexts/auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
setData({ token, user });
return true;
} catch (err) {
const errorStatus = err.response?.status;

if (errorStatus === 401) {
setInviteError(err.response?.data.message);
}
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

setInviteError(celebrateError || errorData?.message);
return false;
}
}, []);
Expand All @@ -72,9 +70,9 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
setSignUpSuccess(true);
} catch (err) {
const errorData = err.response?.data;
const validationError = errorData?.validation?.body?.message;
const celebrateError = errorData?.validation?.body?.message;

setSignUpError(validationError || err.response.validation?.body?.message);
setSignUpError(celebrateError || errorData?.message);
setSignUpLoader(false);
setSignUpSuccess(false);
}
Expand All @@ -89,9 +87,9 @@ const AuthProvider = ({ children }: AuthProviderProps) => {

const inviteUser = useCallback(async ({ name, email, type }) => {
setInviteLoader(true);
setInviteError('');

try {
setInviteError('');
const response = await api.post('/invite-users', {
name,
email,
Expand All @@ -105,27 +103,28 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
JSON.stringify({ name: inviteData.name, email: inviteData.email }),
);
} catch (err) {
const errorStatus = err.response?.status;
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

if (errorStatus === 401) {
setInviteError(err.response?.data.message);
}
setInviteError(celebrateError || errorData?.message);
}

setInviteLoader(false);
}, []);

const recoveryPassword = useCallback(async ({ email }) => {
setRecoveryLoader(true);
setRecoveryError('');

try {
setRecoveryError('');

await api.post('/password/forgot', {
email,
});
} catch (err) {
setRecoveryError(err.response?.data.message);
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

setRecoveryError(celebrateError || errorData?.message);
}

setRecoveryLoader(false);
Expand All @@ -134,22 +133,24 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
const resetPassword = useCallback(
async ({ email, password, password_confirmation }) => {
setResetLoader(true);
setResetError('');

try {
setResetError('');

await api.post('/password/reset', {
email,
password,
password_confirmation,
});

setResetLoader(false);
setResetSuccess(true);
} catch (err) {
setResetLoader(false);
setResetError(err.response?.data.validation.body.message);
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

setResetError(celebrateError || errorData?.message);
}

setResetLoader(false);
},
[],
);
Expand Down
16 changes: 11 additions & 5 deletions src/contexts/user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ const UsersProvider = ({ children }: UserProviderProps) => {
setUpdateUserInfoLoader(true);
try {
await api.put('/users/logged', data);
} catch (error) {
setUpdateUserInfoError(error?.response?.data?.validation.body.message);
} catch (err) {
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

setUpdateUserInfoError(celebrateError || errorData?.message);
}
setUpdateUserInfoLoader(false);
}, []);
Expand All @@ -41,16 +44,19 @@ const UsersProvider = ({ children }: UserProviderProps) => {
await api.patch(`/users/${id}`, { type: userType });
setUpdateUserTypeSuccess(true);
} catch (error) {
setUpdateUserTypeSuccess(true);
setUpdateUserTypeSuccess(false);
}
}, []);

const deleteUser = useCallback(async id => {
setDeleteUserLoader(true);
try {
await api.delete(`/users/${id}`);
} catch (error) {
setDeleteUserError(error?.response?.data?.message);
} catch (err) {
const errorData = err.response?.data;
const celebrateError = errorData?.validation?.body?.message;

setDeleteUserError(celebrateError || errorData?.message);
}
setDeleteUserLoader(false);
}, []);
Expand Down
15 changes: 14 additions & 1 deletion src/services/api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
import axios from 'axios';
import { getUserToken } from './auth';

const token = getUserToken();
// eslint-disable-next-line consistent-return
const tryGetUserToken = (count = 1) => {
if (count >= 100) return '';

const token = getUserToken();

if (token) return token;

setTimeout(() => {
tryGetUserToken(count + 1);
}, 500 * count);
};

const token = tryGetUserToken();

const api = axios.create({
baseURL: 'http://localhost:3333',
Expand Down