fix and add tests

packages/filecoin-api/test/context/service.js

@@ -13,7 +13,6 @@ import * as API from '../../src/types.js'
 
 import { validateAuthorization } from '../utils.js'
 import { mockService } from './mocks.js'
-import { Access } from '@web3-storage/capabilities'
 
 export { getStoreImplementations } from './store-implementations.js'
 export { getQueueImplementations } from './queue-implementations.js'
@@ -241,16 +240,6 @@ export function getMockService() {
         }
       ),
     },
-    access: {
-      delegate: Server.provide(
-        Access.delegate,
-        async ({ capability, invocation }) => {
-          return {
-            ok: {},
-          }
-        }
-      ),
-    },
   })
 }
 

packages/w3up-client/src/client.js

@@ -30,7 +30,6 @@ import { FilecoinClient } from './capability/filecoin.js'
 import { CouponAPI } from './coupon.js'
 export * as Access from './capability/access.js'
 import * as Result from './result.js'
-import { remove } from '@web3-storage/capabilities/store'
 
 export {
   AccessClient,
@@ -260,7 +259,7 @@ export class Client extends Base {
    * @typedef {object} SpaceCreateOptions
    * @property {boolean} [skipContentServeAuthorization] - Whether to skip the Content Serve authorization. It means that the content of the space will not be served by any Content Serve Service.
    * @property {`did:${string}:${string}`[]} [authorizeContentServeServices] - The DID Key or DID Web of the Content Serve Service to authorize to serve content from the created space.
-   * @property {import('./types.js').ConnectionView<import('./types.js').ContentServeService>} [authorizeContentServeServices.connection] - The connection to the Content Serve Service that will handle, validate, and store the access/delegate UCAN invocation.
+   * @property {import('./types.js').ConnectionView<import('./types.js').ContentServeService>} [connection] - The connection to the Content Serve Service that will handle, validate, and store the access/delegate UCAN invocation.
    * @property {Account.Account} [account] - The account configured as the recovery account for the space.
    * @property {string} [name] - The name of the space to create.
    *
@@ -269,10 +268,8 @@ export class Client extends Base {
    * @returns {Promise<import("./space.js").OwnedSpace>} The created space owned by the agent.
    */
   async createSpace(name, options) {
-    const space = await this._agent.createSpace(name)
-
     // Save the space to authorize the client to use the space
-    await space.save()
+    const space = await this._agent.createSpace(name)
 
     const account = options.account
     if (account) {
@@ -285,6 +282,9 @@ export class Client extends Base {
         )
       }
 
+      // Save the space to authorize the client to use the space
+      await space.save()
+
       // Create a recovery for the account
       const recovery = await space.createRecovery(account.did())
 
@@ -380,6 +380,7 @@ export class Client extends Base {
         })
         .execute(options.connection)
 
+      /* c8 ignore next 8 - can't mock this error */
       if (verificationResult.out.error) {
         throw new Error(
           `failed to publish delegation for audience ${options.audience}: ${verificationResult.out.error.message}`,
@@ -388,7 +389,6 @@ export class Client extends Base {
           }
         )
       }
-
       return { ok: { ...verificationResult.out.ok, delegation } }
     } finally {
       if (currentSpace) {

packages/w3up-client/test/account.test.js

@@ -111,7 +111,9 @@ export const testAccount = Test.withContext({
     assert,
     { client, mail, grantAccess }
   ) => {
-    const space = await client.createSpace('test')
+    const space = await client.createSpace('test', {
+      skipContentServeAuthorization: true,
+    })
     const mnemonic = space.toMnemonic()
     const { signer } = await Space.fromMnemonic(mnemonic, { name: 'import' })
     assert.deepEqual(
@@ -147,7 +149,9 @@ export const testAccount = Test.withContext({
 
   'multi device workflow': async (asserts, { connect, mail, grantAccess }) => {
     const laptop = await connect()
-    const space = await laptop.createSpace('main')
+    const space = await laptop.createSpace('main', {
+      skipContentServeAuthorization: true,
+    })
 
     // want to provision space ?
     const email = '[email protected]'
@@ -183,7 +187,9 @@ export const testAccount = Test.withContext({
     asserts.deepEqual(result.did, space.did())
   },
   'setup recovery': async (assert, { client, mail, grantAccess }) => {
-    const space = await client.createSpace('test')
+    const space = await client.createSpace('test', {
+      skipContentServeAuthorization: true,
+    })
 
     const email = '[email protected]'
     const login = Account.login(client, email)
@@ -280,7 +286,9 @@ export const testAccount = Test.withContext({
     assert,
     { client, mail, grantAccess }
   ) => {
-    const space = await client.createSpace('test')
+    const space = await client.createSpace('test', {
+      skipContentServeAuthorization: true,
+    })
 
     const email = '[email protected]'
     const login = Account.login(client, email)
@@ -299,8 +307,10 @@ export const testAccount = Test.withContext({
     assert.equal(typeof subs.results[0].subscription, 'string')
   },
 
-  'space.save': async (assert, { client, mail, grantAccess }) => {
-    const space = await client.createSpace('test')
+  'space.save': async (assert, { client }) => {
+    const space = await client.createSpace('test', {
+      skipContentServeAuthorization: true,
+    })
     assert.deepEqual(client.spaces(), [])
 
     const result = await space.save()

packages/w3up-client/test/capability/filecoin.test.js

@@ -5,7 +5,9 @@ import * as Test from '../test.js'
 export const FilecoinClient = Test.withContext({
   offer: {
     'should send an offer': async (assert, { client: alice }) => {
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())
@@ -36,7 +38,9 @@ export const FilecoinClient = Test.withContext({
         throw new Error('could not compute proof')
       }
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())

packages/w3up-client/test/capability/index.test.js

@@ -14,7 +14,9 @@ export const IndexClient = Test.withContext({
     ) => {
       const car = await randomCAR(128)
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())

packages/w3up-client/test/capability/subscription.test.js

@@ -8,7 +8,9 @@ export const SubscriptionClient = Test.withContext({
       assert,
       { client, connection, service, plansStorage, grantAccess, mail }
     ) => {
-      const space = await client.createSpace('test')
+      const space = await client.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const email = '[email protected]'
       const login = Account.login(client, email)
       const message = await mail.take()

packages/w3up-client/test/capability/upload.test.js

@@ -9,7 +9,9 @@ export const UploadClient = Test.withContext({
     ) => {
       const car = await randomCAR(128)
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())
@@ -38,7 +40,9 @@ export const UploadClient = Test.withContext({
     ) => {
       const car = await randomCAR(128)
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())
@@ -77,7 +81,9 @@ export const UploadClient = Test.withContext({
     ) => {
       const car = await randomCAR(128)
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())
@@ -109,7 +115,9 @@ export const UploadClient = Test.withContext({
     ) => {
       const car = await randomCAR(128)
 
-      const space = await alice.createSpace('test')
+      const space = await alice.createSpace('test', {
+        skipContentServeAuthorization: true,
+      })
       const auth = await space.createAuthorization(alice)
       await alice.addSpace(auth)
       await alice.setCurrentSpace(space.did())