fix: update @web3-storage/access dep to fix email + issue (storacha#503)

Trying to auth with an email with a + in it currently fails, upgrade to the latest version of @web3-storage/access which fixes that. While I was in here I did a bit of refactoring so that only `keyring-core` depends on `@web3-storage/access`
storacha · Apr 10, 2023 · 19b2c0a · 19b2c0a
1 parent ad0632c
commit 19b2c0a
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 65 deletions.
diff --git a/packages/w3ui/packages/keyring-core/package.json b/packages/w3ui/packages/keyring-core/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@ucanto/interface": "^6.2.0",
     "@ucanto/principal": "^5.1.0",
-    "@web3-storage/access": "^11.2.0"
+    "@web3-storage/access": "^12.0.0"
   },
   "eslintConfig": {
     "extends": [

diff --git a/packages/w3ui/packages/keyring-core/src/index.ts b/packages/w3ui/packages/keyring-core/src/index.ts
@@ -1,5 +1,3 @@
-import { Agent } from '@web3-storage/access/agent'
-import { StoreIndexedDB } from '@web3-storage/access/stores/store-indexeddb'
 import type { Abilities, AgentMeta, Service } from '@web3-storage/access/types'
 import type {
   Capability,
@@ -11,8 +9,13 @@ import type {
   Delegation,
   UCANOptions
 } from '@ucanto/interface'
+import { Agent, authorizeWaitAndClaim } from '@web3-storage/access/agent'
+import { StoreIndexedDB } from '@web3-storage/access/stores/store-indexeddb'
 import * as RSASigner from '@ucanto/principal/rsa'
 
+export { Agent, Abilities, AgentMeta, Service }
+export const authorize = authorizeWaitAndClaim
+
 const DB_NAME = 'w3ui'
 const DB_STORE_NAME = 'keyring'
 

diff --git a/packages/w3ui/packages/react-keyring/package.json b/packages/w3ui/packages/react-keyring/package.json
@@ -38,8 +38,7 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@ucanto/interface": "^6.2.0",
-    "@ucanto/principal": "^5.1.0",
-    "@web3-storage/access": "^11.2.0"
+    "@ucanto/principal": "^5.1.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"

diff --git a/packages/w3ui/packages/react-keyring/src/providers/Keyring.tsx b/packages/w3ui/packages/react-keyring/src/providers/Keyring.tsx
@@ -1,21 +1,11 @@
-import React, { createContext, useState, useContext } from 'react'
-import useLocalStorageState from 'use-local-storage-state'
-import {
-  createAgent,
-  Space,
-  getCurrentSpace as getCurrentSpaceInAgent,
-  getSpaces,
-  CreateDelegationOptions
-} from '@w3ui/keyring-core'
 import type {
+  Agent,
+  Abilities,
   KeyringContextState,
   KeyringContextActions,
   ServiceConfig,
   RegisterSpaceOpts
 } from '@w3ui/keyring-core'
-import type { Agent } from '@web3-storage/access'
-import type { Abilities } from '@web3-storage/access/types'
-import { authorizeWaitAndClaim } from '@web3-storage/access/agent'
 import type {
   Capability,
   Delegation,
@@ -25,6 +15,17 @@ import type {
   Signer
 } from '@ucanto/interface'
 
+import React, { createContext, useState, useContext } from 'react'
+import useLocalStorageState from 'use-local-storage-state'
+import {
+  authorize as accessAuthorize,
+  createAgent,
+  Space,
+  getCurrentSpace as getCurrentSpaceInAgent,
+  getSpaces,
+  CreateDelegationOptions
+} from '@w3ui/keyring-core'
+
 export { KeyringContextState, KeyringContextActions }
 
 export type KeyringContextValue = [
@@ -100,7 +101,7 @@ export function KeyringProvider ({
     setRegisterAbortController(controller)
 
     try {
-      await authorizeWaitAndClaim(agent, email, { signal: controller.signal })
+      await accessAuthorize(agent, email, { signal: controller.signal })
       // TODO is there other state that needs to be initialized?
       setAccount(email)
       const newSpaces = getSpaces(agent)

diff --git a/packages/w3ui/packages/solid-keyring/package.json b/packages/w3ui/packages/solid-keyring/package.json
@@ -30,8 +30,7 @@
   "dependencies": {
     "@ucanto/interface": "^6.2.0",
     "@ucanto/principal": "^5.1.0",
-    "@w3ui/keyring-core": "workspace:^",
-    "@web3-storage/access": "^11.2.0"
+    "@w3ui/keyring-core": "workspace:^"
   },
   "peerDependencies": {
     "solid-js": "^1.5.0"

diff --git a/packages/w3ui/packages/solid-keyring/src/providers/Keyring.ts b/packages/w3ui/packages/solid-keyring/src/providers/Keyring.ts
@@ -3,11 +3,12 @@ import type {
   KeyringContextState,
   KeyringContextActions,
   ServiceConfig,
-  CreateDelegationOptions
+  CreateDelegationOptions,
+  Agent,
+  Abilities
 } from '@w3ui/keyring-core'
-import type { Agent } from '@web3-storage/access'
-import type { Abilities } from '@web3-storage/access/types'
-import { authorizeWaitAndClaim } from '@web3-storage/access/agent'
+
+import { authorize as accessAuthorize, createAgent, getCurrentSpace as getCurrentSpaceInAgent, getSpaces } from '@w3ui/keyring-core'
 
 import type { Delegation, Capability, DID, Principal } from '@ucanto/interface'
 
@@ -18,7 +19,6 @@ import {
   createComponent
 } from 'solid-js'
 import { createStore } from 'solid-js/store'
-import { createAgent, getCurrentSpace as getCurrentSpaceInAgent, getSpaces } from '@w3ui/keyring-core'
 
 export { KeyringContextState, KeyringContextActions }
 
@@ -95,7 +95,7 @@ export const KeyringProvider: ParentComponent<KeyringProviderProps> = (
     setRegisterAbortController(controller)
 
     try {
-      await authorizeWaitAndClaim(agent, email, { signal: controller.signal })
+      await accessAuthorize(agent, email, { signal: controller.signal })
       // TODO is there other state that needs to be initialized?
       setState('account', email)
       const newSpaces = getSpaces(agent)

diff --git a/packages/w3ui/packages/vue-keyring/package.json b/packages/w3ui/packages/vue-keyring/package.json
@@ -34,8 +34,7 @@
   },
   "devDependencies": {
     "@ucanto/interface": "^6.2.0",
-    "@ucanto/principal": "^5.1.0",
-    "@web3-storage/access": "^11.2.0"
+    "@ucanto/principal": "^5.1.0"
   },
   "eslintConfig": {
     "extends": [

diff --git a/packages/w3ui/packages/vue-keyring/src/providers/Keyring.ts b/packages/w3ui/packages/vue-keyring/src/providers/Keyring.ts
@@ -1,3 +1,10 @@
+import type {
+  Agent,
+  KeyringContextState,
+  KeyringContextActions,
+  ServiceConfig
+} from '@w3ui/keyring-core'
+import type { Capability, DID, Proof } from '@ucanto/interface'
 import {
   defineComponent,
   provide,
@@ -6,16 +13,12 @@ import {
   Ref,
   shallowReactive
 } from 'vue'
-import { createAgent, getCurrentSpace as getCurrentSpaceInAgent, getSpaces } from '@w3ui/keyring-core'
-import type {
-  KeyringContextState,
-  KeyringContextActions,
-  ServiceConfig
+import {
+  authorize as accessAuthorize,
+  createAgent,
+  getCurrentSpace as getCurrentSpaceInAgent,
+  getSpaces
 } from '@w3ui/keyring-core'
-import { authorizeWithSocket } from '@web3-storage/access/agent'
-
-import type { Agent } from '@web3-storage/access'
-import type { Capability, DID, Proof } from '@ucanto/interface'
 
 export { KeyringContextState, KeyringContextActions }
 
@@ -104,7 +107,7 @@ export const KeyringProvider = defineComponent<KeyringProviderProps>({
         registerAbortController = controller
 
         try {
-          await authorizeWithSocket(agent, email, { signal: controller.signal })
+          await accessAuthorize(agent, email, { signal: controller.signal })
           // TODO is there other state that needs to be initialized?
           state.account = email
           const newSpaces = getSpaces(agent)