Merge pull request #858 from 3box/release/v1.20.2

release v1.20.2

Author: zachferland

RELEASE-NOTES.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## v1.20.1 - 2020-07-09
+Fixes getting verified accounts (getVerifiedAccounts)
+
+* fix: pass correct ipfs mock to resolve did
+
 ## v1.20.1 - 2020-06-23
 * fix: bump libp2p-pubsub
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "3box",
-  "version": "1.20.1",
+  "version": "1.20.2",
   "description": "Interact with user data",
   "main": "lib/3box.js",
   "directories": {

package.json

@@ -583,7 +583,7 @@ class Box extends BoxApi {
     if (opts.ghostPinbot) {
       ipfs.swarm.connect(opts.ghostPinbot)
     }
-    if (browserHuh && ipfs.libp2p) {
+    if (browserHuh && ipfs.libp2p && !opts.disableRendezvous) {
       ipfs.libp2p.transportManager.listen(multiaddr(RENDEZVOUS_ADDRESS)).catch(console.warn)
     }
     return ipfs

src/3box.js

@@ -11,13 +11,11 @@ const getHttpsResolver = require('https-did-resolver').default
 const PROFILE_SERVER_URL = config.profile_server_url
 
 // Mocks ipfs obj for 3id resolve, to resolve through api, until ipfs instance is available
-const ipfs = (didServerUrl) => {
-  return {
-    dag: {
-      get: async (cid) => {
-        const req = `${didServerUrl}/did-doc?cid=${encodeURIComponent(cid)}`
-        return utils.fetchJson(req)
-      }
+const ipfs = {
+  dag: {
+    get: async (cid) => {
+      const req = `${PROFILE_SERVER_URL}/did-doc?cid=${encodeURIComponent(cid)}`
+      return utils.fetchJson(req)
     }
   }
 }