Feat(projects show): Always show org-id, and show name of user when o…

…rg is the personal account. (#261)

src/subcommands/projects.ts

@@ -118,13 +118,21 @@ async function showProject(args: Args): Promise<void> {
     );
     return Deno.exit(1);
   }
+  const organizationName = project.organization.name
+    ? magenta(project.organization.name)
+    : `${
+      magenta(
+        // If project exists, organization must also exist
+        (await api.getOrganizationById(project.organization.id))!.members[0]
+          .user
+          .name,
+      )
+    } [personal]`;
   spinner.succeed(`Project '${args.project}' found`);
   console.log();
   console.log(bold(green(project.name)));
   console.log(new Array(project.name.length).fill("-").join(""));
-  if (project.organization.name) {
-    console.log(`Organization:\t${magenta(project.organization.name)}`);
-  }
+  console.log(`Organization:\t${organizationName} (${project.organizationId})`);
   const ingress_root = new URL(endpoint()).hostname.split(".").at(-2);
   domains.push({
     domain: `${project.name}.${ingress_root}.dev`,

src/utils/api.ts

@@ -185,6 +185,10 @@ export class API {
     }
   }
 
+  async getOrganizationById(id: string): Promise<Organization | undefined> {
+    return await this.#requestJson(`/organizations/${id}`);
+  }
+
   async createOrganization(name: string): Promise<Organization> {
     const body = { name };
     return await this.#requestJson(

src/utils/api_types.ts

@@ -43,13 +43,24 @@ export interface Project {
 
 export type Organization = UserOrganization | NormalOrganization;
 
-export interface UserOrganization {
-  id: string;
+export type UserOrganization = CommonOrganization & {
   name: null;
-}
+};
+
+export type NormalOrganization = CommonOrganization & {
+  name: string;
+};
 
-export interface NormalOrganization {
+export interface CommonOrganization {
   id: string;
+  members: OrganizationMember[];
+}
+
+export interface OrganizationMember {
+  user: User;
+}
+
+export interface User {
   name: string;
 }