fix: Optional dependency of daf-elem-did

decentralized-identity · May 13, 2020 · 8c733b8 · 8c733b8
1 parent 747b8f9
commit 8c733b8
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 43 deletions.
diff --git a/packages/daf-cli/default/config.js b/packages/daf-cli/default/config.js
@@ -23,40 +23,40 @@ module.exports = {
       package: 'daf-ethr-did',
       network: 'private',
       rpcUrl: 'http://localhost:8545/',
-      registry: '0x05cc574b19a3c11308f761b3d7263bd8608bc532'
-    },
-    {
-      package: 'daf-elem-did',
-      network: 'ropsten',
-      apiUrl: 'https://element-did.com/api/v1/sidetree',
+      registry: '0x05cc574b19a3c11308f761b3d7263bd8608bc532',
     },
+    // {
+    //   package: 'daf-elem-did',
+    //   network: 'ropsten',
+    //   apiUrl: 'https://element-did.com/api/v1/sidetree',
+    // },
   ],
   ethrDidNetworks: [
     {
       name: 'mainnet',
-      rpcUrl: 'https://mainnet.infura.io/v3/' + process.env.DAF_INFURA_ID
+      rpcUrl: 'https://mainnet.infura.io/v3/' + process.env.DAF_INFURA_ID,
     },
     {
       name: 'rinkeby',
-      rpcUrl: 'https://rinkeby.infura.io/v3/' + process.env.DAF_INFURA_ID
+      rpcUrl: 'https://rinkeby.infura.io/v3/' + process.env.DAF_INFURA_ID,
     },
     {
       name: 'ropsten',
-      rpcUrl: 'https://ropsten.infura.io/v3/' + process.env.DAF_INFURA_ID
+      rpcUrl: 'https://ropsten.infura.io/v3/' + process.env.DAF_INFURA_ID,
     },
     {
       name: 'kovan',
-      rpcUrl: 'https://kovan.infura.io/v3/' + process.env.DAF_INFURA_ID
+      rpcUrl: 'https://kovan.infura.io/v3/' + process.env.DAF_INFURA_ID,
     },
     {
       name: 'goerli',
-      rpcUrl: 'https://goerli.infura.io/v3/' + process.env.DAF_INFURA_ID
+      rpcUrl: 'https://goerli.infura.io/v3/' + process.env.DAF_INFURA_ID,
     },
     {
       name: 'private',
       rpcUrl: 'http://localhost:8545/',
-      registry: '0x05cc574b19a3c11308f761b3d7263bd8608bc532'
-    }
+      registry: '0x05cc574b19a3c11308f761b3d7263bd8608bc532',
+    },
   ],
   // https://typeorm.io/#/connection-options
   database: {
@@ -67,13 +67,13 @@ module.exports = {
     migrationsRun: true,
   },
   graphql: {
-    apiKey: process.env.DAF_GRAPHQL_API_KEY, 
+    apiKey: process.env.DAF_GRAPHQL_API_KEY,
     resolvers: {
       IdentityManager: true,
       TrustGraph: false,
       DIDComm: true,
       W3c: true,
       Sdr: true,
-    }
-  }
-}
+    },
+  },
+}
diff --git a/packages/daf-cli/package.json b/packages/daf-cli/package.json
@@ -18,7 +18,6 @@
     "daf-core": "^5.5.0",
     "daf-did-comm": "^5.5.0",
     "daf-did-jwt": "^5.5.0",
-    "daf-elem-did": "^5.5.0",
     "daf-ethr-did": "^5.5.0",
     "daf-fs": "^5.5.0",
     "daf-libsodium": "^5.5.0",
@@ -48,6 +47,9 @@
     "@types/ws": "^6.0.3",
     "typescript": "^3.8.3"
   },
+  "peerDependencies": {
+    "daf-elem-did": "^5.5.0"
+  },
   "files": [
     "bin/**/*",
     "build/**/*",

diff --git a/packages/daf-cli/src/setup.ts b/packages/daf-cli/src/setup.ts
@@ -4,7 +4,6 @@ import { DafUniversalResolver } from 'daf-resolver-universal'
 import * as Daf from 'daf-core'
 import { JwtMessageHandler } from 'daf-did-jwt'
 import * as EthrDid from 'daf-ethr-did'
-import * as ElemDid from 'daf-elem-did'
 import { KeyManagementSystem, SecretBox } from 'daf-libsodium'
 
 import { W3cActionHandler, W3cMessageHandler } from 'daf-w3c'
@@ -68,26 +67,41 @@ const setupAgent = async (): Promise<Daf.Agent> => {
   const identityProviders: Daf.AbstractIdentityProvider[] = []
 
   for (const identityProviderConfig of configuration.identityProviders) {
-    switch(identityProviderConfig.package) {
+    switch (identityProviderConfig.package) {
       case 'daf-ethr-did':
-        identityProviders.push(new EthrDid.IdentityProvider({
-          identityStore: new Daf.IdentityStore(identityProviderConfig.package + identityProviderConfig.network, dbConnection),
-          kms: new KeyManagementSystem(new Daf.KeyStore(dbConnection, new SecretBox(process.env.DAF_SECRET_KEY))),
-          network: identityProviderConfig.network,
-          rpcUrl: identityProviderConfig.rpcUrl,
-          gas: identityProviderConfig.gas,
-          ttl: identityProviderConfig.ttl,
-          registry: identityProviderConfig.registry
-        }))
-      break
+        identityProviders.push(
+          new EthrDid.IdentityProvider({
+            identityStore: new Daf.IdentityStore(
+              identityProviderConfig.package + identityProviderConfig.network,
+              dbConnection,
+            ),
+            kms: new KeyManagementSystem(
+              new Daf.KeyStore(dbConnection, new SecretBox(process.env.DAF_SECRET_KEY)),
+            ),
+            network: identityProviderConfig.network,
+            rpcUrl: identityProviderConfig.rpcUrl,
+            gas: identityProviderConfig.gas,
+            ttl: identityProviderConfig.ttl,
+            registry: identityProviderConfig.registry,
+          }),
+        )
+        break
       case 'daf-elem-did':
-        identityProviders.push(new ElemDid.IdentityProvider({
-          identityStore: new Daf.IdentityStore(identityProviderConfig.package + identityProviderConfig.network, dbConnection),
-          kms: new KeyManagementSystem(new Daf.KeyStore(dbConnection, new SecretBox(process.env.DAF_SECRET_KEY))),
-          apiUrl: identityProviderConfig.apiUrl,
-          network: identityProviderConfig.network
-        }))
-      break
+        const ElemDid = require('daf-elem-did')
+        identityProviders.push(
+          new ElemDid.IdentityProvider({
+            identityStore: new Daf.IdentityStore(
+              identityProviderConfig.package + identityProviderConfig.network,
+              dbConnection,
+            ),
+            kms: new KeyManagementSystem(
+              new Daf.KeyStore(dbConnection, new SecretBox(process.env.DAF_SECRET_KEY)),
+            ),
+            apiUrl: identityProviderConfig.apiUrl,
+            network: identityProviderConfig.network,
+          }),
+        )
+        break
     }
   }
 

diff --git a/packages/daf-elem-did/package.json b/packages/daf-elem-did/package.json
@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "@transmute/element-lib": "^0.7.4",
-    "@types/webassembly-js-api": "^0.0.2",
     "daf-core": "^5.5.0",
     "debug": "^4.1.1",
     "ethjs-provider-signer": "^0.1.4"

diff --git a/yarn.lock b/yarn.lock
@@ -2274,11 +2274,6 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.8.tgz#4ba887fcef88bd9a7515ca2de336d691e3e18318"
   integrity sha512-zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA==
 
-"@types/webassembly-js-api@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@types/webassembly-js-api/-/webassembly-js-api-0.0.2.tgz#43a04bd75fa20332133c6c3986156bfeb4a3ced7"
-  integrity sha512-htlxJRag6RUiMYUkS8Fjup+TMHO0VarpiF9MrqYaGJ0wXtIraQFz40rfA8VIeCiWy8sgpv3RLmigpgicG8fqGA==
-
 "@types/ws@^6.0.0", "@types/ws@^6.0.3":
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1"