handle a lot of error, make all responsive

This commit is contained in:
Léo 2025-01-14 18:13:18 +01:00
parent 921e53d864
commit 15966f3730
3 changed files with 41 additions and 34 deletions

View File

@ -16,11 +16,6 @@
command:() => router.push({name:'home'}),
icon: 'pi pi-home',
},
{
label:'Logout',
command:() => logout(),
icon:'pi pi-sign-out',
},
{
label:userInfo.value ? userInfo.value.username : 'Profil',
command:() => router.push({name:'login'}),
@ -31,6 +26,11 @@
command:() => router.push({name:'swagger'}),
icon:'pi pi-cog',
},
{
label:'Logout',
command:() => logout(),
icon:'pi pi-sign-out',
},
];
} else {
return [

View File

@ -40,37 +40,41 @@ export const getuserinfo = async () => {
return response.data;
};
const refreshAccessToken = async () => {
try {
const response = await api.post('/token/refresh', {'refresh': Cookies.get('refresh')}, {
withCredentials: true,
});
try {
const response = await api.post('/token/refresh', {'refresh': Cookies.get('refresh')}, {
withCredentials: true,
});
const { access, refresh } = response.data;
const { access, refresh } = response.data;
return [access, refresh];
} catch (error) {
console.error('Refresh token request failed:', error);
return null;
}
};
return [access, refresh];
} catch (error) {
console.error('Refresh token request failed:', error);
return null;
}
};
api.interceptors.response.use(
(response) => response,
async (error) => {
if (error.response && error.response.status === 401) {
const [newAccessToken,newRefreshToken] = await refreshAccessToken();
if (newAccessToken) {
Cookies.set('refresh', newRefreshToken,{
expires: 1,
secure: true,
sameSite: 'strict',
});
(response) => response,
async (error) => {
if (error.response && error.response.status === 401) {
const errorMessage = error.response.data.detail;
if (errorMessage === "No active account found with the given credentials") {
return Promise.reject(error);
} else {
const tokens = await refreshAccessToken();
if (tokens) {
const [newAccessToken, newRefreshToken] = tokens;
Cookies.set('refresh', newRefreshToken, {
expires: 1,
secure: true,
sameSite: 'strict',
});
error.config.headers['Authorization'] = `Bearer ${newAccessToken}`;
return api(error.config);
}
}
return Promise.reject(error);
}
);
// const response = await api.post('/users', userData, {
// headers: {Authorization: `Bearer ${sessionStorage.getItem('access_token')}`},);
return Promise.reject(error);
}
);

View File

@ -1,6 +1,6 @@
<script setup>
import { ref } from 'vue';
import { createUser, loginUser,getuserinfo } from '../api.js';
import { createUser, loginUser, getuserinfo } from '../api.js';
import { useToast } from 'primevue/usetoast';
import PMessage from 'primevue/message';
import { useAuth } from '../composables/useAuth.js';
@ -26,9 +26,9 @@ async function make_user() {
email: emailRegister.value,
password: passwordRegister.value,
});
toast.add({ severity: 'success', summary: 'Succès', detail: 'Utilisateur créé !' });
isAuth.value = true;
userInfo.value = await getuserinfo();
toast.add({ severity: 'success', summary: 'Succès', detail: 'Utilisateur créé !' });
} catch (error) {
if (error.response && error.response.data) {
const data = error.response.data;
@ -57,6 +57,9 @@ async function login() {
} catch (error) {
if (error.response && error.response.data) {
const data = error.response.data;
if (data.detail) {
toast.add({ severity: 'error', summary: 'Erreur', detail: data.detail });
}
if (data.username) {
loginErrors.value.username = data.username[0];
}