Attempt to fix web5-spec

Signed-off-by: Frank Hinek <[email protected]>
decentralized-identity · Nov 28, 2023 · d6b444d · d6b444d
1 parent 172641e
commit d6b444d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.web5-spec/credentials.ts b/.web5-spec/credentials.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { VerifiableCredential, SignOptions } from '@web5/credentials';
 import { DidKeyMethod, PortableDid } from '@web5/dids';
-import { Ed25519, Jose } from '@web5/crypto';
+import { Ed25519, PrivateKeyJwk } from '@web5/crypto';
 import { paths } from './openapi.js';
 
 type Signer = (data: Uint8Array) => Promise<Uint8Array>;
@@ -24,9 +24,8 @@ export async function credentialIssue(req: Request, res: Response) {
 
     // build signing options
     const [signingKeyPair] = ownDid.keySet.verificationMethodKeys!;
-    const privateKey = (await Jose.jwkToKey({ key: signingKeyPair.privateKeyJwk!})).keyMaterial;
     const subjectIssuerDid = body.credential.credentialSubject["id"] as string;
-    const signer = EdDsaSigner(privateKey);
+    const signer = EdDsaSigner(signingKeyPair.privateKeyJwk as PrivateKeyJwk);
     const signOptions: SignOptions = {
         issuerDid  : ownDid.did,
         subjectDid : subjectIssuerDid,
@@ -51,7 +50,7 @@ export async function credentialIssue(req: Request, res: Response) {
   res.json(resp);
 }
 
-function EdDsaSigner(privateKey: Uint8Array): Signer {
+function EdDsaSigner(privateKey: PrivateKeyJwk): Signer {
     return async (data: Uint8Array): Promise<Uint8Array> => {
         const signature = await Ed25519.sign({ data, key: privateKey});
         return signature;

diff --git a/packages/crypto/src/algorithms-api/aes/base.ts b/packages/crypto/src/algorithms-api/aes/base.ts
@@ -1,10 +1,10 @@
 import type { Web5Crypto } from '../../types/web5-crypto.js';
-import type { JwkOperation, PrivateKeyJwk } from '../../../src/jose.js';
+import type { JwkOperation, PrivateKeyJwk } from '../../jose.js';
 
-import { Jose } from '../../../src/jose.js';
+import { Jose } from '../../jose.js';
+import { InvalidAccessError } from '../errors.js';
 import { checkRequiredProperty } from '../../utils.js';
 import { CryptoAlgorithm } from '../crypto-algorithm.js';
-import { InvalidAccessError } from '../errors.js';
 
 export abstract class BaseAesAlgorithm extends CryptoAlgorithm {
 

diff --git a/packages/crypto/src/algorithms-api/aes/ctr.ts b/packages/crypto/src/algorithms-api/aes/ctr.ts
@@ -1,7 +1,7 @@
 import { universalTypeOf } from '@web5/common';
 
 import type { Web5Crypto } from '../../types/web5-crypto.js';
-import type { JwkOperation, PrivateKeyJwk } from '../../../src/jose.js';
+import type { JwkOperation, PrivateKeyJwk } from '../../jose.js';
 
 import { BaseAesAlgorithm } from './base.js';
 import { OperationError } from '../errors.js';