chore(repo): Fix integration with async middleware updates (#4382)

clerk · Oct 22, 2024 · 46dfb38 · 46dfb38
1 parent 58c99a5
commit 46dfb38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.changeset/clean-fishes-shout.md b/.changeset/clean-fishes-shout.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/integration/tests/handshake.test.ts b/integration/tests/handshake.test.ts
@@ -1381,9 +1381,9 @@ const startAppWithOrganizationSyncOptions = async (clerkAPIUrl: string): Promise
 
     export const middleware = (req, evt) => {
       const orgSyncOptions = req.headers.get("x-organization-sync-options")
-      return clerkMiddleware((auth, req) => {
-        if (isProtectedRoute(req) && !auth().userId) {
-          auth().redirectToSignIn()
+      return clerkMiddleware(async (auth, req) => {
+        if (isProtectedRoute(req) && !(await auth()).userId) {
+          (await auth()).redirectToSignIn()
         }
       }, {
         publishableKey: req.headers.get("x-publishable-key"),

diff --git a/packages/react/src/hooks/useAuth.ts b/packages/react/src/hooks/useAuth.ts
@@ -154,7 +154,7 @@ export const useAuth: UseAuth = (initialAuthState = {}) => {
 };
 
 export function useDerivedAuth(authObject: any): UseAuthReturn {
-  const { sessionId, userId, actor, orgId, orgSlug, orgRole, has, signOut, getToken } = authObject;
+  const { sessionId, userId, actor, orgId, orgSlug, orgRole, has, signOut, getToken } = authObject ?? {};
 
   if (sessionId === undefined && userId === undefined) {
     return {