Merge pull request #156 from kinde-oss/peter/remove-user-cookie-depen…

…dency Peter/remove user cookie dependency
kinde-oss · Apr 30, 2024 · be4a4dc · be4a4dc
2 parents 6a515fb + 8e8f854
commit be4a4dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
   },
   "dependencies": {
     "@babel/preset-env": "^7.23.9",
-    "@kinde-oss/kinde-typescript-sdk": "^2.8.0",
+    "@kinde-oss/kinde-typescript-sdk": "2.9.0",
     "cookie": "^0.6.0",
     "crypto-js": "^4.1.1",
     "jwt-decode": "^3.1.2",

diff --git a/src/authMiddleware/authMiddleware.js b/src/authMiddleware/authMiddleware.js
@@ -61,6 +61,7 @@ const handleMiddleware = async (req, options, onSuccess) => {
   }
 
   const accessTokenValue = jwt_decode(req.cookies.get('access_token').value);
+  const idTokenValue = jwt_decode(req.cookies.get('id_token')?.value);
 
   const isAuthorized = options?.isAuthorized
     ? options.isAuthorized({req, token: accessTokenValue})
@@ -69,7 +70,13 @@ const handleMiddleware = async (req, options, onSuccess) => {
   if (isAuthorized && onSuccess) {
     return await onSuccess({
       token: accessTokenValue,
-      user: JSON.parse(req.cookies.get('user').value)
+      user: {
+        family_name: idTokenValue.family_name,
+        given_name: idTokenValue.given_name,
+        email: idTokenValue.email,
+        id: idTokenValue.sub,
+        picture: idTokenValue.picture
+      }
     });
   }
 

diff --git a/src/session/sessionManager.js b/src/session/sessionManager.js
@@ -175,12 +175,14 @@ export const pageRouterSessionManager = (req, res) => {
       ]);
     },
     destroySession: () => {
-      res?.setHeader('Set-Cookie', [ ...COOKIE_LIST.map((name) =>
-        cookie.serialize(name, '', {
-          domain: config.cookieDomain ? config.cookieDomain : undefined,
-          maxAge: -1,
-          ...GLOBAL_COOKIE_OPTIONS
-        }))
+      res?.setHeader('Set-Cookie', [
+        ...COOKIE_LIST.map((name) =>
+          cookie.serialize(name, '', {
+            domain: config.cookieDomain ? config.cookieDomain : undefined,
+            maxAge: -1,
+            ...GLOBAL_COOKIE_OPTIONS
+          })
+        )
       ]);
     }
   };

diff --git a/src/utils/removeTrailingSlash.js b/src/utils/removeTrailingSlash.js
@@ -1,5 +1,5 @@
 export function removeTrailingSlash(url) {
-  if (url === undefined) return url;
+  if (url === undefined || url === null) return undefined;
 
   url = url.trim();