fix(hermes,grpc-sdk,authentication): redirect requests not setting co…

…okies, invalid setCookies format (#514)
ConduitPlatform · Feb 13, 2023 · 453c956 · 453c956
1 parent 39a29ea
commit 453c956
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/libraries/grpc-sdk/src/routing/interfaces/types.ts b/libraries/grpc-sdk/src/routing/interfaces/types.ts
@@ -16,8 +16,8 @@ export type UnparsedRouterResponse =
   | {
       result?: Indexable;
       redirect?: string;
-      setCookies: Indexable;
-      removeCookies: Indexable;
+      setCookies: Cookies[];
+      removeCookies: Cookies[];
     }
   | Indexable
   | string;

diff --git a/libraries/hermes/src/Rest/Rest.ts b/libraries/hermes/src/Rest/Rest.ts
@@ -185,6 +185,17 @@ export class RestController extends ConduitRouter {
           }
         })
         .then((r: any) => {
+          if (r.setCookies && r.setCookies.length) {
+            r.setCookies.forEach((cookie: Cookie) => {
+              if (cookie.options.path === '') delete cookie.options.path;
+              res.cookie(cookie.name, cookie.value, cookie.options);
+            });
+          }
+          if (r.removeCookies && r.removeCookies.length) {
+            r.removeCookies.forEach((cookie: Cookie) => {
+              res.clearCookie(cookie.name, cookie.options);
+            });
+          }
           if (r.redirect) {
             res.removeHeader('Authorization');
             this._privateHeaders.forEach(h => res.removeHeader(h));
@@ -207,18 +218,8 @@ export class RestController extends ConduitRouter {
                 };
               }
             }
-            if (r.setCookies && r.setCookies.length) {
-              r.setCookies.forEach((cookie: Cookie) => {
-                if (cookie.options.path === '') delete cookie.options.path;
-                res.cookie(cookie.name, cookie.value, cookie.options);
-              });
-              delete result.setCookies;
-            }
-            if (r.removeCookies && r.removeCookies.length) {
-              r.removeCookies.forEach((cookie: Cookie) => {
-                res.clearCookie(cookie.name, cookie.options);
-              });
-            }
+            delete result.setCookies;
+            delete result.removeCookies;
             if (route.input.action === ConduitRouteActions.GET && caching) {
               this.storeInCache(hashKey, result, cacheAge!);
               res.setHeader('Cache-Control', `${scope}, max-age=${cacheAge}`);

diff --git a/modules/authentication/src/handlers/tokenProvider.ts b/modules/authentication/src/handlers/tokenProvider.ts
@@ -49,15 +49,15 @@ export class TokenProvider {
         }
         return {
           redirect: redirectUrlWithParams.toString(),
-          setCookies: cookies,
+          setCookies: Object.values(cookies).map(obj => obj),
         };
       } else {
         return {
           result: {
             accessToken: cookies.accessToken ?? undefined,
             refreshToken: cookies.refreshToken ? undefined : refreshToken?.token,
           },
-          setCookies: cookies,
+          setCookies: Object.values(cookies).map(obj => obj),
         };
       }
     }