fix: GetIdentityProviders

examples/expressjs-ethr/src/identity.ts

@@ -8,7 +8,7 @@ export const getIdentity = async () => {
   if (identities.length > 0) {
     identity = identities[0]
   } else {
-    const identityProviders = await core.identityManager.getIdentityProviderTypes()
+    const identityProviders = await core.identityManager.getIdentityProviders()
     identity = await core.identityManager.createIdentity(identityProviders[0].type)
   }
 

examples/react-app/src/App.tsx

@@ -33,7 +33,7 @@ const App: React.FC = () => {
   const [identities, setIdentities] = useState([{ identityProviderType: '', did: '' }])
 
   useEffect(() => {
-    core.identityManager.getIdentityProviderTypes().then((providers: any) => {
+    core.identityManager.getIdentityProviders().then((providers: any) => {
       setIdentityProviders(providers)
     })
   }, [])

examples/react-app/yarn.lock

@@ -3556,56 +3556,56 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-daf-core@../../packages/daf-core, daf-core@^3.0.0:
-  version "3.0.0"
+daf-core@../../packages/daf-core, daf-core@^4.0.0-beta.15+00f0d2f:
+  version "4.0.0-beta.15"
   dependencies:
     blakejs "^1.1.0"
     debug "^4.1.1"
     events "^3.0.0"
     typeorm "^0.2.24"
 
 daf-debug@../../packages/daf-debug:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
 
-daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^3.0.0:
-  version "3.0.0"
+daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^4.0.0-beta.15+00f0d2f:
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     did-resolver "^1.1.0"
 
 daf-ethr-did@../../packages/daf-ethr-did:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     ethjs-provider-signer "^0.1.4"
     ethr-did "^1.1.0"
     js-sha3 "^0.8.0"
 
 daf-libsodium@../../packages/daf-libsodium:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
     base-58 "^0.0.1"
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     elliptic "^6.5.2"
     ethjs-signer "^0.1.1"
     libsodium-wrappers "^0.7.6"
 
 daf-local-storage@../../packages/daf-local-storage:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
 
 daf-resolver@../../packages/daf-resolver:
-  version "3.0.0"
+  version "3.0.1"
   dependencies:
     debug "^4.1.1"
     did-resolver "^1.1.0"
@@ -3614,7 +3614,7 @@ daf-resolver@../../packages/daf-resolver:
     web-did-resolver "^1.2.0"
 
 daf-trust-graph@../../packages/daf-trust-graph:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
     apollo-cache-inmemory "^1.6.3"
     apollo-client "^2.6.4"
@@ -3623,19 +3623,19 @@ daf-trust-graph@../../packages/daf-trust-graph:
     apollo-link-ws "^1.0.19"
     apollo-utilities "^1.3.2"
     cross-fetch "^3.0.4"
-    daf-core "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     graphql "^14.0.0"
     graphql-tag "^2.10.1"
     subscriptions-transport-ws "^0.9.0"
 
 daf-w3c@../../packages/daf-w3c:
-  version "3.0.0"
+  version "4.0.0-beta.15"
   dependencies:
     blakejs "^1.1.0"
-    daf-core "^3.0.0"
-    daf-did-jwt "^3.0.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
+    daf-did-jwt "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt-vc "^0.1.3"
     did-resolver "^1.1.0"

examples/rest-api/index.ts

@@ -12,8 +12,12 @@ app.get('/identities', async (req, res) => {
 })
 
 app.get('/providers', async (req, res) => {
-  const providers = await core.identityManager.getIdentityProviderTypes()
-  res.json(providers)
+  const providers = await core.identityManager.getIdentityProviders()
+  res.json(
+    providers.map(provider => {
+      provider.type, provider.description
+    }),
+  )
 })
 
 app.post('/create-identity', express.json(), async (req, res) => {

examples/send-vc/index.ts

@@ -20,7 +20,7 @@ async function main() {
   if (identities.length > 0) {
     identity = identities[0]
   } else {
-    const identityProviders = await core.identityManager.getIdentityProviderTypes()
+    const identityProviders = await core.identityManager.getIdentityProviders()
     identity = await core.identityManager.createIdentity(identityProviders[0].type)
   }
 

examples/send-vc/yarn.lock

@@ -479,63 +479,63 @@ cross-fetch@^3.0.4:
     node-fetch "2.6.0"
     whatwg-fetch "3.0.0"
 
-daf-core@../../packages/daf-core, daf-core@^2.3.19:
-  version "2.3.19"
+daf-core@../../packages/daf-core, daf-core@^4.0.0-beta.15+00f0d2f:
+  version "4.0.0-beta.15"
   dependencies:
     blakejs "^1.1.0"
     debug "^4.1.1"
     events "^3.0.0"
     typeorm "^0.2.24"
 
 daf-debug@../../packages/daf-debug:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
 
 daf-did-comm@../../packages/daf-did-comm:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     uuid "^3.3.3"
 
-daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.3.19:
-  version "2.3.19"
+daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^4.0.0-beta.15+00f0d2f:
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     did-resolver "^1.1.0"
 
 daf-ethr-did@../../packages/daf-ethr-did:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     ethjs-provider-signer "^0.1.4"
     ethr-did "^1.1.0"
     js-sha3 "^0.8.0"
 
 daf-fs@../../packages/daf-fs:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
 
 daf-libsodium@../../packages/daf-libsodium:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
     base-58 "^0.0.1"
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     elliptic "^6.5.2"
     ethjs-signer "^0.1.1"
     libsodium-wrappers "^0.7.6"
 
 daf-resolver@../../packages/daf-resolver:
-  version "2.3.18"
+  version "3.0.1"
   dependencies:
     debug "^4.1.1"
     did-resolver "^1.1.0"
@@ -544,7 +544,7 @@ daf-resolver@../../packages/daf-resolver:
     web-did-resolver "^1.2.0"
 
 daf-trust-graph@../../packages/daf-trust-graph:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
     apollo-cache-inmemory "^1.6.3"
     apollo-client "^2.6.4"
@@ -553,18 +553,19 @@ daf-trust-graph@../../packages/daf-trust-graph:
     apollo-link-ws "^1.0.19"
     apollo-utilities "^1.3.2"
     cross-fetch "^3.0.4"
-    daf-core "^2.3.19"
+    daf-core "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     graphql "^14.0.0"
     graphql-tag "^2.10.1"
     subscriptions-transport-ws "^0.9.0"
 
 daf-w3c@../../packages/daf-w3c:
-  version "2.3.19"
+  version "4.0.0-beta.15"
   dependencies:
-    daf-core "^2.3.19"
-    daf-did-jwt "^2.3.19"
+    blakejs "^1.1.0"
+    daf-core "^4.0.0-beta.15+00f0d2f"
+    daf-did-jwt "^4.0.0-beta.15+00f0d2f"
     debug "^4.1.1"
     did-jwt-vc "^0.1.3"
     did-resolver "^1.1.0"

packages/daf-cli/src/identity-manager.ts

@@ -18,7 +18,11 @@ program
   .option('--decrypt', 'Decrypt data')
   .action(async cmd => {
     if (cmd.types) {
-      const list = await core.identityManager.getIdentityProviderTypes()
+      const providers = await core.identityManager.getIdentityProviders()
+      const list = providers.map(provider => ({
+        type: provider.type,
+        description: provider.description,
+      }))
 
       if (list.length > 0) {
         printTable(list)
@@ -40,13 +44,16 @@ program
 
     if (cmd.create) {
       try {
-        const types = await core.identityManager.getIdentityProviderTypes()
+        const providers = await core.identityManager.getIdentityProviders()
 
         const answers = await inquirer.prompt([
           {
             type: 'list',
             name: 'type',
-            choices: types.map(item => ({ name: `${item.type} - ${item.description}`, value: item.type })),
+            choices: providers.map(provider => ({
+              name: `${provider.type} - ${provider.description}`,
+              value: provider.type,
+            })),
             message: 'Select identity provider',
           },
         ])
@@ -229,7 +236,7 @@ program
 
     if (cmd.import) {
       try {
-        const providers = await core.identityManager.getIdentityProviderTypes()
+        const providers = await core.identityManager.getIdentityProviders()
 
         const answers = await inquirer.prompt([
           {

packages/daf-core/src/graphql/graphql-identity-manager.ts

@@ -6,14 +6,14 @@ export interface Context {
 }
 
 const identityProviders = async (_: any, args: any, ctx: Context) => {
-  return await ctx.core.identityManager.getIdentityProviderTypes()
+  return await ctx.core.identityManager.getIdentityProviders()
 }
 
 const managedIdentities = async (_: any, args: any, ctx: Context) => {
   const list = await ctx.core.identityManager.getIdentities()
   return list.map((identity: AbstractIdentity) => ({
     did: identity.did,
-    type: identity.identityProviderType,
+    provider: identity.identityProviderType,
     __typename: 'Identity',
   }))
 }
@@ -33,7 +33,7 @@ const createIdentity = async (
   const identity = await ctx.core.identityManager.createIdentity(args.type)
   return {
     did: identity.did,
-    type: identity.identityProviderType,
+    provider: identity.identityProviderType,
     __typename: 'Identity',
   }
 }
@@ -60,7 +60,7 @@ const importIdentity = async (
   const identity = await ctx.core.identityManager.importIdentity(args.type, args.secret)
   return {
     did: identity.did,
-    type: identity.identityProviderType,
+    provider: identity.identityProviderType,
     __typename: 'Identity',
   }
 }
@@ -113,7 +113,6 @@ export const typeDefs = `
   }
 
   extend type Identity {
-    type: String
     isManaged: Boolean!
   }
   

packages/daf-core/src/identity/identity-manager.ts

@@ -12,11 +12,8 @@ export class IdentityManager {
     this.identityProviders = options.identityProviders
   }
 
-  async getIdentityProviderTypes(): Promise<{ type: string; description: string }[]> {
-    return this.identityProviders.map(provider => ({
-      type: provider.type,
-      description: provider.description,
-    }))
+  async getIdentityProviders(): Promise<AbstractIdentityProvider[]> {
+    return this.identityProviders
   }
 
   async getIdentityProvider(type: string): Promise<AbstractIdentityProvider> {