feat: add a helper for requiring authentication to use actions (#11)

Author: jared-paperspace

deno.lock

@@ -1,7 +1,7 @@
 import { env } from "./env.ts";
 import * as credentials from "./credentials.ts";
 import * as config from "./config.ts";
-import { strip } from "./ansi.ts";
+import { info, strip } from "./ansi.ts";
 
 /**
  * Logs a message to the console in the appropriate format based on the
@@ -74,6 +74,51 @@ export function act<
   };
 }
 
+/**
+ * A higher order function that needs to be added to every action that requires
+ * the user to be logged in. This will also print the return value of an action
+ * function in the appropriate format based on the CLI options.
+ *
+ * @param fn - An action function that returns a `PrintsFormats` object.
+ * @example
+ * ```ts
+ * cli.action(act.ifLoggedIn(async () => {
+ *  return { value: "Hello World" }
+ * }))
+ * ```
+ */
+act.ifLoggedIn = <
+  Fn extends (...args: any[]) => Formats | Promise<Formats>,
+>(fn: Fn) => {
+  return async function action(...args: Parameters<Fn>): Promise<void> {
+    const opt = args[0];
+    const isLoggedIn = !!(opt.apiKey || await config.get("team"));
+    const availableTeams = await credentials.list();
+    const hasTeams = availableTeams.length > 0;
+    const loginHelper = !hasTeams
+      ? `Run "${info("pspace login")}" to log in.`
+      : `Run "${
+        info(`pspace config set team`)
+      }" to choose a team. \n\nAvailable teams: \n › ${
+        availableTeams.join("\n › ")
+      }`;
+
+    const selectMessage = `You must ${
+      hasTeams ? "select a team" : "be logged in"
+    } to run this command.`;
+
+    if (!isLoggedIn) {
+      throw new config.ConfigError(
+        `${selectMessage}
+
+${loginHelper}`,
+      );
+    }
+
+    return act(fn)(...args);
+  };
+};
+
 type Formats =
   | {
     /**

lib/act.ts

@@ -103,25 +103,30 @@ cli
         console.log("init");
       })
       .command("create")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("create");
-      })
+        return { value: "" };
+      }))
       .command("update")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("update");
-      })
+        return { value: "" };
+      }))
       .command("delete")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("delete");
-      })
+        return { value: "" };
+      }))
       .command("list")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("list");
-      })
+        return { value: "" };
+      }))
       .command("get")
-      .action(() => {
-        console.log("list");
-      }),
+      .action(act.ifLoggedIn(() => {
+        console.log("get");
+        return { value: "" };
+      })),
   )
   .action(function () {
     this.showHelp();
@@ -139,25 +144,30 @@ cli
         console.log("init");
       })
       .command("create")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("create");
-      })
+        return { value: "" };
+      }))
       .command("update")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("update");
-      })
+        return { value: "" };
+      }))
       .command("delete")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("delete");
-      })
+        return { value: "" };
+      }))
       .command("list")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("list");
-      })
+        return { value: "" };
+      }))
       .command("get")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("get");
-      }),
+        return { value: "" };
+      })),
   )
   .action(function () {
     this.showHelp();
@@ -175,25 +185,30 @@ cli
         console.log("init");
       })
       .command("create")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("create");
-      })
+        return { value: "" };
+      }))
       .command("update")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("update");
-      })
+        return { value: "" };
+      }))
       .command("delete")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("delete");
-      })
+        return { value: "" };
+      }))
       .command("list")
-      .action(() => {
+      .action(act.ifLoggedIn(() => {
         console.log("list");
-      })
+        return { value: "" };
+      }))
       .command("get")
-      .action(() => {
-        console.log("list");
-      }),
+      .action(act.ifLoggedIn(() => {
+        console.log("get");
+        return { value: "" };
+      })),
   )
   .action(function () {
     this.showHelp();

lib/cli.ts

@@ -124,7 +124,7 @@ export const schema = z.object({
 
       const teams = await credentials.list();
 
-      logger.critical(
+      logger.error(
         `Team "${value}" was not found in your credentials file. Retaining current team.`,
       );
 

lib/config.ts

@@ -4169,7 +4169,7 @@ export type ViewerQuery = {
   __typename?: "Query";
   viewer?: {
     __typename?: "Viewer";
-    team: { __typename?: "Team"; namespace: string; handle: string };
+    team: { __typename?: "Team"; namespace: string };
   } | null;
 };
 
@@ -5841,9 +5841,6 @@ export const ViewerDocument = {
               "selections": [{
                 "kind": "Field",
                 "name": { "kind": "Name", "value": "namespace" },
-              }, {
-                "kind": "Field",
-                "name": { "kind": "Name", "value": "handle" },
               }],
             },
           }],