Multiple machine CLI support (#1022)

* If a cli PAT exists, associate the authorization code with it

* Improved the error messages

Author: matt-aitken

apps/webapp/app/routes/api.v1.token.ts

@@ -23,7 +23,7 @@ export async function action({ request }: ActionFunctionArgs) {
   const anyBody = await request.json();
   const body = GetPersonalAccessTokenRequestSchema.safeParse(anyBody);
   if (!body.success) {
-    return json({ message: generateErrorMessage(body.error.issues) }, { status: 422 });
+    return json({ error: generateErrorMessage(body.error.issues) }, { status: 422 });
   }
 
   try {
@@ -45,6 +45,6 @@ export async function action({ request }: ActionFunctionArgs) {
       return json({ error: error.message }, { status: 400 });
     }
 
-    return json({ error: "Something went wrong" }, { status: 500 });
+    return json({ error: "Something went wrong" }, { status: 400 });
   }
 }

apps/webapp/app/routes/api.v2.whoami.ts

@@ -8,29 +8,34 @@ import { authenticateApiRequestWithPersonalAccessToken } from "~/services/person
 
 export async function loader({ request }: LoaderFunctionArgs) {
   logger.info("whoami v2", { url: request.url });
+  try {
+    const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+    if (!authenticationResult) {
+      return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+    }
 
-  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
-  if (!authenticationResult) {
-    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
-  }
+    const user = await prisma.user.findUnique({
+      select: {
+        email: true,
+      },
+      where: {
+        id: authenticationResult.userId,
+      },
+    });
 
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-    },
-    where: {
-      id: authenticationResult.userId,
-    },
-  });
+    if (!user) {
+      return json({ error: "User not found" }, { status: 404 });
+    }
 
-  if (!user) {
-    return json({ error: "User not found" }, { status: 404 });
+    const result: WhoAmIResponse = {
+      userId: authenticationResult.userId,
+      email: user.email,
+      dashboardUrl: env.APP_ORIGIN,
+    };
+    return json(result);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Something went wrong";
+    logger.error("Error in whoami v2", { error: errorMessage });
+    return json({ error: errorMessage }, { status: 400 });
   }
-
-  const result: WhoAmIResponse = {
-    userId: authenticationResult.userId,
-    email: user.email,
-    dashboardUrl: env.APP_ORIGIN,
-  };
-  return json(result);
 }

apps/webapp/app/services/personalAccessToken.server.ts

@@ -1,10 +1,10 @@
+import { PersonalAccessToken } from "@trigger.dev/database";
 import { customAlphabet, nanoid } from "nanoid";
 import nodeCrypto from "node:crypto";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
 import { logger } from "./logger.server";
-import { PersonalAccessToken } from "@trigger.dev/database";
 
 const tokenValueLength = 40;
 //lowercase only, removed 0 and l to avoid confusion
@@ -54,7 +54,6 @@ export async function getPersonalAccessTokenFromAuthorizationCode(authorizationC
     },
     where: {
       code: authorizationCode,
-
       createdAt: {
         gte: tenMinutesAgo,
       },
@@ -199,13 +198,25 @@ export async function createPersonalAccessTokenFromAuthorizationCode(
     },
   });
 
-  //we only allow you to have one CLI PAT at a time
+  //we only allow you to have one CLI PAT at a time, so return this
   if (existingCliPersonalAccessToken) {
-    await prisma.personalAccessToken.delete({
+    //associate this authorization code with the existing personal access token
+    await prisma.authorizationCode.update({
       where: {
-        id: existingCliPersonalAccessToken.id,
+        code: authorizationCode,
+      },
+      data: {
+        personalAccessTokenId: existingCliPersonalAccessToken.id,
       },
     });
+
+    //we don't return the decrypted token
+    return {
+      id: existingCliPersonalAccessToken.id,
+      name: existingCliPersonalAccessToken.name,
+      userId: existingCliPersonalAccessToken.userId,
+      obfuscateToken: existingCliPersonalAccessToken.obfuscatedToken,
+    };
   }
 
   const token = await createPersonalAccessToken({