Fix 500 error when requesting a user-access-token

curveball · Dec 6, 2024 · c6cbf1f · c6cbf1f
1 parent 9d5ffbd
commit c6cbf1f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.27.1 (????-??-??)
+-------------------
+
+* Fix HTTP/500 error when requesting a developer access token.
+
+
 0.27.0 (2024-12-05)
 -------------------
 

diff --git a/src/log/service.ts b/src/log/service.ts
@@ -6,10 +6,17 @@ import geoip from 'geoip-lite';
 import { UserLogRecord } from 'knex/types/tables.js';
 
 export function getLoggerFromContext(ctx: Context, principal?: Principal|number): UserEventLogger {
+
+  let principalId;
+  if (typeof principal === 'number') {
+    principalId = principal;
+  } else {
+    principalId = principal?.id ?? ctx.session.user?.id;
+  }
   return (et: EventType) => addLogEntry(
     et,
     ctx.ip() ?? '',
-    principal ?? ctx.session.user?.id,
+    principalId,
     ctx.request.headers.get('User-Agent')
   );
 }