rename jwt to apiKey

Author: kristencheung

.trunk/trunk.yaml

@@ -18,19 +18,19 @@ runtimes:
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
   enabled:
-    - trivy@0.59.1
+    - trivy@0.60.0
     - [email protected]
-    - [email protected].365
-    - eslint@9.19.0
+    - [email protected].386
+    - eslint@9.22.0
     - git-diff-check
     - [email protected]
-    - osv-scanner@1.9.2
-    - prettier@3.4.2
-    - renovate@39.161.0
+    - osv-scanner@2.0.0
+    - prettier@3.5.3
+    - renovate@39.207.2
     - [email protected]
     - [email protected]
-    - [email protected].4
-    - yamllint@1.35.1
+    - [email protected].17
+    - yamllint@1.36.2
 actions:
   enabled:
     - trunk-announce

src/commands/link/index.ts

@@ -150,7 +150,7 @@ export default class LinkIndex extends Command {
 
     const settings = await readSettingsJson(settingsFilePath);
 
-    if (!settings.email || !settings.jwt || !settings.orgId) {
+    if (!settings.email || !settings.apiKey || !settings.orgId) {
       this.log(chalk.red("Not logged in.") + " Log in with `hyp login`.");
       return;
     }
@@ -169,15 +169,15 @@ export default class LinkIndex extends Command {
     }
 
     // call hypermode getRepoId with the installationId and the git url, if it returns a repoId, continue, if not, throw an error
-    const repoId = await sendGetRepoIdReq(settings.jwt, installationId, remoteUrl);
+    const repoId = await sendGetRepoIdReq(settings.apiKey, installationId, remoteUrl);
 
     if (!repoId) {
       throw new Error("No repoId found for the given installationId and gitUrl");
     }
 
     // get list of the projects for the user in this org, if any have no repoId, ask if they want to link it, or give option of none.
     // If they pick an option, connect repo. If none, ask if they want to create a new project, prompt for name, and connect repoId to project
-    const projects = await getProjectsByOrgReq(settings.jwt, settings.orgId);
+    const projects = await getProjectsByOrgReq(settings.apiKey, settings.orgId);
 
     const projectsNoRepoId = projects.filter((project) => !project.repoId);
 
@@ -188,18 +188,18 @@ export default class LinkIndex extends Command {
 
       if (confirmExistingProject) {
         selectedProject = await promptProjectLinkSelection(projectsNoRepoId);
-        const completedProject = await sendMapRepoAndFinishProjectCreationReq(settings.jwt, selectedProject.id, repoId, repoFullName);
+        const completedProject = await sendMapRepoAndFinishProjectCreationReq(settings.apiKey, selectedProject.id, repoId, repoFullName);
 
         this.log(chalk.green("Successfully linked project " + completedProject.name + " to repo " + repoName + "! 🎉"));
       } else {
         const projectName = await promptProjectName(projects);
-        const newProject = await sendCreateProjectReq(settings.jwt, settings.orgId, projectName, repoId, repoFullName);
+        const newProject = await sendCreateProjectReq(settings.apiKey, settings.orgId, projectName, repoId, repoFullName);
 
         this.log(chalk.green("Successfully created project " + newProject.name + " and linked it to repo " + repoName + "! 🎉"));
       }
     } else {
       const projectName = await promptProjectName(projects);
-      const newProject = await sendCreateProjectReq(settings.jwt, settings.orgId, projectName, repoId, repoFullName);
+      const newProject = await sendCreateProjectReq(settings.apiKey, settings.orgId, projectName, repoId, repoFullName);
 
       this.log(chalk.blueBright("Successfully created project " + newProject.name + " and linked it to repo " + repoFullName + "! Setting up CI workflow..."));
     }

src/commands/logout/index.ts

@@ -38,7 +38,7 @@ export default class LogoutIndex extends Command {
 
     const newSettingsContent = {
       HYP_EMAIL: null,
-      HYP_JWT: null,
+      HYP_API_KEY: null,
       HYP_ORG_ID: null,
       INSTALLATION_IDS: res.installationIds,
     };

src/commands/org/switch.ts

@@ -27,14 +27,14 @@ export default class OrgSwitch extends Command {
 
     const res = await readSettingsJson(settingsFilePath);
 
-    if (!res.email || !res.jwt || !res.orgId) {
+    if (!res.email || !res.apiKey || !res.orgId) {
       this.log(chalk.red("Not logged in.") + " Log in with `hyp login`.");
       return;
     }
 
-    const orgs = await sendGetOrgsReq(res.jwt);
+    const orgs = await sendGetOrgsReq(res.apiKey);
     const selectedOrg = await promptOrgSelection(orgs);
 
-    await writeToSettingsFile(res.jwt, res.email, selectedOrg.id);
+    await writeToSettingsFile(res.apiKey, res.email, selectedOrg.id);
   }
 }

src/util/index.ts

@@ -132,18 +132,18 @@ export async function getGitRemoteUrl(filePath: string): Promise<string | null>
   return remoteMatch[1];
 }
 
-export async function readSettingsJson(filePath: string): Promise<{ content: string; email: null | string; installationIds: { [key: string]: string } | null; jwt: null | string; orgId: null | string }> {
+export async function readSettingsJson(filePath: string): Promise<{ content: string; email: null | string; installationIds: { [key: string]: string } | null; apiKey: null | string; orgId: null | string }> {
   const content = await fs.readFile(filePath, "utf8");
 
   let email: null | string = null;
-  let jwt: null | string = null;
+  let apiKey: null | string = null;
   let orgId: null | string = null;
   let installationIds: { [key: string]: string } | null = null;
 
   try {
     const jsonContent = JSON.parse(content);
     email = jsonContent.HYP_EMAIL || null;
-    jwt = jsonContent.HYP_JWT || null;
+    apiKey = jsonContent.HYP_API_KEY || null;
     orgId = jsonContent.HYP_ORG_ID || null;
     installationIds = jsonContent.INSTALLATION_IDS || null;
   } catch {
@@ -154,7 +154,7 @@ export async function readSettingsJson(filePath: string): Promise<{ content: str
     content,
     email,
     installationIds,
-    jwt,
+    apiKey,
     orgId,
   };
 }