gh auth status: parse logged in variants

Author: magus

src/app/DependencyCheck.tsx

@@ -10,8 +10,8 @@ import { Url } from "~/app/Url";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { is_command_available } from "~/core/is_command_available";
-import { match_group } from "~/core/match_group";
 import { semver_compare } from "~/core/semver_compare";
+import * as gh from "~/github/gh";
 
 type Props = {
   children: React.ReactNode;
@@ -112,22 +112,23 @@ export function DependencyCheck(props: Props) {
               </Ink.Text>
             }
             function={async () => {
-              const auth_status = await cli(`gh auth status`, {
-                ignoreExitCode: true,
-              });
+              const options = { ignoreExitCode: true };
+              const auth_status = await cli(`gh auth status`, options);
 
               if (auth_status.code === 0) {
-                const username = match_group(
-                  auth_status.stdout,
-                  RE.auth_username,
-                  "username"
-                );
+                const username = gh.auth_status(auth_status.stdout);
 
-                actions.set((state) => {
-                  state.username = username;
-                });
+                if (username) {
+                  actions.set((state) => {
+                    state.username = username;
+                  });
 
-                return;
+                  return;
+                }
+              }
+
+              if (actions.isDebug()) {
+                actions.error("gh auth status could not find username");
               }
 
               actions.output(
@@ -148,8 +149,3 @@ export function DependencyCheck(props: Props) {
     </Await>
   );
 }
-
-const RE = {
-  // Logged in to github.com as magus
-  auth_username: /Logged in to github.com as (?<username>[^\s]+)/,
-};

src/core/match_group.ts

@@ -8,3 +8,11 @@ export function match_group(value: string, re: RegExp, group: string) {
   invariant(result, `match.groups must contain [${group}] ${debug}`);
   return result;
 }
+
+match_group.safe = (value: string, re: RegExp, group: string) => {
+  try {
+    return match_group(value, re, group);
+  } catch (err) {
+    return null;
+  }
+};

src/github/gh.auth_status.test.ts

@@ -0,0 +1,24 @@
+import { test, expect } from "bun:test";
+
+import * as gh from "./gh";
+
+test("logged in as", () => {
+  const username = gh.auth_status(
+    "  ✓ Logged in to github.com as magus (keyring)\n"
+  );
+
+  expect(username).toBe("magus");
+});
+
+test("logged in without as", () => {
+  const username = gh.auth_status(
+    "✓ Logged in to github.com account xoxohorses (keyring)"
+  );
+
+  expect(username).toBe("xoxohorses");
+});
+
+test("returns null when no match is found", () => {
+  const username = gh.auth_status("this should not match anything");
+  expect(username).toBe(null);
+});

src/github/gh.ts

@@ -0,0 +1,19 @@
+import { match_group } from "~/core/match_group";
+
+export function auth_status(output: string) {
+  let username;
+
+  username = match_group.safe(output, RE.logged_in_as, "username");
+  if (username) return username;
+
+  username = match_group.safe(output, RE.logged_in_account, "username");
+  if (username) return username;
+
+  return null;
+}
+
+const RE = {
+  // Logged in to github.com as magus
+  logged_in_as: /Logged in to github.com as (?<username>[^\s]+)/,
+  logged_in_account: /Logged in to github.com account (?<username>[^\s]+)/,
+};