chore: address #64; add base58 <-> jwk conversion helpers

transmute-industries · Feb 6, 2021 · 809e1c2 · 809e1c2
1 parent d9f3183
commit 809e1c2
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/packages/secp256k1/src/ES256K-R.ts b/packages/secp256k1/src/ES256K-R.ts
@@ -10,7 +10,7 @@ export const sign = async (
   payload: any,
   privateKeyJwk: any,
   header: any = { alg: 'ES256K-R' }
-):Promise<string> => {
+): Promise<string> => {
   const privateKeyUInt8Array = await privateKeyUInt8ArrayFromJwk(privateKeyJwk);
 
   const encodedHeader = base64url.encode(JSON.stringify(header));
@@ -34,7 +34,10 @@ export const sign = async (
   return `${encodedHeader}.${encodedPayload}.${encodedSignature}`;
 };
 
-export const verify = async (jws: string, publicKeyJwk: any):Promise<boolean> => {
+export const verify = async (
+  jws: string,
+  publicKeyJwk: any
+): Promise<boolean> => {
   const publicKeyUInt8Array = await publicKeyUInt8ArrayFromJwk(publicKeyJwk);
   const [encodedHeader, encodedPayload, encodedSignature] = jws.split('.');
 
@@ -70,7 +73,7 @@ export const signDetached = async (
     b64: false,
     crit: ['b64'],
   }
-):Promise<string>  => {
+): Promise<string> => {
   const privateKeyUInt8Array = await privateKeyUInt8ArrayFromJwk(privateKeyJwk);
   const encodedHeader = base64url.encode(JSON.stringify(header));
   const toBeSignedBuffer = Buffer.concat([

diff --git a/packages/secp256k1/src/ES256K.ts b/packages/secp256k1/src/ES256K.ts
@@ -117,7 +117,7 @@ export const sign = async (
   payload: any,
   privateKeyJwk: ISecp256k1PrivateKeyJwk,
   header: IJWSHeader = { alg: 'ES256K' }
-):  Promise<string> => {
+): Promise<string> => {
   const privateKeyUInt8Array = await privateKeyUInt8ArrayFromJwk(privateKeyJwk);
 
   const encodedHeader = base64url.encode(JSON.stringify(header));
@@ -168,8 +168,6 @@ export const verify = async (
   );
 
   return verified;
-
-
 };
 
 /** decode a JWS (without verifying it) */

diff --git a/packages/secp256k1/src/__tests__/jose.santity.test.ts b/packages/secp256k1/src/__tests__/jose.santity.test.ts
@@ -37,7 +37,6 @@ it('interop', async () => {
       );
       expect(ourVerificationOfTheirs).toEqual(true);
     } catch (e) {
-
       errorCount++;
     }
     count++;

diff --git a/packages/secp256k1/src/keyUtils.test.ts b/packages/secp256k1/src/keyUtils.test.ts
@@ -62,3 +62,30 @@ describe('publicKeyHexFromJwk', () => {
     );
   });
 });
+
+
+describe('publicKeyJwkFromPublicKeyBase58', () => {
+  it('should convert a publicKeyBase58 to a publicKeyJwk', async () => {
+    const _publicKeyJwk = await keyUtils.publicKeyJwkFromPublicKeyBase58(
+      example.keypair['application/did+ld+json'].publicKeyBase58
+    );
+    delete _publicKeyJwk.kid;
+    expect(_publicKeyJwk).toEqual(
+      example.keypair['application/did+json'].publicKeyJwk
+    );
+  });
+});
+
+
+describe('privateKeyJwkFromPrivateKeyBase58', () => {
+  it('should convert a privateKeyBase58 to a privateKeyJwk', async () => {
+    const _privateKeyJwk = await keyUtils.privateKeyJwkFromPrivateKeyBase58(
+      example.keypair['application/did+ld+json'].privateKeyBase58
+    );
+    delete _privateKeyJwk.kid;
+    expect(_privateKeyJwk).toEqual(
+      example.keypair['application/did+json'].privateKeyJwk
+    );
+  });
+});
+
diff --git a/packages/secp256k1/src/keyUtils.ts b/packages/secp256k1/src/keyUtils.ts
@@ -211,3 +211,14 @@ export const publicKeyHexFromPrivateKeyHex = (privateKeyHex: string) => {
   );
   return Buffer.from(publicKey).toString('hex');
 };
+
+
+export const publicKeyJwkFromPublicKeyBase58 = (publicKeybase58: string)=>{
+  return publicKeyJwkFromPublicKeyHex(bs58.decode(publicKeybase58).toString('hex'));
+}
+
+export const privateKeyJwkFromPrivateKeyBase58 = (privateKeyBase58: string)=>{
+  return privateKeyJwkFromPrivateKeyHex(bs58.decode(privateKeyBase58).toString('hex'));
+}
+
+