pascalmartineau/cultureat-bak
4
0
Fork 0
generated from pascalmartineau/wp-skeleton
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: isRedirecting auth
All checks were successful
Deploy WordPress and Nuxt / deploy (push) Successful in 1m1s
Details

Browse Source
This commit is contained in:
Pascal Martineau
2025-09-18 14:39:47 -04:00
parent 056901e7e7
commit a863da3e40
6 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
wp-content/themes/ccat/app/composables/useAuth.ts
View File

@@ -11,12 +11,22 @@ export function useAuth() {
return { isLoggedIn, isSwitchedTo, hasRole, isAdmin };
}
const isRedirecting = ref(false);
export function useAuthActions() {
const { fetch: refreshUserSession } = useUserSession();
const routeRedirect = useRoute().query.redirect as string || undefined;
const router = useRouter();
const toast = useToast();
async function redirectTo(to: string | undefined) {
isRedirecting.value = true;
await delay(1000);
await refreshUserSession();
await navigateTo(to || routeRedirect || "/");
await nextTick();
isRedirecting.value = false;
}
// Login
const loginFields = [
{
@@ -35,14 +45,12 @@ export function useAuthActions() {
];
async function login({ data: args }: FormSubmitEvent<LoginOutput>, redirect?: string) {
try {
const redirectTo = redirect || routeRedirect || "/";
const { data, errors } = await useGraphqlMutation("login", args);
if (errors.length || !data.login) {
console.error(errors);
throw new Error("Une erreur est survenue.");
}
await refreshUserSession();
await router.push(redirectTo);
await redirectTo(redirect);
}
catch (error) {
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
@@ -53,14 +61,11 @@ export function useAuthActions() {
// Logout
async function logout(redirect?: string) {
try {
const redirectTo = redirect || routeRedirect || "/";
console.log(redirectTo);
const result = await $fetch("/api/logout", { method: "POST" });
if (!result.success) {
throw new Error("Une erreur est survenue.");
}
await refreshUserSession();
await router.push(redirectTo);
await redirectTo(redirect);
}
catch (error) {
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
@@ -71,15 +76,11 @@ export function useAuthActions() {
// Switch to
async function switchTo(userId: number, redirect?: string) {
try {
const redirectTo = redirect || routeRedirect;
const { data, errors } = await useGraphqlMutation("switchTo", { userId });
if (errors.length || !data.switchTo) {
throw new Error("Une erreur est survenue");
}
await refreshUserSession();
if (redirectTo) {
await router.push(redirectTo);
}
await redirectTo(redirect);
}
catch (error) {
const message = error instanceof Error ? error.message : "Une erreur est survenue";
@@ -90,15 +91,11 @@ export function useAuthActions() {
// Switch back
async function switchBack(redirect?: string) {
try {
const redirectTo = redirect || routeRedirect;
const result = await $fetch("/api/switch-back", { method: "POST" });
if (!result.success) {
throw new Error("Une erreur est survenue.");
}
await refreshUserSession();
if (redirectTo) {
await router.push(redirectTo);
}
await redirectTo(redirect);
}
catch (error) {
const message = error instanceof Error ? error.message : "Une erreur est survenue";
@@ -106,5 +103,5 @@ export function useAuthActions() {
}
}
return { loginFields, login, logout, switchTo, switchBack };
return { isRedirecting, loginFields, login, logout, switchTo, switchBack };
}