effortless-aws 0.28.0 → 0.30.0

package/dist/{chunk-EZG3NX42.js → chunk-ISJC6CHC.js}

@@ -280,10 +280,7 @@ var createAuthRuntime = (secret, defaultExpiresIn, apiTokenVerify, apiTokenHeade
     return headerValue;
   };
   const buildHelpers = (sessionData) => ({
-    createSession(...args) {
-      const hasData = args.length > 0 && (typeof args[0] === "object" && args[0] !== null && !("expiresIn" in args[0]));
-      const data = hasData ? args[0] : void 0;
-      const options = hasData ? args[1] : args[0];
+    createSession(data, options) {
       const seconds = options?.expiresIn ? toSeconds(options.expiresIn) : defaultExpiresIn;
       const exp = Math.floor(Date.now() / 1e3) + seconds;
       const payload = Buffer.from(JSON.stringify({ exp, ...data }), "utf-8").toString("base64url");
@@ -308,7 +305,7 @@ var createAuthRuntime = (secret, defaultExpiresIn, apiTokenVerify, apiTokenHeade
     session: sessionData
   });
   return {
-    async forRequest(cookieValue, authHeader, deps) {
+    async forRequest(cookieValue, authHeader) {
       if (authHeader && apiTokenVerify) {
         const tokenValue = extractTokenValue(authHeader);
         if (tokenCache) {
@@ -317,7 +314,7 @@ var createAuthRuntime = (secret, defaultExpiresIn, apiTokenVerify, apiTokenHeade
             return buildHelpers(cached.session);
           }
         }
-        const session = await apiTokenVerify(tokenValue, { deps });
+        const session = await apiTokenVerify({ value: tokenValue });
         if (tokenCache && apiTokenCacheTtlSeconds) {
           tokenCache.set(tokenValue, { session, expiresAt: Date.now() + apiTokenCacheTtlSeconds * 1e3 });
         }
@@ -501,7 +498,6 @@ var getParameters = async (names) => {
 // src/runtime/handler-utils.ts
 var ENV_DEP_PREFIX = "EFF_DEP_";
 var ENV_PARAM_PREFIX = "EFF_PARAM_";
-var ENV_AUTH_SECRET = "EFF_AUTH_SECRET";
 var LOG_RANK = { error: 0, info: 1, debug: 2 };
 var truncate = (value, maxLength = 4096) => {
   if (value === void 0 || value === null) return value;
@@ -577,23 +573,25 @@ var createHandlerRuntime = (handler, handlerType, logLevel = "info", extraSetupA
     resolvedParams = await buildParams(handler.config);
     return resolvedParams;
   };
-  const getAuthRuntime = async () => {
+  const getAuthRuntime = async (setupCtx) => {
     if (resolvedAuthRuntime !== null) return resolvedAuthRuntime;
-    const ssmPath = process.env[ENV_AUTH_SECRET];
-    if (!ssmPath || !handler.auth) {
+    const authOpts = setupCtx && typeof setupCtx === "object" && "auth" in setupCtx ? setupCtx.auth : void 0;
+    if (!authOpts?.secret) {
       resolvedAuthRuntime = void 0;
       return void 0;
     }
-    const values = await getParameters([ssmPath]);
-    const secret = values.get(ssmPath);
-    if (!secret) throw new Error(`Auth secret not found at ${ssmPath}`);
-    const defaultExpires = handler.auth.expiresIn ? toSeconds(handler.auth.expiresIn) : 604800;
-    const cacheTtlSeconds = handler.apiToken?.cacheTtl ? toSeconds(handler.apiToken.cacheTtl) : void 0;
+    const secret = authOpts.secret;
+    resolvedAuthHeaderName = authOpts.apiToken?.header;
+    const defaultExpires = authOpts.expiresIn ? toSeconds(authOpts.expiresIn) : 604800;
+    const apiToken = authOpts.apiToken;
+    const cacheTtlSeconds = apiToken?.cacheTtl ? toSeconds(apiToken.cacheTtl) : void 0;
+    const rawVerify = apiToken?.verify;
+    const wrappedVerify = rawVerify ? (args) => rawVerify(args.value) : void 0;
     resolvedAuthRuntime = createAuthRuntime(
       secret,
       defaultExpires,
-      handler.apiToken?.verify,
-      handler.apiToken?.header,
+      wrappedVerify,
+      apiToken?.header,
       cacheTtlSeconds
     );
     return resolvedAuthRuntime;
@@ -603,7 +601,7 @@ var createHandlerRuntime = (handler, handlerType, logLevel = "info", extraSetupA
     if (handler.setup) {
       const params = await getParams();
       const deps = getDeps();
-      const args = {};
+      const args = { enableAuth: (opts) => opts };
       if (params) args.config = params;
       if (deps) args.deps = deps;
       if (handler.static) args.files = staticFiles;
@@ -612,7 +610,8 @@ var createHandlerRuntime = (handler, handlerType, logLevel = "info", extraSetupA
     }
     return ctx;
   };
-  const commonArgs = async (cookieValue, authHeader) => {
+  let resolvedAuthHeaderName;
+  const commonArgs = async (cookieValue, authHeader, headers) => {
     const args = {};
     if (handler.setup) args.ctx = await getSetup();
     const deps = getDeps();
@@ -620,9 +619,13 @@ var createHandlerRuntime = (handler, handlerType, logLevel = "info", extraSetupA
     const params = await getParams();
     if (params) args.config = params;
     if (handler.static) args.files = staticFiles;
-    const authRuntime = await getAuthRuntime();
+    const authRuntime = await getAuthRuntime(args.ctx);
     if (authRuntime) {
-      args.auth = await authRuntime.forRequest(cookieValue, authHeader, deps);
+      let finalAuthHeader = authHeader;
+      if (finalAuthHeader === void 0 && headers && resolvedAuthHeaderName) {
+        finalAuthHeader = headers[resolvedAuthHeaderName] ?? headers[resolvedAuthHeaderName.toLowerCase()] ?? void 0;
+      }
+      args.auth = await authRuntime.forRequest(cookieValue, finalAuthHeader);
     }
     return args;
   };