@digilogiclabs/platform-core 1.15.0 → 1.17.0

package/dist/auth.mjs

@@ -1482,6 +1482,11 @@ function createSecureHandlerFactory(factoryConfig) {
       let session = null;
       let isAdmin = false;
       let isLegacyToken = false;
+      let timedAudit;
+      const auditCfg = routeConfig.audit;
+      const resolvedAuditAction = typeof auditCfg === "object" && auditCfg !== null ? auditCfg.action : auditCfg;
+      const resolvedAuditResource = typeof auditCfg === "object" && auditCfg !== null ? auditCfg.resource : routeConfig.auditResource;
+      const resolvedGetResourceId = typeof auditCfg === "object" && auditCfg !== null ? auditCfg.getResourceId : routeConfig.getResourceId;
       try {
         if (routeConfig.requireAuth || routeConfig.requireAdmin || routeConfig.requireRoles?.length) {
           session = await factoryConfig.getSession();
@@ -1549,27 +1554,57 @@ function createSecureHandlerFactory(factoryConfig) {
           }
           validated = result.data;
         }
+        const actorId = isLegacyToken ? "admin_token" : session?.user?.id || "anonymous";
+        const actorType = isLegacyToken ? "admin" : "user";
+        const actorEmail = session?.user?.email ?? void 0;
+        const resourceId = resolvedGetResourceId ? resolvedGetResourceId(
+          request,
+          params,
+          validated
+        ) : void 0;
+        if (resolvedAuditAction && factoryConfig.createTimedAudit) {
+          timedAudit = factoryConfig.createTimedAudit(
+            {
+              action: resolvedAuditAction,
+              resource: resolvedAuditResource ? {
+                type: resolvedAuditResource,
+                id: resourceId
+              } : void 0,
+              actor: {
+                id: actorId,
+                type: actorType,
+                email: actorEmail
+              }
+            },
+            request
+          );
+        }
+        const authMethod = isLegacyToken ? "legacy_token" : session?.user ? "session" : "none";
         const ctx = {
           session,
           isLegacyToken,
+          authMethod,
           isAdmin,
           validated,
           logger: log,
           requestId,
-          params
+          params,
+          timedAudit
         };
         const response = await handler(request, ctx);
         response.headers.set("X-Request-ID", requestId);
-        if (routeConfig.audit && factoryConfig.auditLog) {
-          const actorId = isLegacyToken ? "admin_token" : session?.user?.id || "anonymous";
+        if (resolvedAuditAction && factoryConfig.auditLog && !timedAudit) {
           await factoryConfig.auditLog({
             actor: {
               id: actorId,
-              type: isLegacyToken ? "admin" : "user",
-              email: session?.user?.email ?? void 0
+              type: actorType,
+              email: actorEmail
             },
-            action: routeConfig.audit,
-            resource: routeConfig.auditResource ? { type: routeConfig.auditResource, id: "unknown" } : void 0,
+            action: resolvedAuditAction,
+            resource: resolvedAuditResource ? {
+              type: resolvedAuditResource,
+              id: resourceId ?? "unknown"
+            } : void 0,
             outcome: "success"
           }).catch(() => {
           });
@@ -1579,15 +1614,19 @@ function createSecureHandlerFactory(factoryConfig) {
         log.error("Request handler error", {
           error: error instanceof Error ? error.message : String(error)
         });
-        if (routeConfig.audit && factoryConfig.auditLog) {
+        const errReason = error instanceof Error ? error.message : "Unknown error";
+        if (timedAudit) {
+          await timedAudit.failure(errReason).catch(() => {
+          });
+        } else if (resolvedAuditAction && factoryConfig.auditLog) {
           await factoryConfig.auditLog({
             actor: {
               id: session?.user?.id || "unknown",
               type: "user"
             },
-            action: routeConfig.audit,
+            action: resolvedAuditAction,
             outcome: "failure",
-            reason: error instanceof Error ? error.message : "Unknown error"
+            reason: errReason
           }).catch(() => {
           });
         }