Skip to content

feat(whoami): consume account.me to populate user identity #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crowlKats merged 2 commits into from
Jun 3, 2026
Merged

feat(whoami): consume account.me to populate user identity #101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34fb47f
feat(whoami): consume account.me to populate user identity
crowlbot Jun 2, 2026
8aa3b1f
Merge branch 'main' into feat/whoami-account-me
crowlKats Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions deploy/mod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,17 @@ interface WhoamiOrg {
plan: string | null;
}

interface AccountMe {
user: {
id: string;
name: string | null;
email: string | null;
avatarUrl: string | null;
githubLogin: string | null;
} | null;
tokenType: string;
}

const whoamiCommand = new Command<GlobalContext>()
.description(
"Verify the current Deno Deploy token and list reachable organizations",
Expand All @@ -260,16 +271,16 @@ const whoamiCommand = new Command<GlobalContext>()
// AUTH_INVALID_TOKEN envelope from the errorLink if the token is bad,
// without ever calling `requireInteractive()` or opening a browser.
const trpcClient = createTrpcClient(options);
const orgs = await trpcClient.query("orgs.list") as WhoamiOrg[];
const [me, orgs] = await Promise.all([
trpcClient.query("account.me") as Promise<AccountMe>,
trpcClient.query("orgs.list") as Promise<WhoamiOrg[]>,
]);

if (options.json) {
writeJsonResult({
authenticated: true,
// The deployng tRPC router does not currently expose user identity,
// so we surface what we can (orgs the token can reach). When that
// procedure lands, this output will gain a `user` field; existing
// consumers reading `authenticated` / `orgs[]` keep working.
user: null,
user: me.user,
tokenType: me.tokenType,
orgs: orgs.map((org) => ({
id: org.id,
slug: org.slug,
Expand All @@ -280,8 +291,15 @@ const whoamiCommand = new Command<GlobalContext>()
return;
}

const who = me.user
? (me.user.githubLogin
? `@${me.user.githubLogin}`
: me.user.email ?? me.user.name ?? me.user.id)
: `org-scoped token (${me.tokenType})`;
console.log(
`${green("✔")} Authenticated. ${orgs.length} reachable organization${
`${
green("✔")
} Authenticated as ${who}. ${orgs.length} reachable organization${
orgs.length === 1 ? "" : "s"
}:`,
);
Expand Down
Loading