From 6b078267de23fa9e7eab46d7f00291e5bf4fe3ba Mon Sep 17 00:00:00 2001
From: Pascal Martineau <pascal@lewebsimple.ca>
Date: Thu, 18 Sep 2025 14:02:00 -0400
Subject: [PATCH] refactor: useAuth / useAuthActions

---
 .../ccat/app/components/auth/LoginForm.vue       |  3 ++-
 .../ccat/app/components/auth/LogoutForm.vue      |  3 ++-
 .../themes/ccat/app/composables/useAuth.ts       | 16 ++++++++++------
 wp-content/themes/ccat/app/middleware/hasRole.ts |  5 ++---
 wp-content/themes/ccat/app/middleware/isAdmin.ts |  7 +++----
 .../themes/ccat/app/middleware/isLoggedIn.ts     |  4 ++--
 .../themes/ccat/app/middleware/isLoggedOut.ts    |  4 ++--
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/wp-content/themes/ccat/app/components/auth/LoginForm.vue b/wp-content/themes/ccat/app/components/auth/LoginForm.vue
index cc74ced..d9dcb57 100644
--- a/wp-content/themes/ccat/app/components/auth/LoginForm.vue
+++ b/wp-content/themes/ccat/app/components/auth/LoginForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-const { isLoggedIn, loginFields, login } = useAuth();
+const { isLoggedIn } = useAuth();
+const { loginFields, login } = useAuthActions();
 if (isLoggedIn.value) {
   throw createError({ statusCode: 500, statusMessage: "Erreur serveur", message: "Le formulaire de connexion ne peut pas être affiché pour un utilisateur déjà connecté." });
 }
diff --git a/wp-content/themes/ccat/app/components/auth/LogoutForm.vue b/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
index 57139e9..a928b09 100644
--- a/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
+++ b/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-const { isLoggedIn, logout } = useAuth();
+const { isLoggedIn } = useAuth();
+const { logout } = useAuthActions();
 if (!isLoggedIn.value) {
   throw createError({ statusCode: 500, statusMessage: "Erreur serveur", message: "Le formulaire de déconnexion ne peut pas être affiché pour un utilisateur déjà déconnecté." });
 }
diff --git a/wp-content/themes/ccat/app/composables/useAuth.ts b/wp-content/themes/ccat/app/composables/useAuth.ts
index f4db527..b2e0cb9 100644
--- a/wp-content/themes/ccat/app/composables/useAuth.ts
+++ b/wp-content/themes/ccat/app/composables/useAuth.ts
@@ -2,17 +2,21 @@ import type { FormSubmitEvent } from "@nuxt/ui";
 
 export function useAuth() {
   const { loggedIn, session } = useUserSession();
-  const toast = useToast();
-  const redirect = useRoute().query.redirect as string || "/";
-  const router = useRouter();
-  const { fetch: refreshUserSession } = useUserSession();
 
   const isLoggedIn = loggedIn;
   const isSwitchedTo = computed(() => Boolean(session.value?.isSwitchedTo));
-
   const hasRole = (role: string) => session.value?.user?.roles?.includes(role) || false;
   const isAdmin = computed(() => hasRole("administrator"));
 
+  return { isLoggedIn, isSwitchedTo, hasRole, isAdmin };
+}
+
+export function useAuthActions() {
+  const { fetch: refreshUserSession } = useUserSession();
+  const redirect = useRoute().query.redirect as string || "/";
+  const router = useRouter();
+  const toast = useToast();
+
   // Login
   const loginFields = [
     {
@@ -91,5 +95,5 @@ export function useAuth() {
     }
   }
 
-  return { isLoggedIn, isSwitchedTo, hasRole, isAdmin, loginFields, login, logout, switchTo, switchBack };
+  return { loginFields, login, logout, switchTo, switchBack };
 }
diff --git a/wp-content/themes/ccat/app/middleware/hasRole.ts b/wp-content/themes/ccat/app/middleware/hasRole.ts
index ac6a831..e98a31d 100644
--- a/wp-content/themes/ccat/app/middleware/hasRole.ts
+++ b/wp-content/themes/ccat/app/middleware/hasRole.ts
@@ -1,7 +1,6 @@
 export default defineNuxtRouteMiddleware((to) => {
-  const { loggedIn, session } = useUserSession();
-  const hasRole = (role: string) => session.value?.user?.roles?.includes(role) || false;
-  if (!loggedIn.value) {
+  const { isLoggedIn, hasRole } = useAuth();
+  if (!isLoggedIn.value) {
     return navigateTo(`/connexion?redirect=${encodeURIComponent(to.fullPath)}`);
   }
   if (!to.meta.role) {
diff --git a/wp-content/themes/ccat/app/middleware/isAdmin.ts b/wp-content/themes/ccat/app/middleware/isAdmin.ts
index 56bda3b..fccbe02 100644
--- a/wp-content/themes/ccat/app/middleware/isAdmin.ts
+++ b/wp-content/themes/ccat/app/middleware/isAdmin.ts
@@ -1,10 +1,9 @@
 export default defineNuxtRouteMiddleware((to) => {
-  const { loggedIn, session } = useUserSession();
-  if (!loggedIn.value) {
+  const { isLoggedIn, isAdmin } = useAuth();
+  if (!isLoggedIn.value) {
     return navigateTo(`/connexion?redirect=${encodeURIComponent(to.fullPath)}`);
   }
-  const isAdmin = session.value?.user?.roles?.includes("administrator") || false;
-  if (!isAdmin) {
+  if (!isAdmin.value) {
     throw createError({
       statusCode: 403,
       statusMessage: "Accès refusé - Privilèges administrateur requis",
diff --git a/wp-content/themes/ccat/app/middleware/isLoggedIn.ts b/wp-content/themes/ccat/app/middleware/isLoggedIn.ts
index 2ecddff..83b5f8e 100644
--- a/wp-content/themes/ccat/app/middleware/isLoggedIn.ts
+++ b/wp-content/themes/ccat/app/middleware/isLoggedIn.ts
@@ -1,6 +1,6 @@
 export default defineNuxtRouteMiddleware((to) => {
-  const { loggedIn } = useUserSession();
-  if (!loggedIn.value) {
+  const { isLoggedIn } = useAuth();
+  if (!isLoggedIn.value) {
     return navigateTo(`/connexion?redirect=${encodeURIComponent(to.fullPath)}`);
   }
 });
diff --git a/wp-content/themes/ccat/app/middleware/isLoggedOut.ts b/wp-content/themes/ccat/app/middleware/isLoggedOut.ts
index 4b13bbb..7ff7d7a 100644
--- a/wp-content/themes/ccat/app/middleware/isLoggedOut.ts
+++ b/wp-content/themes/ccat/app/middleware/isLoggedOut.ts
@@ -1,6 +1,6 @@
 export default defineNuxtRouteMiddleware((to) => {
-  const { loggedIn } = useUserSession();
-  if (loggedIn.value) {
+  const { isLoggedIn } = useAuth();
+  if (isLoggedIn.value) {
     return navigateTo(`/connexion?redirect=${encodeURIComponent(to.fullPath)}`);
   }
 });