login user implemented

This commit was merged in pull request #8.
This commit is contained in:
victorAnumudu
2023-04-14 19:49:59 +01:00
parent 9103a812b5
commit c17f95351f
6 changed files with 20 additions and 13 deletions
+3 -3
View File
@@ -77,7 +77,7 @@ const AuthInit: FC<WithChildren> = ({children}) => {
} catch (error) {
console.error(error)
if (!didRequest.current) {
logout()
// logout()
}
} finally {
setShowSplashScreen(false)
@@ -86,8 +86,8 @@ const AuthInit: FC<WithChildren> = ({children}) => {
return () => (didRequest.current = true)
}
if (auth && auth.api_token) {
requestUser(auth.api_token)
if (auth && auth.session_token) {
requestUser(auth.session_token)
} else {
logout()
setShowSplashScreen(false)
+2 -2
View File
@@ -52,8 +52,8 @@ export function setupAxios(axios: any) {
axios.interceptors.request.use(
(config: {headers: {Authorization: string}}) => {
const auth = getAuth()
if (auth && auth.api_token) {
config.headers.Authorization = `Bearer ${auth.api_token}`
if (auth && auth.session_token) {
config.headers.Authorization = `Bearer ${auth.session_token}`
}
return config
+1 -1
View File
@@ -1,5 +1,5 @@
export interface AuthModel {
api_token: string
session_token: string
refreshToken?: string
}
+4 -4
View File
@@ -11,8 +11,8 @@ export const REQUEST_PASSWORD_URL = `${API_URL}/forgot_password`
// Server should return AuthModel
export function login(email: string, password: string) {
return axios.post<AuthModel>(LOGIN_URL, {
email,
password,
username: email,
password: password,
})
}
@@ -41,7 +41,7 @@ export function requestPassword(email: string) {
}
export function getUserByToken(token: string) {
return axios.post<UserModel>(GET_USER_BY_ACCESSTOKEN_URL, {
api_token: token,
return axios.get<UserModel>(GET_USER_BY_ACCESSTOKEN_URL, {
session_token: token,
})
}