@scalemule/news-publication 0.0.49 → 0.0.51

package/dist/pets-auth-server.js

@@ -1,12 +1,15 @@
-import { petPrivateHeaders, petRequest } from './chunk-ZXH3O537.js';
-import './chunk-MBBPEFDA.js';
+import { petPrivateHeaders, petRequest } from './chunk-ABPJMDUG.js';
+import './chunk-AFJ6S5WJ.js';
 import { createHmac, timingSafeEqual, createHash } from 'crypto';
 
 var PAW_SESSION_COOKIE = "__Host-paw-reader";
-var FLOW = "__Host-paw-signin";
+var PAW_FLOW_COOKIE = "__Host-paw-signin";
+var PAW_SIGNED_OUT_COOKIE = "__Host-paw-signed-out";
+var FLOW = PAW_FLOW_COOKIE;
 var attrs = "Path=/; HttpOnly; Secure; SameSite=Lax";
 function pawCookie(request, name = PAW_SESSION_COOKIE) {
-  return request.headers.get("cookie")?.split(";").map((v) => v.trim()).find((v) => v.startsWith(name + "="))?.slice(name.length + 1);
+  const values = (request.headers.get("cookie") || "").split(";").map((v) => v.trim()).filter((v) => v.startsWith(name + "="));
+  return values.length === 1 ? values[0].slice(name.length + 1) : void 0;
 }
 function digest(value) {
   return createHash("sha256").update(value).digest("hex");
@@ -55,6 +58,15 @@ function createPawAuthHandler(options) {
       const scope = await options.resolve(request), origin = new URL(scope.origin).origin;
       if (!origin.startsWith("https://") || !scope.apiKey)
         return json({ error: "Sign-in is not configured." }, 503);
+      const account = returnPath(options.accountPath || "/account");
+      const sessionCookie = options.sessionCookie || PAW_SESSION_COOKIE;
+      if (!/^[A-Za-z0-9_-]{1,100}$/.test(sessionCookie))
+        throw new Error("Invalid cookie name");
+      const retryPath = (path, reason) => {
+        const target = new URL(returnPath(path), origin);
+        target.searchParams.set("signin", reason);
+        return target.pathname + target.search;
+      };
       const redirect = (path) => new Response(null, {
         status: 303,
         headers: {
@@ -62,33 +74,60 @@ function createPawAuthHandler(options) {
           location: origin + returnPath(path)
         }
       });
-      if (action === "start" && request.method === "POST") {
-        if (request.headers.get("origin") !== origin)
+      const resuming = action === "resume" && request.method === "GET";
+      if (resuming || action === "start" && request.method === "POST") {
+        if (!resuming && request.headers.get("origin") !== origin || resuming && (request.headers.has("sec-fetch-mode") && request.headers.get("sec-fetch-mode") !== "navigate" || request.headers.has("sec-fetch-dest") && request.headers.get("sec-fetch-dest") !== "document"))
           return json({ error: "Sign in from this website." }, 403);
-        const callback = origin + "/api/paw-auth/callback";
+        const next = returnPath(
+          new URL(request.url).searchParams.get("next") || account
+        );
+        if (resuming && pawCookie(request, PAW_SIGNED_OUT_COOKIE))
+          return redirect(retryPath(next, "required"));
+        const callback = origin + returnPath(options.callbackPath || "/api/paw-auth/callback");
         const result = await petRequest(
           scope,
-          "/v1/auth/oauth/ledvery/authorize?" + new URLSearchParams({ redirect_uri: callback }),
+          "/v1/auth/oauth/ledvery/authorize?" + new URLSearchParams({
+            redirect_uri: callback,
+            ...resuming ? { prompt: "none" } : {}
+          }),
           {},
           options.fetch
         );
         const url = new URL(result.url);
-        if (url.origin !== new URL(options.issuerOrigin).origin || url.pathname !== "/authorize" || url.username || url.password || url.searchParams.get("state") !== result.state || url.searchParams.get("redirect_uri") !== callback || url.searchParams.get("code_challenge_method") !== "S256" || !url.searchParams.get("code_challenge"))
+        if (url.protocol !== "https:" || url.origin !== new URL(options.issuerOrigin).origin || url.pathname !== "/authorize" || url.username || url.password || url.searchParams.get("state") !== result.state || url.searchParams.get("redirect_uri") !== callback || url.searchParams.get("code_challenge_method") !== "S256" || !url.searchParams.get("code_challenge"))
           throw new Error("Invalid authorization response");
-        const response = json({ url: url.href });
+        const response = resuming ? new Response(null, {
+          status: 303,
+          headers: { ...petPrivateHeaders, location: url.href }
+        }) : json({ url: url.href });
+        if (!resuming)
+          response.headers.append(
+            "set-cookie",
+            `${PAW_SIGNED_OUT_COOKIE}=; ${attrs}; Max-Age=0`
+          );
         response.headers.append(
           "set-cookie",
-          `${FLOW}=${sealPawFlow(result.state, returnPath(new URL(request.url).searchParams.get("next")), scope.apiKey)}; ${attrs}; Max-Age=600`
+          `${FLOW}=${sealPawFlow(result.state, next, scope.apiKey)}; ${attrs}; Max-Age=600`
         );
         return response;
       }
       if (action === "callback" && request.method === "GET") {
         const query = new URL(request.url).searchParams, code = query.get("code"), state = query.get("state");
         const next = openPawFlow(pawCookie(request, FLOW), state, scope.apiKey);
-        const response = redirect(next || "/account?signin=retry");
+        const response = redirect(next || retryPath(account, "retry"));
         response.headers.append("set-cookie", `${FLOW}=; ${attrs}; Max-Age=0`);
-        if (!next || !code || code.length > 4096 || query.has("error"))
+        if (!next || !code || code.length > 4096 || query.has("error")) {
+          response.headers.set(
+            "location",
+            origin + retryPath(
+              next || account,
+              ["login_required", "consent_required"].includes(
+                query.get("error") || ""
+              ) ? "required" : "retry"
+            )
+          );
           return response;
+        }
         try {
           const session = await petRequest(
             scope,
@@ -109,11 +148,11 @@ function createPawAuthHandler(options) {
             throw new Error("Verified reader required");
           response.headers.append(
             "set-cookie",
-            `${PAW_SESSION_COOKIE}=${session.session_token}; ${attrs}; Expires=${new Date(expiry).toUTCString()}`
+            `${sessionCookie}=${session.session_token}; ${attrs}; Expires=${new Date(expiry).toUTCString()}`
           );
           return response;
         } catch {
-          response.headers.set("location", origin + "/account?signin=retry");
+          response.headers.set("location", origin + retryPath(next, "retry"));
           return response;
         }
       }
@@ -138,7 +177,11 @@ function createPawAuthHandler(options) {
         const response = json({ authenticated: false });
         response.headers.append(
           "set-cookie",
-          `${PAW_SESSION_COOKIE}=; ${attrs}; Max-Age=0`
+          `${sessionCookie}=; ${attrs}; Max-Age=0`
+        );
+        response.headers.append(
+          "set-cookie",
+          `${PAW_SIGNED_OUT_COOKIE}=1; ${attrs}; Max-Age=2592000`
         );
         return response;
       }
@@ -152,4 +195,4 @@ function createPawAuthHandler(options) {
   };
 }
 
-export { PAW_SESSION_COOKIE, createPawAuthHandler, openPawFlow, pawCookie, sealPawFlow };
+export { PAW_FLOW_COOKIE, PAW_SESSION_COOKIE, PAW_SIGNED_OUT_COOKIE, createPawAuthHandler, openPawFlow, pawCookie, sealPawFlow };

package/dist/pets-forms.cjs

@@ -120,6 +120,7 @@ function PetSubmissionForm({
   initial,
   defaultCommunity,
   apiPath = "/api/pets",
+  accountUrl = "/account",
   onSaved
 }) {
   const [deviceReady, setDeviceReady] = react.useState(false);
@@ -232,7 +233,7 @@ function PetSubmissionForm({
       /* @__PURE__ */ jsxRuntime.jsx(PawMark, { size: 56 }),
       /* @__PURE__ */ jsxRuntime.jsx("h1", { children: kind === "profile" && visibility === "private" ? "A little home for your pet." : "Your story is in good hands." }),
       /* @__PURE__ */ jsxRuntime.jsx("p", { children: kind === "profile" && visibility === "private" ? "Your profile is saved privately. Only you can see it." : "Your contribution is saved for editorial review. It will appear publicly only after approval." }),
-      /* @__PURE__ */ jsxRuntime.jsx("a", { href: "/account", children: "View your pets and submissions" })
+      /* @__PURE__ */ jsxRuntime.jsx("a", { href: accountUrl, children: "View your pets and submissions" })
     ] });
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "form",
@@ -308,7 +309,9 @@ function PetSubmissionForm({
                       source: content.source,
                       event: content.event
                     });
-                    setCommunity(p.area_id);
+                    setCommunity(
+                      communities.some((c) => c.id === p.area_id) ? p.area_id : defaultCommunity || ""
+                    );
                   }
                 },
                 children: [
@@ -727,7 +730,8 @@ function PetSubmissionForm({
 }
 function PetOwnerActions({
   resource,
-  apiPath = "/api/pets"
+  apiPath = "/api/pets",
+  submitUrl = "/submit"
 }) {
   const [error, setError] = react.useState(""), [confirm, setConfirm] = react.useState(false), [busy, setBusy] = react.useState(false);
   async function act(action) {
@@ -746,7 +750,7 @@ function PetOwnerActions({
     }
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "paw-form-actions", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("a", { href: `/submit?edit=${resource.id}`, children: "Edit details or privacy" }),
+    /* @__PURE__ */ jsxRuntime.jsx("a", { href: `${submitUrl}?edit=${resource.id}`, children: "Edit details or privacy" }),
     ["lost", "found"].includes(resource.kind) && !resource.reunited_at && /* @__PURE__ */ jsxRuntime.jsx("button", { disabled: busy, onClick: () => void act("reunited"), children: "Mark reunited" }),
     confirm ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsx("span", { children: "Remove this contribution and its public photographs?" }),

package/dist/pets-forms.d.cts

@@ -9,18 +9,20 @@ type Policy = {
 declare function PetSignIn({ returnTo }: {
     returnTo?: string;
 }): React__default.JSX.Element;
-declare function PetSubmissionForm({ communities, policy, profiles, initial, defaultCommunity, apiPath, onSaved, }: {
+declare function PetSubmissionForm({ communities, policy, profiles, initial, defaultCommunity, apiPath, accountUrl, onSaved, }: {
     communities: PetCommunity[];
     policy: Policy;
     profiles?: OwnPetResource[];
     initial?: OwnPetResource;
     defaultCommunity?: string;
     apiPath?: string;
+    accountUrl?: string;
     onSaved?: (id: string) => void;
 }): React__default.JSX.Element;
-declare function PetOwnerActions({ resource, apiPath, }: {
+declare function PetOwnerActions({ resource, apiPath, submitUrl, }: {
     resource: OwnPetResource;
     apiPath?: string;
+    submitUrl?: string;
 }): React__default.JSX.Element;
 
 export { PetOwnerActions, PetSignIn, PetSubmissionForm };

package/dist/pets-forms.d.ts

@@ -9,18 +9,20 @@ type Policy = {
 declare function PetSignIn({ returnTo }: {
     returnTo?: string;
 }): React__default.JSX.Element;
-declare function PetSubmissionForm({ communities, policy, profiles, initial, defaultCommunity, apiPath, onSaved, }: {
+declare function PetSubmissionForm({ communities, policy, profiles, initial, defaultCommunity, apiPath, accountUrl, onSaved, }: {
     communities: PetCommunity[];
     policy: Policy;
     profiles?: OwnPetResource[];
     initial?: OwnPetResource;
     defaultCommunity?: string;
     apiPath?: string;
+    accountUrl?: string;
     onSaved?: (id: string) => void;
 }): React__default.JSX.Element;
-declare function PetOwnerActions({ resource, apiPath, }: {
+declare function PetOwnerActions({ resource, apiPath, submitUrl, }: {
     resource: OwnPetResource;
     apiPath?: string;
+    submitUrl?: string;
 }): React__default.JSX.Element;
 
 export { PetOwnerActions, PetSignIn, PetSubmissionForm };

package/dist/pets-forms.js

@@ -1,8 +1,8 @@
 "use client";
-import { PawMark } from './chunk-TTLM7YOH.js';
+import { PawMark } from './chunk-QW3OZB22.js';
 import './chunk-4JRWZXAP.js';
 import './chunk-66GI2IX6.js';
-import { PET_PHOTO_CATEGORIES, PET_CELEBRATIONS, PET_SAFETY } from './chunk-MBBPEFDA.js';
+import { PET_PHOTO_CATEGORIES, PET_CELEBRATIONS, PET_SAFETY } from './chunk-AFJ6S5WJ.js';
 import { useState, useEffect, useRef } from 'react';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 
@@ -72,6 +72,7 @@ function PetSubmissionForm({
   initial,
   defaultCommunity,
   apiPath = "/api/pets",
+  accountUrl = "/account",
   onSaved
 }) {
   const [deviceReady, setDeviceReady] = useState(false);
@@ -184,7 +185,7 @@ function PetSubmissionForm({
       /* @__PURE__ */ jsx(PawMark, { size: 56 }),
       /* @__PURE__ */ jsx("h1", { children: kind === "profile" && visibility === "private" ? "A little home for your pet." : "Your story is in good hands." }),
       /* @__PURE__ */ jsx("p", { children: kind === "profile" && visibility === "private" ? "Your profile is saved privately. Only you can see it." : "Your contribution is saved for editorial review. It will appear publicly only after approval." }),
-      /* @__PURE__ */ jsx("a", { href: "/account", children: "View your pets and submissions" })
+      /* @__PURE__ */ jsx("a", { href: accountUrl, children: "View your pets and submissions" })
     ] });
   return /* @__PURE__ */ jsxs(
     "form",
@@ -260,7 +261,9 @@ function PetSubmissionForm({
                       source: content.source,
                       event: content.event
                     });
-                    setCommunity(p.area_id);
+                    setCommunity(
+                      communities.some((c) => c.id === p.area_id) ? p.area_id : defaultCommunity || ""
+                    );
                   }
                 },
                 children: [
@@ -679,7 +682,8 @@ function PetSubmissionForm({
 }
 function PetOwnerActions({
   resource,
-  apiPath = "/api/pets"
+  apiPath = "/api/pets",
+  submitUrl = "/submit"
 }) {
   const [error, setError] = useState(""), [confirm, setConfirm] = useState(false), [busy, setBusy] = useState(false);
   async function act(action) {
@@ -698,7 +702,7 @@ function PetOwnerActions({
     }
   }
   return /* @__PURE__ */ jsxs("div", { className: "paw-form-actions", children: [
-    /* @__PURE__ */ jsx("a", { href: `/submit?edit=${resource.id}`, children: "Edit details or privacy" }),
+    /* @__PURE__ */ jsx("a", { href: `${submitUrl}?edit=${resource.id}`, children: "Edit details or privacy" }),
     ["lost", "found"].includes(resource.kind) && !resource.reunited_at && /* @__PURE__ */ jsx("button", { disabled: busy, onClick: () => void act("reunited"), children: "Mark reunited" }),
     confirm ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx("span", { children: "Remove this contribution and its public photographs?" }),

package/dist/pets-interactions.cjs

@@ -27,7 +27,7 @@ async function request(path, method = "GET", body) {
     );
   return value.data ?? value;
 }
-function PetSignOut() {
+function PetSignOut({ returnTo = "/" }) {
   const [error, setError] = react.useState("");
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -36,12 +36,12 @@ function PetSignOut() {
         onClick: async () => {
           try {
             await request("/api/paw-auth/logout", "POST");
-            window.location.assign("/");
+            window.location.assign(returnTo);
           } catch {
             setError("Sign-out could not be completed. Please try again.");
           }
         },
-        children: "Sign out"
+        children: "Sign out of this site"
       }
     ),
     error && /* @__PURE__ */ jsxRuntime.jsx("p", { role: "alert", children: error })
@@ -196,7 +196,8 @@ function PetPreferencesForm({
 function PetResourceActions({
   resource,
   signedIn,
-  apiPath = "/api/pets"
+  apiPath = "/api/pets",
+  accountUrl = "/account"
 }) {
   const [active, setActive] = react.useState(false), [reporting, setReporting] = react.useState(false), [message, setMessage] = react.useState(""), [busy, setBusy] = react.useState(false);
   const reportKey = react.useRef("");
@@ -318,7 +319,7 @@ function PetResourceActions({
     ) : /* @__PURE__ */ jsxRuntime.jsx("p", { children: /* @__PURE__ */ jsxRuntime.jsx(
       "a",
       {
-        href: "/account?next=" + encodeURIComponent(`/pets/${resource.id}`),
+        href: accountUrl + "?next=" + encodeURIComponent(`/pets/${resource.id}`),
         children: "Sign in to send a private report."
       }
     ) })),

package/dist/pets-interactions.d.cts

@@ -1,7 +1,9 @@
 import React__default from 'react';
 import { PetPreferenceRecord, PetCommunity, PetResource } from './pets.cjs';
 
-declare function PetSignOut(): React__default.JSX.Element;
+declare function PetSignOut({ returnTo }: {
+    returnTo?: string;
+}): React__default.JSX.Element;
 declare function PetCommunityMemory({ selected, signedIn, }: {
     selected?: string | null;
     signedIn: boolean;
@@ -11,10 +13,11 @@ declare function PetPreferencesForm({ record, communities, notificationsReady, }
     communities: PetCommunity[];
     notificationsReady?: boolean;
 }): React__default.JSX.Element;
-declare function PetResourceActions({ resource, signedIn, apiPath, }: {
+declare function PetResourceActions({ resource, signedIn, apiPath, accountUrl, }: {
     resource: PetResource;
     signedIn: boolean;
     apiPath?: string;
+    accountUrl?: string;
 }): React__default.JSX.Element;
 
 export { PetCommunityMemory, PetPreferencesForm, PetResourceActions, PetSignOut };

package/dist/pets-interactions.d.ts

@@ -1,7 +1,9 @@
 import React__default from 'react';
 import { PetPreferenceRecord, PetCommunity, PetResource } from './pets.js';
 
-declare function PetSignOut(): React__default.JSX.Element;
+declare function PetSignOut({ returnTo }: {
+    returnTo?: string;
+}): React__default.JSX.Element;
 declare function PetCommunityMemory({ selected, signedIn, }: {
     selected?: string | null;
     signedIn: boolean;
@@ -11,10 +13,11 @@ declare function PetPreferencesForm({ record, communities, notificationsReady, }
     communities: PetCommunity[];
     notificationsReady?: boolean;
 }): React__default.JSX.Element;
-declare function PetResourceActions({ resource, signedIn, apiPath, }: {
+declare function PetResourceActions({ resource, signedIn, apiPath, accountUrl, }: {
     resource: PetResource;
     signedIn: boolean;
     apiPath?: string;
+    accountUrl?: string;
 }): React__default.JSX.Element;
 
 export { PetCommunityMemory, PetPreferencesForm, PetResourceActions, PetSignOut };

package/dist/pets-interactions.js

@@ -1,5 +1,5 @@
 "use client";
-import { PET_NOTIFICATION_CATEGORIES } from './chunk-MBBPEFDA.js';
+import { PET_NOTIFICATION_CATEGORIES } from './chunk-AFJ6S5WJ.js';
 import { useState, useEffect, useRef } from 'react';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
@@ -17,7 +17,7 @@ async function request(path, method = "GET", body) {
     );
   return value.data ?? value;
 }
-function PetSignOut() {
+function PetSignOut({ returnTo = "/" }) {
   const [error, setError] = useState("");
   return /* @__PURE__ */ jsxs("div", { children: [
     /* @__PURE__ */ jsx(
@@ -26,12 +26,12 @@ function PetSignOut() {
         onClick: async () => {
           try {
             await request("/api/paw-auth/logout", "POST");
-            window.location.assign("/");
+            window.location.assign(returnTo);
           } catch {
             setError("Sign-out could not be completed. Please try again.");
           }
         },
-        children: "Sign out"
+        children: "Sign out of this site"
       }
     ),
     error && /* @__PURE__ */ jsx("p", { role: "alert", children: error })
@@ -186,7 +186,8 @@ function PetPreferencesForm({
 function PetResourceActions({
   resource,
   signedIn,
-  apiPath = "/api/pets"
+  apiPath = "/api/pets",
+  accountUrl = "/account"
 }) {
   const [active, setActive] = useState(false), [reporting, setReporting] = useState(false), [message, setMessage] = useState(""), [busy, setBusy] = useState(false);
   const reportKey = useRef("");
@@ -308,7 +309,7 @@ function PetResourceActions({
     ) : /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx(
       "a",
       {
-        href: "/account?next=" + encodeURIComponent(`/pets/${resource.id}`),
+        href: accountUrl + "?next=" + encodeURIComponent(`/pets/${resource.id}`),
         children: "Sign in to send a private report."
       }
     ) })),