fix: get user by accessKeyId if needed

package.json

@@ -28,10 +28,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@fonoster/authz": "^0.8.25",
-    "@fonoster/common": "^0.8.25",
-    "@fonoster/identity": "^0.8.25",
-    "@fonoster/logger": "^0.8.24",
+    "@fonoster/authz": "^0.8.32",
+    "@fonoster/common": "^0.8.31",
+    "@fonoster/identity": "^0.8.32",
+    "@fonoster/logger": "^0.8.28",
     "@influxdata/influxdb-client": "^1.35.0",
     "nats": "^2.28.2",
     "pb-util": "^1.0.3",

src/AuthzHandler.ts

@@ -25,6 +25,7 @@ import {
 } from "@fonoster/authz";
 import {
   createGetUserByWorkspaceAccessKeyId,
+  createGetUserByAccessKeyId,
   prisma
 } from "@fonoster/identity";
 import { AccountType } from "./type";
@@ -42,6 +43,7 @@ import {
 const logger = getLogger({ service: "fnauthz", filePath: __filename });
 const getUserByWorkspaceAccessKeyId =
   createGetUserByWorkspaceAccessKeyId(prisma);
+const getUserByAccessKeyId = createGetUserByAccessKeyId(prisma);
 const getWorkspacesCount = makeGetWorkspacesCount(prisma);
 const addBillingMeterEvent = makeAddBillingMeterEvent(
   new Stripe(STRIPE_SECRET_KEY!)
@@ -81,7 +83,9 @@ class AuthzHandler implements IAuthzHandler {
     // Must have both accessKeyId and method
     const parsedRequest = checkMethodAuthorizedRequestSchema.parse(request);
 
-    const user = await getUserByWorkspaceAccessKeyId(parsedRequest.accessKeyId);
+    const user = parsedRequest.accessKeyId.startsWith("US")
+      ? await getUserByAccessKeyId(parsedRequest.accessKeyId)
+      : await getUserByWorkspaceAccessKeyId(parsedRequest.accessKeyId);
 
     if (!user) {
       return false;

src/server.ts

@@ -18,7 +18,7 @@
  */
 import {
   assertEnvsAreSet,
-  makeFetchSingleCallByCallId
+  createFetchSingleCallByCallId
 } from "@fonoster/common";
 import { AuthzServer } from "@fonoster/authz";
 import { AuthzHandler } from "./AuthzHandler";
@@ -43,7 +43,7 @@ new AuthzServer().listen(authzHandler);
 
 const influx = new InfluxDB({ url: INFLUXDB_URL!, token: INFLUXDB_TOKEN });
 // TODO: Fix hardcode value
-const fetchSingleCallByCallId = makeFetchSingleCallByCallId(
+const fetchSingleCallByCallId = createFetchSingleCallByCallId(
   influx.getQueryApi("fonoster")
 );