@zauru-sdk/utils 6.29.0 → 6.30.1

package/dist/esm/zauru/auth.loaders.js

@@ -1,5 +1,5 @@
 import { redirect } from "@remix-run/node";
-import { isOauthUserinfoUnauthorizedError } from "@zauru-sdk/common";
+import { ZAURU_OAUTH_REAUTH_COOKIE, hasZauruOauthReauthCookie, isOauthUserinfoUnauthorizedError, } from "@zauru-sdk/common";
 import { config } from "@zauru-sdk/config";
 import { commitSession, destroySession, getHeaders, getRefreshSession, getSession, loginWebApp, } from "@zauru-sdk/services";
 const loginErrorPayload = (description, title) => ({
@@ -27,16 +27,12 @@ const evaluateLoginAccess = async (extras, session, headers) => {
         return Response.json(loginErrorPayload(description));
     }
 };
-const OAUTH_REAUTH_COOKIE = "zauru_oauth_reauth";
 const authorizeUrl = (request) => {
     const url = new URL(request.url);
     const hostname = `${url.port ? "http://" : "https://"}${url.hostname}${url.port ? `:${url.port}` : ""}`;
     return `${config.oauthBaseURL}/dialog/authorize?client_id=${config.oauthClientID}&response_type=code&redirect_uri=${hostname}/login`;
 };
-const hasOauthReauthCookie = (request) => (request.headers.get("Cookie") ?? "")
-    .split(";")
-    .some((part) => part.trim() === `${OAUTH_REAUTH_COOKIE}=1`);
-const oauthReauthSetCookie = () => `${OAUTH_REAUTH_COOKIE}=1; Path=/; Max-Age=120; SameSite=Lax`;
+const oauthReauthSetCookie = () => `${ZAURU_OAUTH_REAUTH_COOKIE}=1; Path=/; Max-Age=120; SameSite=Lax`;
 const redirectOauthReauth = async (session) => {
     const headers = new Headers();
     headers.append("Set-Cookie", await destroySession(session));
@@ -92,7 +88,7 @@ export function createLoginAction(extras) {
         if (loginResponse.error || !loginResponse.data) {
             const userMsg = loginResponse.userMsg?.toString() ?? "";
             if (isOauthUserinfoUnauthorizedError(userMsg) &&
-                !hasOauthReauthCookie(request)) {
+                !hasZauruOauthReauthCookie(request.headers.get("Cookie"))) {
                 return redirectOauthReauth(session);
             }
             return Response.json(loginErrorPayload(userMsg));
@@ -139,11 +135,10 @@ export function createLogoutLoader(extras) {
         const url = new URL(args.request.url);
         if (url.searchParams.get("reauth") === "1") {
             const session = await getSession(args.request.headers.get("Cookie"));
-            return redirect("/login", {
-                headers: {
-                    "Set-Cookie": await destroySession(session),
-                },
-            });
+            const headers = new Headers();
+            headers.append("Set-Cookie", await destroySession(session));
+            headers.append("Set-Cookie", oauthReauthSetCookie());
+            return redirect("/login", { headers });
         }
         return guard(args);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/utils",
-  "version": "6.29.0",
+  "version": "6.30.1",
   "description": "Utilidades, parseo de request y demás para desarrollo de webapps de Zauru",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -71,12 +71,12 @@
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.1123.0",
     "@remix-run/node": "^2.8.1",
-    "@zauru-sdk/common": "^6.13.0",
+    "@zauru-sdk/common": "^6.14.1",
     "@zauru-sdk/config": "^6.0.0",
     "@zauru-sdk/graphql": "^6.9.1",
-    "@zauru-sdk/services": "^6.16.0",
-    "@zauru-sdk/types": "^6.29.0",
+    "@zauru-sdk/services": "^6.18.0",
+    "@zauru-sdk/types": "^6.30.0",
     "moment": "^2.30.1"
   },
-  "gitHead": "4355159e008ace641976ba4c5598fc3c7a8e8263"
+  "gitHead": "dc5f6e04a2c4254710cbd86cb7016beefd84b9be"
 }