Merge branch 'main' into pow

* main: Removed the need for createProfile()
decentralized-identity · Jan 3, 2024 · b303da4 · b303da4
2 parents 0ddefcd + 8849a5c
commit b303da4
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 56 deletions.
diff --git a/examples/node/stream-data.js b/examples/node/stream-data.js
@@ -1,16 +1,15 @@
-import { RecordsRead } from '@tbd54566975/dwn-sdk-js';
+import { RecordsRead, DidKeyResolver } from '@tbd54566975/dwn-sdk-js';
 
 import fetch from 'node-fetch';
 import { v4 as uuidv4 } from 'uuid';
 
 import { createJsonRpcRequest } from '../../dist/src/lib/json-rpc.js';
 import {
-  createProfile,
   createRecordsWriteMessage,
   getFileAsReadStream,
 } from '../../dist/tests/utils.js';
 
-const alice = await createProfile();
+const alice = await DidKeyResolver();
 const { stream, size, cid } = await getFileAsReadStream('fixtures/test.jpeg');
 const { recordsWrite } = await createRecordsWriteMessage(alice, {
   dataCid: cid,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "url": "https://github.com/TBD54566975/dwn-server/issues"
   },
   "dependencies": {
-    "@tbd54566975/dwn-sdk-js": "0.2.9",
+    "@tbd54566975/dwn-sdk-js": "0.2.10",
     "@tbd54566975/dwn-sql-store": "0.2.5",
     "better-sqlite3": "^8.5.0",
     "body-parser": "^1.20.2",

diff --git a/tests/dwn-process-message.spec.ts b/tests/dwn-process-message.spec.ts
@@ -1,15 +1,17 @@
+import { DidKeyResolver } from '@tbd54566975/dwn-sdk-js';
+
 import { expect } from 'chai';
 import { v4 as uuidv4 } from 'uuid';
 
 import { handleDwnProcessMessage } from '../src/json-rpc-handlers/dwn/process-message.js';
 import type { RequestContext } from '../src/lib/json-rpc-router.js';
 import { createJsonRpcRequest } from '../src/lib/json-rpc.js';
 import { getTestDwn } from './test-dwn.js';
-import { createProfile, createRecordsWriteMessage } from './utils.js';
+import { createRecordsWriteMessage } from './utils.js';
 
 describe('handleDwnProcessMessage', function () {
   it('returns a JSON RPC Success Response when DWN returns a 2XX status code', async function () {
-    const alice = await createProfile();
+    const alice = await DidKeyResolver.generate();
 
     // Construct a well-formed DWN Request that will be successfully processed.
     const { recordsWrite, dataStream } = await createRecordsWriteMessage(alice);

diff --git a/tests/http-api.spec.ts b/tests/http-api.spec.ts
@@ -2,6 +2,7 @@
 import {
   Cid,
   DataStream,
+  DidKeyResolver,
   RecordsQuery,
   RecordsRead,
   Time,
@@ -32,7 +33,6 @@ import type { RegisteredTenantGate } from '../src/registered-tenant-gate.js';
 import { getTestDwn } from './test-dwn.js';
 import type { Profile } from './utils.js';
 import {
-  createProfile,
   createRecordsWriteMessage,
   getFileAsReadStream,
   streamHttpRequest,
@@ -65,7 +65,7 @@ describe('http api', function () {
     httpApi = new HttpApi(dwn, tenantGate);
 
     await tenantGate.initialize();
-    profile = await createProfile();
+    profile = await DidKeyResolver.generate();
     await tenantGate.authorizeTenantPOW(profile.did);
     await tenantGate.authorizeTenantTermsOfService(profile.did);
   });
@@ -113,7 +113,7 @@ describe('http api', function () {
         response = generateNonce(5);
       }
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       const submitResponse = await fetch('http://localhost:3000/register/pow', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -171,7 +171,7 @@ describe('http api', function () {
         response = generateNonce(5);
       }
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       const submitResponse = await fetch('http://localhost:3000/register/pow', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -187,10 +187,10 @@ describe('http api', function () {
 
     it('increase complexity as more challenges are completed', async function () {
       for (let i = 1; i <= 60; i++) {
-        tenantGate.authorizeTenantPOW((await createProfile()).did);
+        tenantGate.authorizeTenantPOW((await DidKeyResolver.generate()).did);
       }
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       const challengeResponse = await fetch(
         'http://localhost:3000/register/pow',
       );
@@ -263,7 +263,7 @@ describe('http api', function () {
         response = generateNonce(5);
       }
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       const submitResponse = await fetch('http://localhost:3000/register/pow', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -286,7 +286,7 @@ describe('http api', function () {
         response = generateNonce(5);
       }
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       const submitResponse = await fetch('http://localhost:3000/register/pow', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -301,7 +301,7 @@ describe('http api', function () {
     });
 
     it('rejects tenants that have not accepted the terms of use and have not completed POW', async function () {
-      const unauthorized = await createProfile();
+      const unauthorized = await DidKeyResolver.generate();
       const recordsQuery = await RecordsQuery.create({
         filter: { schema: 'woosa' },
         signer: unauthorized.signer,
@@ -324,7 +324,7 @@ describe('http api', function () {
     });
 
     it('rejects tenants that have accepted the terms of use but not completed POW', async function () {
-      const unauthorized = await createProfile();
+      const unauthorized = await DidKeyResolver.generate();
       await tenantGate.authorizeTenantTermsOfService(unauthorized.did);
       const recordsQuery = await RecordsQuery.create({
         filter: { schema: 'woosa' },
@@ -364,7 +364,7 @@ describe('http api', function () {
       const hash = createHash('sha256');
       hash.update(terms);
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
 
       const acceptResponse = await fetch(
         'http://localhost:3000/register/terms-of-service',
@@ -403,7 +403,7 @@ describe('http api', function () {
     });
 
     it('rejects tenants that have completed POW but have not accepted the terms of use', async function () {
-      const unauthorized = await createProfile();
+      const unauthorized = await DidKeyResolver.generate();
       await tenantGate.authorizeTenantPOW(unauthorized.did);
       const recordsQuery = await RecordsQuery.create({
         filter: { schema: 'woosa' },
@@ -430,7 +430,7 @@ describe('http api', function () {
       const hash = createHash('sha256');
       hash.update('i do not agree');
 
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
 
       const acceptResponse = await fetch(
         'http://localhost:3000/register/terms-of-service',
@@ -618,7 +618,7 @@ describe('http api', function () {
     });
 
     it('handles RecordsWrite overwrite that does not mutate data', async function () {
-      const p = await createProfile();
+      const p = await DidKeyResolver.generate();
       await tenantGate.authorizeTenantPOW(p.did);
       await tenantGate.authorizeTenantTermsOfService(p.did);
 
@@ -899,7 +899,7 @@ describe('http api', function () {
     });
 
     it('returns a 404 for invalid or unauthorized did', async function () {
-      const unauthorized = await createProfile();
+      const unauthorized = await DidKeyResolver.generate();
       const { recordsWrite } = await createRecordsWriteMessage(unauthorized);
 
       const response = await fetch(

diff --git a/tests/utils.ts b/tests/utils.ts
@@ -1,11 +1,5 @@
 import type { PrivateJwk, PublicJwk, Signer } from '@tbd54566975/dwn-sdk-js';
-import {
-  Cid,
-  DataStream,
-  DidKeyResolver,
-  PrivateKeySigner,
-  RecordsWrite,
-} from '@tbd54566975/dwn-sdk-js';
+import { Cid, DataStream, RecordsWrite } from '@tbd54566975/dwn-sdk-js';
 
 import { createHash } from 'crypto';
 import type { ReadStream } from 'node:fs';
@@ -29,23 +23,6 @@ export type Profile = {
   signer: Signer;
 };
 
-export async function createProfile(): Promise<Profile> {
-  const { did, keyPair, keyId } = await DidKeyResolver.generate();
-
-  // signer is required by all dwn message classes. it's used to sign messages
-  const signer = new PrivateKeySigner({
-    privateJwk: keyPair.privateJwk,
-    algorithm: keyPair.privateJwk.alg,
-    keyId: `${did}#${keyId}`,
-  });
-
-  return {
-    did,
-    keyPair,
-    signer,
-  };
-}
-
 export type CreateRecordsWriteOverrides =
   | ({
       dataCid?: string;

diff --git a/tests/ws-api.spec.ts b/tests/ws-api.spec.ts
@@ -1,4 +1,4 @@
-import { DataStream } from '@tbd54566975/dwn-sdk-js';
+import { DataStream, DidKeyResolver } from '@tbd54566975/dwn-sdk-js';
 
 import { expect } from 'chai';
 import { base64url } from 'multiformats/bases/base64';
@@ -12,11 +12,7 @@ import {
 } from '../src/lib/json-rpc.js';
 import { WsApi } from '../src/ws-api.js';
 import { getTestDwn } from './test-dwn.js';
-import {
-  createProfile,
-  createRecordsWriteMessage,
-  sendWsMessage,
-} from './utils.js';
+import { createRecordsWriteMessage, sendWsMessage } from './utils.js';
 
 let server: http.Server;
 let wsServer: WebSocketServer;
@@ -57,7 +53,7 @@ describe('websocket api', function () {
   });
 
   it('handles RecordsWrite messages', async function () {
-    const alice = await createProfile();
+    const alice = await DidKeyResolver.generate();
 
     const { recordsWrite, dataStream } = await createRecordsWriteMessage(alice);
     const dataBytes = await DataStream.toBytes(dataStream);