This commit is contained in:
Ronny Bjones 2020-11-13 12:15:22 +00:00
Родитель e90778facd
Коммит 1e837ffd69
11 изменённых файлов: 40 добавлений и 35 удалений

Просмотреть файл

@ -35,7 +35,7 @@
"typescript": "3.9.2"
},
"dependencies": {
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"@types/node": "12.12.16",
"base64url": "^3.0.1",
"clone": "^2.1.2",

Просмотреть файл

@ -36,9 +36,9 @@
"typescript": "3.9.2"
},
"dependencies": {
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.8",
"base64url": "^3.0.1",
"clone": "2.1.2",
"webcrypto-core": "1.1.8"

Просмотреть файл

@ -29,7 +29,7 @@
"elliptic": "6.5.3",
"minimalistic-crypto-utils": "1.0.1",
"sha.js": "^2.4.11",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"webcrypto-core": "1.1.8"
},
"devDependencies": {

Просмотреть файл

@ -39,10 +39,10 @@
"dependencies": {
"@azure/identity": "1.0.0",
"lru-cache": "^5.1.1",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-keyvault": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-keyvault": "1.1.11-preview.8",
"@types/node": "12.12.16",
"webcrypto-core": "1.1.8"
},

Просмотреть файл

@ -47,10 +47,10 @@
"@azure/identity": "1.0.0",
"@azure/keyvault-keys": "4.0.2",
"@azure/keyvault-secrets": "4.0.2",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.8",
"base64url": "3.0.1",
"clone": "2.1.2",
"webcrypto-core": "1.1.8"

Просмотреть файл

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ClientCertificateCredential, ClientSecretCredential, TokenCredential } from '@azure/identity';
import { TokenCredential } from '@azure/identity';
import { KeyClient, JsonWebKey, CryptographyClient } from '@azure/keyvault-keys';
import { SecretClient } from '@azure/keyvault-secrets';
import { KeyStoreOptions, IKeyStore, KeyStoreListItem, KeyReference } from 'verifiablecredentials-crypto-sdk-typescript-keystore';
@ -41,6 +41,11 @@ export default class KeyStoreKeyVault implements IKeyStore {
}
}
private chacheId(keyReference: KeyReference): string {
const reference = keyReference.remoteKeyReference || keyReference.keyReference;
const id = `${keyReference.type}-${reference}-${this.vaultUri}`;
return id;
}
/**
* Returns the key container associated with the specified
@ -48,10 +53,11 @@ export default class KeyStoreKeyVault implements IKeyStore {
* @param keyIdentifier for which to return the key.
* @param [options] Options for retrieving.
*/
public async get(keyReference: KeyReference, options: KeyStoreOptions = new KeyStoreOptions({ extractable: false })): Promise<any> {
public async get(keyReference: KeyReference, options: KeyStoreOptions = new KeyStoreOptions({ extractable: false })): Promise<KeyContainer> {
try {
const client = this.getKeyStoreClient(keyReference.type);
const keyName = keyReference.remoteKeyReference || keyReference.keyReference;
const versionList: any[] = [];
if (keyReference.type === KeyStoreKeyVault.SECRETS) {
// Get extractable secrets

Просмотреть файл

@ -35,8 +35,8 @@
"typescript": "3.9.2"
},
"dependencies": {
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"@peculiar/webcrypto": "1.1.3",
"@types/node": "12.12.16",
"base64url": "^3.0.1",

Просмотреть файл

@ -39,11 +39,11 @@
"typescript": "3.9.2"
},
"dependencies": {
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-protocols-common": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-protocols-common": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.8",
"base64url": "^3.0.1",
"typescript-map": "0.0.7",
"webcrypto-core": "1.1.8"

Просмотреть файл

@ -39,9 +39,9 @@
"typescript": "3.9.2"
},
"dependencies": {
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"base64url": "3.0.1",
"typescript-map": "0.0.7",
"webcrypto-core": "1.1.8"

Просмотреть файл

@ -52,15 +52,15 @@
"jsonld": "2.0.2",
"typescript-map": "0.0.7",
"uuid": "^8.3.1",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-factory": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-plugin-keyvault": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-protocol-jose": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-protocols-common": "1.1.11-preview.7",
"verifiablecredentials-crypto-sdk-typescript-keys": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-keystore": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-cryptofactory-suites": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-elliptic": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-factory": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-plugin-keyvault": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-protocol-jose": "1.1.11-preview.8",
"verifiablecredentials-crypto-sdk-typescript-protocols-common": "1.1.11-preview.8",
"webcrypto-core": "1.1.8"
},
"nyc": {

Просмотреть файл

@ -203,7 +203,6 @@ describe('Jose', () => {
return;
}
const keyReference = new KeyReference(name, 'key');
cryptoKeyVault.builder.useSigningKeyReference(keyReference);
try {
for (let inx = 0; inx < 10; inx++) {