Fix some return types (#100)

workos · Oct 4, 2024 · 5fd855c · 5fd855c
1 parent 7d71910
commit 5fd855c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@workos-inc/node": "7.26.0",
+    "@workos-inc/node": "7.27.4",
     "iron-session": "^8.0.1",
     "jose": "^5.2.3",
     "path-to-regexp": "^6.2.2"

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -29,6 +29,7 @@ export interface NoUserInfo {
   sessionId?: undefined;
   organizationId?: undefined;
   role?: undefined;
+  permissions?: undefined;
   impersonator?: undefined;
   accessToken?: undefined;
 }

diff --git a/src/session.ts b/src/session.ts
@@ -188,12 +188,12 @@ async function refreshSession({
 
   return {
     sessionId,
-    user: session.user,
+    user,
     organizationId,
     role,
     permissions,
-    impersonator: session.impersonator,
-    accessToken: session.accessToken,
+    impersonator,
+    accessToken,
   };
 }
 
@@ -278,12 +278,12 @@ async function getSessionFromCookie(response?: NextResponse) {
 /**
  * Retrieves the session from the cookie. Meant for use in the middleware, for client side use `withAuth` instead.
  *
- * @returns Session | undefined
+ * @returns UserInfo | NoUserInfo
  */
 async function getSession(response?: NextResponse) {
   const session = await getSessionFromCookie(response);
 
-  if (!session) return;
+  if (!session) return { user: null };
 
   if (await verifyAccessToken(session.accessToken)) {
     const { sid: sessionId, org_id: organizationId, role, permissions } = decodeJwt<AccessToken>(session.accessToken);