cartethyia 2.5.2 → 2.5.3

package/src/console/share/share-router.ts

@@ -23,7 +23,6 @@ import type { ShareFamilyStats, ShareStatsPort } from "./share-stats";
 import { consoleSseResponse, createConsoleSseStream } from "../observability/sse";
 import { GatewayError, publicGatewayErrorBody } from "../../protocol/gateway-error";
 import {
-  hashShareToken,
   type ShareLinkPolicy,
   type ShareLinkRefusal,
   type ShareLinkStore,
@@ -224,7 +223,7 @@ async function resolveFamilyStats(
   stats: ShareStatsPort,
   token: string,
 ): Promise<ShareFamilyStats | null> {
-  const resolved = await shareStore.resolveShareLink(hashShareToken(token));
+  const resolved = await shareStore.resolveShareLink(token);
   if (resolved === null) return null;
   const templateId = resolved.key.id;
   const tenantId = resolved.key.tenantId;
@@ -267,8 +266,7 @@ export function createShareRouter(options: ShareRouterOptions): Elysia {
       if (typeof params.token !== "string") return notFound();
       const token = params.token;
       if (token.length < MIN_TOKEN_LENGTH) return notFound();
-      const tokenHash = hashShareToken(token);
-      const outcome = await shareStore.resolveShareLinkOutcome(tokenHash);
+      const outcome = await shareStore.resolveShareLinkOutcome(token);
       if (!outcome.ok) return notFound(outcome.refusal);
       const resolved = outcome.resolution;
       const row = resolved.key;
@@ -276,7 +274,7 @@ export function createShareRouter(options: ShareRouterOptions): Elysia {
       const clientIpKey = clientIp === null ? undefined : canonicalClientIpKey(clientIp);
       const models = await modelsForShare(db, row);
       const modelInfo = await modelInfoForShare(db, row, models);
-      void shareStore.touchView(tokenHash).catch(() => undefined);
+      void shareStore.touchView(token).catch(() => undefined);
       const policy = {
         name: row.name,
         keyPrefix: row.keyPrefix,
@@ -330,7 +328,7 @@ export function createShareRouter(options: ShareRouterOptions): Elysia {
       if (typeof params.token !== "string") return notFound();
       const token = params.token;
       if (token.length < MIN_TOKEN_LENGTH) return notFound();
-      const resolved = await shareStore.resolveShareLink(hashShareToken(token));
+      const resolved = await shareStore.resolveShareLink(token);
       const image = resolved?.key.sharePopupImage;
       const mime = resolved?.key.sharePopupImageMime;
       if (!image || !mime) return notFound();
@@ -355,8 +353,7 @@ export function createShareRouter(options: ShareRouterOptions): Elysia {
       if (clientIpKey === undefined)
         return json({ error: { code: "client_ip_invalid", message: "Client IP could not be normalized" } }, 400);
 
-      const tokenHash = hashShareToken(token);
-      const outcome = await shareStore.resolveShareLinkOutcome(tokenHash);
+      const outcome = await shareStore.resolveShareLinkOutcome(token);
       // A handoff link reveals an existing key; it never mints one.
       if (!outcome.ok) return notFound(outcome.refusal);
       const resolved = outcome.resolution;
@@ -374,7 +371,7 @@ export function createShareRouter(options: ShareRouterOptions): Elysia {
       }
       const template = resolved.key;
       const generated = generateApiKeySecret(resolveShareKeyPrefix(template.keyPrefix ?? undefined));
-      const issued = await shareStore.issueSharedApiKey(tokenHash, {
+      const issued = await shareStore.issueSharedApiKey(token, {
         keyHash: generated.hash,
         keyPrefix: generated.prefix,
         clientIp,