generated from pascalmartineau/wp-skeleton
feat: redirect param to useAuthAction
All checks were successful
Deploy WordPress and Nuxt / deploy (push) Successful in 1m3s
All checks were successful
Deploy WordPress and Nuxt / deploy (push) Successful in 1m3s
This commit is contained in:
@@ -22,7 +22,7 @@ if (!isLoggedIn.value) {
|
|||||||
loading-auto
|
loading-auto
|
||||||
to="#"
|
to="#"
|
||||||
label="Déconnexion"
|
label="Déconnexion"
|
||||||
@click="logout"
|
@click="logout()"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export function useAuth() {
|
|||||||
|
|
||||||
export function useAuthActions() {
|
export function useAuthActions() {
|
||||||
const { fetch: refreshUserSession } = useUserSession();
|
const { fetch: refreshUserSession } = useUserSession();
|
||||||
const redirect = useRoute().query.redirect as string || "/";
|
const routeRedirect = useRoute().query.redirect as string || undefined;
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const toast = useToast();
|
const toast = useToast();
|
||||||
|
|
||||||
@@ -33,15 +33,16 @@ export function useAuthActions() {
|
|||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
async function login({ data: args }: FormSubmitEvent<LoginOutput>) {
|
async function login({ data: args }: FormSubmitEvent<LoginOutput>, redirect?: string) {
|
||||||
try {
|
try {
|
||||||
|
const redirectTo = redirect || routeRedirect || "/";
|
||||||
const { data, errors } = await useGraphqlMutation("login", args);
|
const { data, errors } = await useGraphqlMutation("login", args);
|
||||||
if (errors.length || !data.login) {
|
if (errors.length || !data.login) {
|
||||||
console.error(errors);
|
console.error(errors);
|
||||||
throw new Error("Une erreur est survenue.");
|
throw new Error("Une erreur est survenue.");
|
||||||
}
|
}
|
||||||
await router.push(redirect);
|
|
||||||
await refreshUserSession();
|
await refreshUserSession();
|
||||||
|
await router.push(redirectTo);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
|
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
|
||||||
@@ -50,14 +51,16 @@ export function useAuthActions() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Logout
|
// Logout
|
||||||
async function logout() {
|
async function logout(redirect?: string) {
|
||||||
try {
|
try {
|
||||||
|
const redirectTo = redirect || routeRedirect || "/";
|
||||||
|
console.log(redirectTo);
|
||||||
const result = await $fetch("/api/logout", { method: "POST" });
|
const result = await $fetch("/api/logout", { method: "POST" });
|
||||||
if (!result.success) {
|
if (!result.success) {
|
||||||
throw new Error("Une erreur est survenue.");
|
throw new Error("Une erreur est survenue.");
|
||||||
}
|
}
|
||||||
await router.push(redirect);
|
|
||||||
await refreshUserSession();
|
await refreshUserSession();
|
||||||
|
await router.push(redirectTo);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
|
const message = error instanceof Error ? error.message : "Une erreur est survenue.";
|
||||||
@@ -66,13 +69,17 @@ export function useAuthActions() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Switch to
|
// Switch to
|
||||||
async function switchTo(userId: string | number) {
|
async function switchTo(userId: number, redirect?: string) {
|
||||||
try {
|
try {
|
||||||
|
const redirectTo = redirect || routeRedirect;
|
||||||
const { data, errors } = await useGraphqlMutation("switchTo", { userId });
|
const { data, errors } = await useGraphqlMutation("switchTo", { userId });
|
||||||
if (errors.length || !data.switchTo) {
|
if (errors.length || !data.switchTo) {
|
||||||
throw new Error("Une erreur est survenue");
|
throw new Error("Une erreur est survenue");
|
||||||
}
|
}
|
||||||
await refreshUserSession();
|
await refreshUserSession();
|
||||||
|
if (redirectTo) {
|
||||||
|
await router.push(redirectTo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
const message = error instanceof Error ? error.message : "Une erreur est survenue";
|
const message = error instanceof Error ? error.message : "Une erreur est survenue";
|
||||||
@@ -81,13 +88,17 @@ export function useAuthActions() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Switch back
|
// Switch back
|
||||||
async function switchBack() {
|
async function switchBack(redirect?: string) {
|
||||||
try {
|
try {
|
||||||
|
const redirectTo = redirect || routeRedirect;
|
||||||
const result = await $fetch("/api/switch-back", { method: "POST" });
|
const result = await $fetch("/api/switch-back", { method: "POST" });
|
||||||
if (!result.success) {
|
if (!result.success) {
|
||||||
throw new Error("Une erreur est survenue.");
|
throw new Error("Une erreur est survenue.");
|
||||||
}
|
}
|
||||||
await refreshUserSession();
|
await refreshUserSession();
|
||||||
|
if (redirectTo) {
|
||||||
|
await router.push(redirectTo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
const message = error instanceof Error ? error.message : "Une erreur est survenue";
|
const message = error instanceof Error ? error.message : "Une erreur est survenue";
|
||||||
|
|||||||
Reference in New Issue
Block a user