add logic to auto handle role with usage of redirectAuthenticatedTo

blitz-js · Nov 28, 2023 · 59a7221 · 59a7221
1 parent fb232d1
commit 59a7221
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/packages/blitz-auth/src/server/auth-sessions.ts b/packages/blitz-auth/src/server/auth-sessions.ts
@@ -243,8 +243,17 @@ export async function useAuthenticatedBlitzContext({
           ? redirectAuthenticatedTo
           : formatWithValidation(redirectAuthenticatedTo)
       debug("[useAuthenticatedBlitzContext] Redirecting to", redirectUrl)
-      log.info("Authentication Redirect: " + customChalk.dim("(Authenticated)"), redirectUrl)
-      redirect(redirectUrl)
+      if (role) {
+        try {
+          ctx.session.$authorize(role)
+        } catch (e) {
+          log.info("Authentication Redirect: " + customChalk.dim(`Role ${role}`), redirectTo)
+          redirect(redirectUrl)
+        }
+      } else {
+        log.info("Authentication Redirect: " + customChalk.dim("(Authenticated)"), redirectUrl)
+        redirect(redirectUrl)
+      }
     }
     if (redirectTo && role) {
       debug("[useAuthenticatedBlitzContext] redirectTo and role are both defined.")