Merge pull request #79 from marmelab/fix-auth-provider-getpermissions

Fix `authProvider.getPermissions()` should not throw error when not logged in
marmelab · Oct 29, 2024 · 04d2ea8 · 04d2ea8
2 parents 58924d7 + 420b79e
commit 04d2ea8
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/packages/ra-supabase-core/src/authProvider.ts b/packages/ra-supabase-core/src/authProvider.ts
@@ -157,33 +157,27 @@ export const supabaseAuthProvider = (
             return Promise.resolve();
         },
         async getPermissions() {
-            if (
-                window.location.pathname === '/set-password' ||
-                window.location.hash.includes('#/set-password')
-            ) {
+            if (typeof getPermissions !== 'function') {
                 return;
             }
-            // Users are on the forgot-password page, nothing to do
+            // No permissions when users are on the set-password page
+            // or on the forgot-password page.
             if (
+                window.location.pathname === '/set-password' ||
+                window.location.hash.includes('#/set-password') ||
                 window.location.pathname === '/forgot-password' ||
                 window.location.hash.includes('#/forgot-password')
             ) {
                 return;
             }
 
             const { data, error } = await client.auth.getUser();
-            if (error) {
-                throw error;
-            }
-            if (data.user == null) {
-                return undefined;
+            if (error || data.user == null) {
+                return;
             }
 
-            if (typeof getPermissions === 'function') {
-                const permissions = await getPermissions(data.user);
-                return permissions;
-            }
-            return undefined;
+            const permissions = await getPermissions(data.user);
+            return permissions;
         },
     };