@redmix/auth-dbauth-api 0.0.1 → 9.0.0-canary.518

package/dist/DbAuthHandler.js

@@ -121,7 +121,7 @@ class DbAuthHandler {
     deleteHeaders.append(
       "set-cookie",
       [
-        `${(0, import_shared.cookieName)(this.options.cookie?.name)}=`,
+        `${(0, import_shared.generateCookieName)(this.options.cookie?.name)}=`,
         ...this._cookieAttributes({ expires: "now" })
       ].join(";")
     );
@@ -690,7 +690,7 @@ class DbAuthHandler {
     const session = JSON.stringify(data) + ";" + csrfToken;
     const encrypted = (0, import_shared.encryptSession)(session);
     const sessionCookieString = [
-      `${(0, import_shared.cookieName)(this.options.cookie?.name)}=${encrypted}`,
+      `${(0, import_shared.generateCookieName)(this.options.cookie?.name)}=${encrypted}`,
       ...this._cookieAttributes({ expires: this.sessionExpiresDate })
     ].join(";");
     return sessionCookieString;

package/dist/decoder.d.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@redmix/api';
-export declare const createAuthDecoder: (cookieNameOption: string) => Decoder;
+export declare const createAuthDecoder: (cookieNameTemplate: string) => Decoder;
 /** @deprecated use `createAuthDecoder` */
 export declare const authDecoder: Decoder;
 //# sourceMappingURL=decoder.d.ts.map

package/dist/decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../src/decoder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,eAAO,MAAM,iBAAiB,qBAAsB,MAAM,KAAG,OAW5D,CAAA;AAED,0CAA0C;AAC1C,eAAO,MAAM,WAAW,EAAE,OAezB,CAAA"}
+{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../src/decoder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,eAAO,MAAM,iBAAiB,uBAAwB,MAAM,KAAG,OAW9D,CAAA;AAED,0CAA0C;AAC1C,eAAO,MAAM,WAAW,EAAE,OAezB,CAAA"}

package/dist/decoder.js

@@ -23,12 +23,12 @@ __export(decoder_exports, {
 });
 module.exports = __toCommonJS(decoder_exports);
 var import_shared = require("./shared");
-const createAuthDecoder = (cookieNameOption) => {
+const createAuthDecoder = (cookieNameTemplate) => {
   return async (_token, type, req) => {
     if (type !== "dbAuth") {
       return null;
     }
-    const session = (0, import_shared.dbAuthSession)(req.event, cookieNameOption);
+    const session = (0, import_shared.dbAuthSession)(req.event, cookieNameTemplate);
     return session;
   };
 };

package/dist/shared.d.ts

@@ -13,8 +13,8 @@ export declare const extractCookie: (event: APIGatewayProxyEvent | Request) => a
 export declare const isLegacySession: (text: string | undefined) => boolean;
 export declare const decryptSession: (text: string | null) => any[];
 export declare const encryptSession: (dataString: string) => string;
-export declare const getSession: (text: string | undefined, cookieNameOption: string | undefined) => string | null;
-export declare const dbAuthSession: (event: APIGatewayProxyEvent | Request, cookieNameOption: string | undefined) => any;
+export declare const getSession: (text: string | undefined, cookieNameTemplate: string | undefined) => string | null;
+export declare const dbAuthSession: (event: APIGatewayProxyEvent | Request, cookieNameTemplate: string | undefined) => any;
 export declare const webAuthnSession: (event: APIGatewayProxyEvent | Request) => any;
 export declare const hashToken: (token: string) => string;
 export declare const hashPassword: (text: string, { salt, options, }?: {
@@ -22,7 +22,7 @@ export declare const hashPassword: (text: string, { salt, options, }?: {
     options?: ScryptOptions;
 }) => string[];
 export declare const legacyHashPassword: (text: string, salt?: string) => string[];
-export declare const cookieName: (name: string | undefined) => string;
+export declare function generateCookieName(template: string | undefined): string;
 /**
  * Returns a builder for a lambda response
  *

package/dist/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AA8ED,eAAO,MAAM,aAAa,UAAW,oBAAoB,GAAG,OAAO,QAElE,CAAA;AAGD,eAAO,MAAM,eAAe,SAAU,MAAM,GAAG,SAAS,YAOvD,CAAA;AAGD,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,UAiCjD,CAAA;AAED,eAAO,MAAM,cAAc,eAAgB,MAAM,WAWhD,CAAA;AAGD,eAAO,MAAM,UAAU,SACf,MAAM,GAAG,SAAS,oBACN,MAAM,GAAG,SAAS,kBAgBrC,CAAA;AAKD,eAAO,MAAM,aAAa,UACjB,oBAAoB,GAAG,OAAO,oBACnB,MAAM,GAAG,SAAS,QAarC,CAAA;AAED,eAAO,MAAM,eAAe,UAAW,oBAAoB,GAAG,OAAO,QAgBpE,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,MAAM,WAEtC,CAAA;AAMD,eAAO,MAAM,YAAY,SACjB,MAAM,uBAIT;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,aAW9C,CAAA;AAID,eAAO,MAAM,kBAAkB,SAAU,MAAM,SAAS,MAAM,aAM7D,CAAA;AAED,eAAO,MAAM,UAAU,SAAU,MAAM,GAAG,SAAS,WAKlD,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,oBAAoB,GAAG,OAAO,cAGzB;IACR,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,eACY,WAAW;gBAQV,MAAM;aACT,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;wBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;WACrC,MAAM;EA2BlB;AAYD,eAAO,MAAM,qBAAqB,SAAU,MAAM,KAAG,aAYpD,CAAA"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAM9C,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AA8ED,eAAO,MAAM,aAAa,UAAW,oBAAoB,GAAG,OAAO,QAElE,CAAA;AAGD,eAAO,MAAM,eAAe,SAAU,MAAM,GAAG,SAAS,YAOvD,CAAA;AAGD,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,UAiCjD,CAAA;AAED,eAAO,MAAM,cAAc,eAAgB,MAAM,WAWhD,CAAA;AAGD,eAAO,MAAM,UAAU,SACf,MAAM,GAAG,SAAS,sBACJ,MAAM,GAAG,SAAS,kBAkBvC,CAAA;AAKD,eAAO,MAAM,aAAa,UACjB,oBAAoB,GAAG,OAAO,sBACjB,MAAM,GAAG,SAAS,QAavC,CAAA;AAED,eAAO,MAAM,eAAe,UAAW,oBAAoB,GAAG,OAAO,QAgBpE,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,MAAM,WAEtC,CAAA;AAMD,eAAO,MAAM,YAAY,SACjB,MAAM,uBAIT;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,aAW9C,CAAA;AAID,eAAO,MAAM,kBAAkB,SAAU,MAAM,SAAS,MAAM,aAM7D,CAAA;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,UAK9D;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,oBAAoB,GAAG,OAAO,cAGzB;IACR,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,eACY,WAAW;gBAQV,MAAM;aACT,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;wBACtB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;WACrC,MAAM;EA2BlB;AAYD,eAAO,MAAM,qBAAqB,SAAU,MAAM,KAAG,aAYpD,CAAA"}

package/dist/shared.js

@@ -28,12 +28,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var shared_exports = {};
 __export(shared_exports, {
-  cookieName: () => cookieName,
   dbAuthSession: () => dbAuthSession,
   decryptSession: () => decryptSession,
   encryptSession: () => encryptSession,
   extractCookie: () => extractCookie,
   extractHashingOptions: () => extractHashingOptions,
+  generateCookieName: () => generateCookieName,
   getDbAuthResponseBuilder: () => getDbAuthResponseBuilder,
   getSession: () => getSession,
   hashPassword: () => hashPassword,
@@ -145,26 +145,27 @@ const encryptSession = (dataString) => {
   encryptedData += cipher.final("base64");
   return `${encryptedData}|${iv.toString("base64")}`;
 };
-const getSession = (text, cookieNameOption) => {
+const getSession = (text, cookieNameTemplate) => {
   if (typeof text === "undefined" || text === null) {
     return null;
   }
+  const cookieName = generateCookieName(cookieNameTemplate);
   const cookies = text.split(";");
   const sessionCookie = cookies.find((cookie) => {
-    return cookie.split("=")[0].trim() === cookieName(cookieNameOption);
+    return cookie.split("=")[0].trim() === cookieName;
   });
-  if (!sessionCookie || sessionCookie === `${cookieName(cookieNameOption)}=`) {
+  if (!sessionCookie || sessionCookie === `${cookieName}=`) {
     return null;
   }
-  return sessionCookie.replace(`${cookieName(cookieNameOption)}=`, "").trim();
+  return sessionCookie.replace(`${cookieName}=`, "").trim();
 };
-const dbAuthSession = (event, cookieNameOption) => {
+const dbAuthSession = (event, cookieNameTemplate) => {
   const sessionCookie = extractCookie(event);
   if (!sessionCookie) {
     return null;
   }
   const [session, _csrfToken] = decryptSession(
-    getSession(sessionCookie, cookieNameOption)
+    getSession(sessionCookie, cookieNameTemplate)
   );
   return session;
 };
@@ -203,11 +204,11 @@ const legacyHashPassword = (text, salt) => {
     useSalt
   ];
 };
-const cookieName = (name) => {
+function generateCookieName(template) {
   const port = getPort();
-  const cookieName2 = name?.replace("%port%", "" + port) ?? "session";
-  return cookieName2;
-};
+  const cookieName = template?.replace("%port%", "" + port) ?? "session";
+  return cookieName;
+}
 function getDbAuthResponseBuilder(event) {
   return (response, corsHeaders) => {
     const headers = {
@@ -252,12 +253,12 @@ const extractHashingOptions = (text) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  cookieName,
   dbAuthSession,
   decryptSession,
   encryptSession,
   extractCookie,
   extractHashingOptions,
+  generateCookieName,
   getDbAuthResponseBuilder,
   getSession,
   hashPassword,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redmix/auth-dbauth-api",
-  "version": "0.0.1",
+  "version": "9.0.0-canary.518+f9439a7a6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redmix-run/redmix.git",
@@ -57,15 +57,15 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@redmix/project-config": "0.0.1",
+    "@redmix/project-config": "9.0.0-canary.518",
     "base64url": "3.0.1",
     "md5": "2.3.0",
     "uuid": "10.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.16.4",
-    "@redmix/api": "0.0.1",
-    "@redmix/framework-tools": "0.0.1",
+    "@redmix/api": "9.0.0-canary.518",
+    "@redmix/framework-tools": "9.0.0-canary.518",
     "@simplewebauthn/server": "7.4.0",
     "@types/md5": "2.3.5",
     "@types/uuid": "10.0.0",
@@ -75,8 +75,5 @@
     "typescript": "5.6.2",
     "vitest": "2.1.9"
   },
-  "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "688027c97502c500ebbede9cdc7cc51545a8dcf3"
+  "gitHead": "f9439a7a6478e5c522bda13a779f323b2b714f3a"
 }