fix: fix client cli service did resolve (#292)

We removed service DID resolution from the agent so CLI needs to pass in
the DID now.

packages/access-api/package.json

@@ -42,7 +42,7 @@
     "@types/assert": "^1.5.6",
     "@types/git-rev-sync": "^2.0.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.13",
+    "@types/node": "^18.11.14",
     "@types/qrcode": "^1.5.0",
     "better-sqlite3": "8.0.1",
     "buffer": "^6.0.3",

packages/access-client/package.json

@@ -82,13 +82,13 @@
     "uint8arrays": "^4.0.2",
     "varint": "^6.0.0",
     "ws": "^8.11.0",
-    "zod": "^3.20.0"
+    "zod": "^3.20.2"
   },
   "devDependencies": {
     "@types/assert": "^1.5.6",
     "@types/inquirer": "^9.0.3",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.13",
+    "@types/node": "^18.11.14",
     "@types/varint": "^6.0.1",
     "@types/ws": "^8.5.3",
     "@ucanto/server": "^4.0.2",

packages/access-client/src/cli/cmd-create-space.js

@@ -10,13 +10,13 @@ import { getService } from './utils.js'
  * @param {{ profile: any; env: string }} opts
  */
 export async function cmdCreateSpace(opts) {
-  const { url } = await getService(opts.env)
+  const { url, servicePrincipal } = await getService(opts.env)
   const store = new StoreConf({ profile: opts.profile })
   const data = await store.load()
 
   if (data) {
     const spinner = ora('Registering with the service').start()
-    const agent = Agent.from(data, { store, url })
+    const agent = Agent.from(data, { store, url, servicePrincipal })
 
     spinner.stopAndPersist()
     const { email, name } = await inquirer.prompt([

packages/access-client/src/cli/index.js

@@ -22,13 +22,17 @@ const prog = sade(NAME)
 prog
   .version(pkg.version)
   .option('-p, --profile', 'Select the config profile to use.', 'main')
-  .option('--env', 'Env', 'production')
+  .option(
+    '--env',
+    'Environment "production", "staging", "dev" or "local"',
+    'production'
+  )
 
 prog.command('link [channel]').describe('Link.').action(cmdLink)
 prog
   .command('setup')
   .option('--reset', 'Reset current store.', false)
-  .describe('Print config file content.')
+  .describe('Setup agent keypair.')
   .action(cmdSetup)
 prog.command('whoami').describe('Print config file content.').action(cmdWhoami)
 prog
@@ -42,16 +46,16 @@ prog
   .action(async (opts) => {
     const store = new StoreConf({ profile: opts.profile })
     const data = await store.load()
-    const { url } = await getService(opts.env)
+    const { url, servicePrincipal } = await getService(opts.env)
     if (data) {
-      const agent = Agent.from(data, { store, url })
+      const agent = Agent.from(data, { store, url, servicePrincipal })
       const space = await selectSpace(agent)
       try {
         const result = await agent.getSpaceInfo(space)
         console.log(result)
       } catch (error_) {
         const error = /** @type {Error} */ (error_)
-        console.log(error.message)
+        console.log('Error', error.message)
       }
     } else {
       console.error(`Run "${NAME} setup" first`)
@@ -65,9 +69,9 @@ prog
   .action(async (opts) => {
     const store = new StoreConf({ profile: opts.profile })
     const data = await store.load()
-    const { url } = await getService(opts.env)
+    const { url, servicePrincipal } = await getService(opts.env)
     if (data) {
-      const agent = Agent.from(data, { store, url })
+      const agent = Agent.from(data, { store, url, servicePrincipal })
       const space = await selectSpace(agent)
 
       await agent.setCurrentSpace(space)
@@ -135,9 +139,9 @@ prog
   .action(async (opts) => {
     const store = new StoreConf({ profile: opts.profile })
     const data = await store.load()
-    const { url } = await getService(opts.env)
+    const { url, servicePrincipal } = await getService(opts.env)
     if (data) {
-      const agent = Agent.from(data, { store, url })
+      const agent = Agent.from(data, { store, url, servicePrincipal })
 
       const del = fs.readFileSync(path.resolve(opts.delegation), {
         encoding: 'utf8',
@@ -155,9 +159,9 @@ prog
   .action(async (opts) => {
     const store = new StoreConf({ profile: opts.profile })
     const data = await store.load()
-    const { url } = await getService(opts.env)
+    const { url, servicePrincipal } = await getService(opts.env)
     if (data) {
-      const agent = Agent.from(data, { store, url })
+      const agent = Agent.from(data, { store, url, servicePrincipal })
 
       const { email } = await inquirer.prompt([
         {

packages/access-client/src/cli/utils.js

@@ -30,7 +30,7 @@ export async function getService(env) {
     // @ts-ignore
     const { did } = await rsp.json()
     audience = Verifier.parse(did)
-    return { url, audience }
+    return { url, servicePrincipal: audience }
   }
 }
 

packages/access-ws/package.json

@@ -23,7 +23,7 @@
     "@cloudflare/workers-types": "^3.18.0",
     "@sentry/cli": "2.7.0",
     "@types/git-rev-sync": "^2.0.0",
-    "@types/node": "^18.11.13",
+    "@types/node": "^18.11.14",
     "ava": "^5.1.0",
     "buffer": "^6.0.3",
     "dotenv": "^16.0.3",

packages/capabilities/package.json

@@ -66,7 +66,7 @@
   "devDependencies": {
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.13",
+    "@types/node": "^18.11.14",
     "assert": "^2.0.0",
     "hd-scripts": "^3.0.2",
     "mocha": "^10.2.0",