@uniformdev/cli 20.50.2 → 20.50.3-alpha.6

package/dist/index.mjs

@@ -150,10 +150,10 @@ var createClient = (baseUrl, authToken) => {
       );
     }
   };
-  const requestJson = async (path8, opts, schema2, allowedNon2xxStatusCodes = []) => {
+  const requestJson = async (path8, opts, schema, allowedNon2xxStatusCodes = []) => {
     const res = await request2(path8, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
-    const parseResult = schema2.safeParse(data);
+    const parseResult = schema.safeParse(data);
     if (parseResult.success) {
       return parseResult.data;
     } else {
@@ -447,7 +447,7 @@ async function chooseExistingProject({
   teamId,
   user
 }) {
-  const projects = (user.teams.find((t) => t.team.id === teamId)?.team.sites ?? []).map((t) => ({
+  const projects = (user.teams.find((t) => t.id === teamId)?.projects ?? []).map((t) => ({
     name: t.name,
     value: t.id
   }));
@@ -1033,8 +1033,8 @@ async function chooseTeam(user, prompt, telemetry) {
   const teamId = await select3({
     message: prompt,
     choices: user.teams.map((team) => ({
-      name: team.team.name,
-      value: team.team.id
+      name: team.name,
+      value: team.id
     }))
   });
   telemetry.send("team picked", { teamId });
@@ -1042,56 +1042,39 @@ async function chooseTeam(user, prompt, telemetry) {
 }
 
 // src/auth/user-info.ts
+import { ProjectClient } from "@uniformdev/canvas";
 import { gql, request } from "graphql-request";
 import * as z2 from "zod/v3";
-var query = gql`
-  query GetUserInfo($subject: String!) {
+var identityQuery = gql`
+  query GetUserIdentity($subject: String!) {
     info: identities_by_pk(subject: $subject) {
       name
       email_address
-      teams: organizations_identities(order_by: { organization: { name: asc } }) {
-        team: organization {
-          name
-          id
-          sites {
-            name
-            id
-          }
-        }
-      }
     }
   }
 `;
-var schema = z2.object({
+var identitySchema = z2.object({
   info: z2.object({
     name: z2.string().min(1),
-    email_address: z2.string().min(1).nullable(),
-    teams: z2.array(
-      z2.object({
-        team: z2.object({
-          name: z2.string().min(1),
-          id: z2.string().min(1),
-          sites: z2.array(
-            z2.object({
-              name: z2.string().min(1),
-              id: z2.string().min(1)
-            })
-          )
-        })
-      })
-    )
+    email_address: z2.string().min(1).nullable()
   })
 });
 var getUserInfo = async (baseUrl, authToken, subject) => {
   try {
-    const endpoint = makeUrl(baseUrl, "/v1/graphql");
-    const res = await request(endpoint, query, { subject }, { Authorization: `Bearer ${authToken}` });
-    const parseResult = schema.safeParse(res);
-    if (parseResult.success) {
-      return parseResult.data.info;
-    } else {
-      throw new Error(`Invalid GraphQL response: ${parseResult.error.message}`);
+    const headers = { Authorization: `Bearer ${authToken}` };
+    const projectClient = new ProjectClient({ apiHost: baseUrl, bearerToken: authToken });
+    const [identityRes, projectsRes] = await Promise.all([
+      request(makeUrl(baseUrl, "/v1/graphql"), identityQuery, { subject }, headers),
+      projectClient.getProjects()
+    ]);
+    const identityParsed = identitySchema.safeParse(identityRes);
+    if (!identityParsed.success) {
+      throw new Error(`Invalid identity response: ${identityParsed.error.message}`);
     }
+    return {
+      ...identityParsed.data.info,
+      teams: projectsRes.teams
+    };
   } catch (err) {
     throw new Error(`Failed to fetch user account:
   ${err.message}`);
@@ -1556,7 +1539,7 @@ Selected agent: ${agentType}`));
       if (isNonInteractive) {
         console.log(`\u{1F3E2} Team ID: ${teamId}`);
       } else {
-        console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.team.id === teamId)?.team.name}`);
+        console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.id === teamId)?.name}`);
       }
       console.log(`\u{1F4E6} Project: ${projectName} (${projectId})`);
       if (agentType === "cursor") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.50.2",
+  "version": "20.50.3-alpha.6+3ffd0d8a44",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -28,13 +28,13 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.50.2",
-    "@uniformdev/canvas": "20.50.2",
-    "@uniformdev/context": "20.50.2",
-    "@uniformdev/files": "20.50.2",
-    "@uniformdev/project-map": "20.50.2",
-    "@uniformdev/redirect": "20.50.2",
-    "@uniformdev/richtext": "20.50.2",
+    "@uniformdev/assets": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/canvas": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/context": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/files": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/project-map": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/redirect": "20.50.3-alpha.6+3ffd0d8a44",
+    "@uniformdev/richtext": "20.50.3-alpha.6+3ffd0d8a44",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fe4b29739822916548656e4b61d51faeab3340b5"
+  "gitHead": "3ffd0d8a44f3ab6b90835250a33f61db016e9e19"
 }