@digilogiclabs/platform-core 1.16.0 → 1.17.0

package/dist/auth.mjs

@@ -1483,6 +1483,10 @@ function createSecureHandlerFactory(factoryConfig) {
       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();
@@ -1553,17 +1557,17 @@ function createSecureHandlerFactory(factoryConfig) {
         const actorId = isLegacyToken ? "admin_token" : session?.user?.id || "anonymous";
         const actorType = isLegacyToken ? "admin" : "user";
         const actorEmail = session?.user?.email ?? void 0;
-        const resourceId = routeConfig.getResourceId ? routeConfig.getResourceId(
+        const resourceId = resolvedGetResourceId ? resolvedGetResourceId(
           request,
           params,
           validated
         ) : void 0;
-        if (routeConfig.audit && factoryConfig.createTimedAudit) {
+        if (resolvedAuditAction && factoryConfig.createTimedAudit) {
           timedAudit = factoryConfig.createTimedAudit(
             {
-              action: routeConfig.audit,
-              resource: routeConfig.auditResource ? {
-                type: routeConfig.auditResource,
+              action: resolvedAuditAction,
+              resource: resolvedAuditResource ? {
+                type: resolvedAuditResource,
                 id: resourceId
               } : void 0,
               actor: {
@@ -1575,9 +1579,11 @@ function createSecureHandlerFactory(factoryConfig) {
             request
           );
         }
+        const authMethod = isLegacyToken ? "legacy_token" : session?.user ? "session" : "none";
         const ctx = {
           session,
           isLegacyToken,
+          authMethod,
           isAdmin,
           validated,
           logger: log,
@@ -1587,16 +1593,16 @@ function createSecureHandlerFactory(factoryConfig) {
         };
         const response = await handler(request, ctx);
         response.headers.set("X-Request-ID", requestId);
-        if (routeConfig.audit && factoryConfig.auditLog && !timedAudit) {
+        if (resolvedAuditAction && factoryConfig.auditLog && !timedAudit) {
           await factoryConfig.auditLog({
             actor: {
               id: actorId,
               type: actorType,
               email: actorEmail
             },
-            action: routeConfig.audit,
-            resource: routeConfig.auditResource ? {
-              type: routeConfig.auditResource,
+            action: resolvedAuditAction,
+            resource: resolvedAuditResource ? {
+              type: resolvedAuditResource,
               id: resourceId ?? "unknown"
             } : void 0,
             outcome: "success"
@@ -1612,13 +1618,13 @@ function createSecureHandlerFactory(factoryConfig) {
         if (timedAudit) {
           await timedAudit.failure(errReason).catch(() => {
           });
-        } else if (routeConfig.audit && factoryConfig.auditLog) {
+        } else if (resolvedAuditAction && factoryConfig.auditLog) {
           await factoryConfig.auditLog({
             actor: {
               id: session?.user?.id || "unknown",
               type: "user"
             },
-            action: routeConfig.audit,
+            action: resolvedAuditAction,
             outcome: "failure",
             reason: errReason
           }).catch(() => {