Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Rename Identity to Identifier #308

Merged
merged 18 commits into from
Dec 17, 2020
Merged

refactor: Rename Identity to Identifier #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6606505
refactor: Rename Identity to Identifier
simonas-notcat Dec 17, 2020
65e9479
fix: Integration tests
simonas-notcat Dec 17, 2020
5ca8a7d
refactor: WebDIDProvider
simonas-notcat Dec 17, 2020
14643de
refactor: EthrDIDProvider
simonas-notcat Dec 17, 2020
7270914
refactor: DIDStore
simonas-notcat Dec 17, 2020
73a2211
refactor: Resolver
simonas-notcat Dec 17, 2020
e1abfa3
refactor: DidManagerFind
simonas-notcat Dec 17, 2020
4905ef0
refactor: DidManagerFind
simonas-notcat Dec 17, 2020
4f9611a
refactor: DidManagerGet
simonas-notcat Dec 17, 2020
554794c
refactor: DidManagerCreate
simonas-notcat Dec 17, 2020
49e3bd8
refactor: DidManagerGetOrCreate
simonas-notcat Dec 17, 2020
56aeb57
refactor: DidManagerImport
simonas-notcat Dec 17, 2020
3600ed6
refactor: DidManagerDelete
simonas-notcat Dec 17, 2020
3d2b968
refactor: KeyManager
simonas-notcat Dec 17, 2020
5b11407
refactor: DefaultDID
simonas-notcat Dec 17, 2020
13dd429
refactor: IDIDManager
simonas-notcat Dec 17, 2020
dc3bf07
refactor: IDIDManager
simonas-notcat Dec 17, 2020
4eba10b
refactor: IDIDManager.ts
simonas-notcat Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions __tests__/localAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
createAgent,
TAgent,
IIdentityManager,
IDIDManager,
IResolver,
IKeyManager,
IDataStore,
Expand All @@ -10,13 +10,13 @@ import {
} from '../packages/daf-core/src'
import { MessageHandler } from '../packages/daf-message-handler/src'
import { KeyManager } from '../packages/daf-key-manager/src'
import { IdentityManager } from '../packages/daf-identity-manager/src'
import { DIDManager } from '../packages/daf-identity-manager/src'
import { createConnection, Connection } from 'typeorm'
import { DafResolver } from '../packages/daf-resolver/src'
import { JwtMessageHandler } from '../packages/daf-did-jwt/src'
import { CredentialIssuer, ICredentialIssuer, W3cMessageHandler } from '../packages/daf-w3c/src'
import { EthrIdentityProvider } from '../packages/daf-ethr-did/src'
import { WebIdentityProvider } from '../packages/daf-web-did/src'
import { EthrDIDProvider } from '../packages/daf-ethr-did/src'
import { WebDIDProvider } from '../packages/daf-web-did/src'
import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/daf-did-comm/src'
import {
SelectiveDisclosure,
Expand All @@ -27,7 +27,7 @@ import { KeyManagementSystem, SecretBox } from '../packages/daf-libsodium/src'
import {
Entities,
KeyStore,
IdentityStore,
DIDStore,
IDataStoreORM,
DataStore,
DataStoreORM,
Expand All @@ -47,15 +47,15 @@ import webDidFlow from './shared/webDidFlow'
import saveClaims from './shared/saveClaims'
import documentationExamples from './shared/documentationExamples'
import keyManager from './shared/keyManager'
import identityManager from './shared/identityManager'
import didManager from './shared/didManager'
import messageHandler from './shared/messageHandler'

const databaseFile = 'local-database.sqlite'
const infuraProjectId = '5ffc47f65c4042ce847ef66a3fa70d4c'
const secretKey = '29739248cad1bd1a0fc4d9b75cd4d2990de535baf5caadfdf8d8f86664aa830c'

let agent: TAgent<
IIdentityManager &
IDIDManager &
IKeyManager &
IDataStore &
IDataStoreORM &
Expand All @@ -77,7 +77,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
})

agent = createAgent<
IIdentityManager &
IDIDManager &
IKeyManager &
IDataStore &
IDataStoreORM &
Expand All @@ -98,42 +98,42 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
local: new KeyManagementSystem(),
},
}),
new IdentityManager({
store: new IdentityStore(dbConnection),
new DIDManager({
store: new DIDStore(dbConnection),
defaultProvider: 'did:ethr:rinkeby',
providers: {
'did:ethr': new EthrIdentityProvider({
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
network: 'mainnet',
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
gas: 1000001,
ttl: 60 * 60 * 24 * 30 * 12 + 1,
}),
'did:ethr:rinkeby': new EthrIdentityProvider({
'did:ethr:rinkeby': new EthrDIDProvider({
defaultKms: 'local',
network: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
gas: 1000001,
ttl: 60 * 60 * 24 * 30 * 12 + 1,
}),
'did:web': new WebIdentityProvider({
'did:web': new WebDIDProvider({
defaultKms: 'local',
}),
},
}),
new DafResolver({
new DafResolver({
resolver: new Resolver({
ethr: ethrDidResolver({
...ethrDidResolver({
networks: [
{ name: 'mainnet', rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId },
{ name: 'rinkeby', rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId },
{ name: 'ropsten', rpcUrl: 'https://ropsten.infura.io/v3/' + infuraProjectId },
{ name: 'kovan', rpcUrl: 'https://kovan.infura.io/v3/' + infuraProjectId },
{ name: 'goerli', rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId },
]
}).ethr,
web: webDidResolver().web
})
],
}),
...webDidResolver(),
}),
}),
new DataStore(dbConnection),
new DataStoreORM(dbConnection),
Expand Down Expand Up @@ -171,6 +171,6 @@ describe('Local integration tests', () => {
saveClaims(testContext)
documentationExamples(testContext)
keyManager(testContext)
identityManager(testContext)
didManager(testContext)
messageHandler(testContext)
})
36 changes: 18 additions & 18 deletions __tests__/restAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Agent,
IAgent,
createAgent,
IIdentityManager,
IDIDManager,
IResolver,
IKeyManager,
IDataStore,
Expand All @@ -12,13 +12,13 @@ import {
} from '../packages/daf-core/src'
import { MessageHandler } from '../packages/daf-message-handler/src'
import { KeyManager } from '../packages/daf-key-manager/src'
import { IdentityManager } from '../packages/daf-identity-manager/src'
import { DIDManager } from '../packages/daf-identity-manager/src'
import { createConnection, Connection } from 'typeorm'
import { DafResolver } from '../packages/daf-resolver/src'
import { JwtMessageHandler } from '../packages/daf-did-jwt/src'
import { CredentialIssuer, ICredentialIssuer, W3cMessageHandler } from '../packages/daf-w3c/src'
import { EthrIdentityProvider } from '../packages/daf-ethr-did/src'
import { WebIdentityProvider } from '../packages/daf-web-did/src'
import { EthrDIDProvider } from '../packages/daf-ethr-did/src'
import { WebDIDProvider } from '../packages/daf-web-did/src'
import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/daf-did-comm/src'
import {
SelectiveDisclosure,
Expand All @@ -29,7 +29,7 @@ import { KeyManagementSystem, SecretBox } from '../packages/daf-libsodium/src'
import {
Entities,
KeyStore,
IdentityStore,
DIDStore,
IDataStoreORM,
DataStore,
DataStoreORM,
Expand All @@ -52,7 +52,7 @@ import resolveDid from './shared/resolveDid'
import webDidFlow from './shared/webDidFlow'
import documentationExamples from './shared/documentationExamples'
import keyManager from './shared/keyManager'
import identityManager from './shared/identityManager'
import didManager from './shared/didManager'
import messageHandler from './shared/messageHandler'

const databaseFile = 'rest-database.sqlite'
Expand All @@ -67,7 +67,7 @@ let restServer: Server

const getAgent = (options?: IAgentOptions) =>
createAgent<
IIdentityManager &
IDIDManager &
IKeyManager &
IDataStore &
IDataStoreORM &
Expand All @@ -81,7 +81,7 @@ const getAgent = (options?: IAgentOptions) =>
plugins: [
new AgentRestClient({
url: 'http://localhost:' + port + basePath,
enabledMethods: Object.keys(serverAgent.getSchema().components.methods),
enabledMethods: serverAgent.availableMethods(),
schema: serverAgent.getSchema(),
}),
],
Expand All @@ -105,30 +105,30 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
local: new KeyManagementSystem(),
},
}),
new IdentityManager({
store: new IdentityStore(dbConnection),
new DIDManager({
store: new DIDStore(dbConnection),
defaultProvider: 'did:ethr:rinkeby',
providers: {
'did:ethr': new EthrIdentityProvider({
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
network: 'mainnet',
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
gas: 1000001,
ttl: 60 * 60 * 24 * 30 * 12 + 1,
}),
'did:ethr:rinkeby': new EthrIdentityProvider({
'did:ethr:rinkeby': new EthrDIDProvider({
defaultKms: 'local',
network: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
gas: 1000001,
ttl: 60 * 60 * 24 * 30 * 12 + 1,
}),
'did:web': new WebIdentityProvider({
'did:web': new WebDIDProvider({
defaultKms: 'local',
}),
},
}),
new DafResolver({
new DafResolver({
resolver: new Resolver({
ethr: ethrDidResolver({
networks: [
Expand All @@ -137,10 +137,10 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
{ name: 'ropsten', rpcUrl: 'https://ropsten.infura.io/v3/' + infuraProjectId },
{ name: 'kovan', rpcUrl: 'https://kovan.infura.io/v3/' + infuraProjectId },
{ name: 'goerli', rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId },
]
],
}).ethr,
web: webDidResolver().web
})
web: webDidResolver().web,
}),
}),
new DataStore(dbConnection),
new DataStoreORM(dbConnection),
Expand Down Expand Up @@ -188,6 +188,6 @@ describe('REST integration tests', () => {
webDidFlow(testContext)
documentationExamples(testContext)
keyManager(testContext)
identityManager(testContext)
didManager(testContext)
messageHandler(testContext)
})
Loading