diff --git a/src/context/auth-context.js b/src/context/auth-context.js index e3dcd7e..3a2d61e 100644 --- a/src/context/auth-context.js +++ b/src/context/auth-context.js @@ -1,8 +1,8 @@ import React, { createContext, useState, useLayoutEffect, useContext, useCallback } from 'react' import { useAsync } from 'react-async' -import { login as authLogin } from 'services/auth' import { setAccessToken, setRefreshToken, clearToken, bootstrapAppData } from 'helpers' +import { authServices } from 'services/auth' import Loader from 'components/Loader' @@ -22,7 +22,7 @@ const AuthProvider = props => { const login = useCallback(async data => { try { - const { access_token, refresh_token, ...user } = await authLogin(data) + const { access_token, refresh_token, ...user } = await authServices.login(data) setAccessToken(access_token) setRefreshToken(refresh_token) reload() diff --git a/src/helpers/bootstrap.js b/src/helpers/bootstrap.js index ff74669..d8e3a5e 100644 --- a/src/helpers/bootstrap.js +++ b/src/helpers/bootstrap.js @@ -1,6 +1,6 @@ import * as Sentry from '@sentry/browser' -import { getUser } from 'services/auth' +import { authServices } from 'services/auth' import { getToken } from 'helpers' const bootstrapAppData = async () => { @@ -10,7 +10,7 @@ const bootstrapAppData = async () => { return { user: null } } - const user = await getUser() + const user = await authServices.getUser() if (process.env.REACT_APP_NODE_ENV === 'production') { Sentry.configureScope(scope => diff --git a/src/services/auth.js b/src/services/auth.js index 1f887e8..7052c15 100644 --- a/src/services/auth.js +++ b/src/services/auth.js @@ -1,5 +1,10 @@ import client from 'providers/fetchClient' -export const getUser = () => client.get('/v1/me') +const getUser = () => client.get('/v1/me') -export const login = data => client.post('/v1/users/login', data) +const login = async data => { + const { token, ...user } = await client.post('/v1/users/login', data) + return { token, user } +} + +export const authServices = { getUser, login }