@velocitycareerlabs/server-careerwallet 1.25.0-dev-build.1a3bc076a → 1.25.0-dev-build.13b0fa707

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-careerwallet",
-  "version": "1.25.0-dev-build.1a3bc076a",
+  "version": "1.25.0-dev-build.13b0fa707",
   "description": "Career Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -40,13 +40,13 @@
     "@velocitycareerlabs/did-doc": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/fastify-plugins": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/jwt": "1.25.0-dev-build.1c2d6340d",
-    "@velocitycareerlabs/migrations": "1.25.0-dev-build.1a3bc076a",
+    "@velocitycareerlabs/migrations": "1.25.0-dev-build.13b0fa707",
     "@velocitycareerlabs/organizations-registry": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/request": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/server-provider": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/spencer-mongo-extensions": "1.25.0-dev-build.1c2d6340d",
     "@velocitycareerlabs/verifiable-credentials": "1.25.0-dev-build.1c2d6340d",
-    "@velocitycareerlabs/yoti-integration-plugin": "1.25.0-dev-build.1a3bc076a",
+    "@velocitycareerlabs/yoti-integration-plugin": "1.25.0-dev-build.13b0fa707",
     "aws-sdk": "2.1692.0",
     "canonicalize": "^2.0.0",
     "date-fns": "^3.0.0",
@@ -62,6 +62,7 @@
     "uuid": "11.0.5"
   },
   "devDependencies": {
+    "@aws-sdk/client-kms": "3.774.0",
     "@aws-sdk/client-ses": "3.758.0",
     "@aws-sdk/client-sns": "3.758.0",
     "@spencejs/spence-factories": "0.10.2",
@@ -82,5 +83,5 @@
     "nodemon": "3.1.9",
     "prettier": "2.8.8"
   },
-  "gitHead": "278e4f6733604772cf68501a4d4b01db7ecfda56"
+  "gitHead": "f5b5a15174feab9d1de5263508b5fc66e3c52f1e"
 }

package/src/config/config.js

@@ -51,6 +51,7 @@ const sharedConfig = {
   enableSentryDebug: env.get('ENABLE_SENTRY_DEBUG').default('false').asBool(),
   customFastifyOptions: {
     http2: false,
+    bodyLimit: env.get('BODY_LIMIT').default('8388608').asIntPositive(),
   },
   version: packageJson.version,
   allowedCorsOrigins: env.get('ALLOWED_CORS_ORIGINS').default('').asArray(),

package/test/create_did_key-controller.test.js

@@ -1,4 +1,10 @@
-const AWS = require('aws-sdk');
+const {
+  KMSClient,
+  CreateKeyCommand,
+  CreateAliasCommand,
+  DeleteAliasCommand,
+  DecryptCommand,
+} = require('@aws-sdk/client-kms');
 const { ObjectId } = require('mongodb');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { generateKeyPair } = require('@velocitycareerlabs/crypto');
@@ -22,17 +28,21 @@ describe('create_did_key controller test suite', () => {
   let accountId;
 
   beforeAll(async () => {
-    testClient = new AWS.KMS({
-      credentials: new AWS.Credentials('tests-kei-id', 'tests-key'),
+    testClient = new KMSClient({
+      credentials: {
+        accessKeyId: 'tests-key-id',
+        secretAccessKey: 'tests-key',
+      },
       region: 'us-west-1',
       endpoint: 'http://localhost:4566',
     });
-    const createKeyResponse = await testClient.createKey().promise();
-    const createAliasParams = {
-      AliasName: aliasName,
-      TargetKeyId: createKeyResponse.KeyMetadata.Arn,
-    };
-    await testClient.createAlias(createAliasParams).promise();
+    const createKeyResponse = await testClient.send(new CreateKeyCommand());
+    await testClient.send(
+      new CreateAliasCommand({
+        AliasName: aliasName,
+        TargetKeyId: createKeyResponse.KeyMetadata.Arn,
+      })
+    );
     const { publicKey, privateKey: pk } = generateKeyPair({ format: 'jwk' });
     privateKey = pk;
     fastify = await buildFastify({
@@ -73,7 +83,7 @@ describe('create_did_key controller test suite', () => {
   });
 
   afterAll(async () => {
-    await testClient.deleteAlias({ AliasName: aliasName }).promise();
+    await testClient.send(new DeleteAliasCommand({ AliasName: aliasName }));
 
     await mongoDb().collection('keyPair').deleteMany({});
     await mongoDb().collection('accounts').deleteMany({});
@@ -266,11 +276,11 @@ describe('create_did_key controller test suite', () => {
       updatedAt: expect.anything(),
     });
 
-    const decryptResult = await testClient
-      .decrypt({
+    const decryptResult = await testClient.send(
+      new DecryptCommand({
         CiphertextBlob: keyPair.encryptedPrivateKey.buffer,
       })
-      .promise();
+    );
     expect(decryptResult.Plaintext).toBeDefined();
 
     const accounts = await accountRepo.findOne({

package/test/create_jwk-controller.test.js

@@ -1,4 +1,10 @@
-const AWS = require('aws-sdk');
+const {
+  KMSClient,
+  CreateKeyCommand,
+  CreateAliasCommand,
+  DeleteAliasCommand,
+  DecryptCommand,
+} = require('@aws-sdk/client-kms');
 const { ObjectId } = require('mongodb');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { generateKeyPair } = require('@velocitycareerlabs/crypto');
@@ -16,17 +22,21 @@ describe('create_jwk controller test suite', () => {
   let testClient;
 
   beforeAll(async () => {
-    testClient = new AWS.KMS({
-      credentials: new AWS.Credentials('tests-kei-id', 'tests-key'),
+    testClient = new KMSClient({
+      credentials: {
+        accessKeyId: 'tests-key-id',
+        secretAccessKey: 'tests-key',
+      },
       region: 'us-west-1',
       endpoint: 'http://localhost:4566',
     });
-    const createKeyResponse = await testClient.createKey().promise();
-    const createAliasParams = {
-      AliasName: aliasName,
-      TargetKeyId: createKeyResponse.KeyMetadata.Arn,
-    };
-    await testClient.createAlias(createAliasParams).promise();
+    const createKeyResponse = await testClient.send(new CreateKeyCommand());
+    await testClient.send(
+      new CreateAliasCommand({
+        AliasName: aliasName,
+        TargetKeyId: createKeyResponse.KeyMetadata.Arn,
+      })
+    );
     const { publicKey, privateKey } = generateKeyPair({ format: 'jwk' });
     fastify = await buildFastify({
       holderAppServerAccessTokenPublicKey: publicKey,
@@ -59,7 +69,7 @@ describe('create_jwk controller test suite', () => {
   });
 
   afterAll(async () => {
-    await testClient.deleteAlias({ AliasName: aliasName }).promise();
+    await testClient.send(new DeleteAliasCommand({ AliasName: aliasName }));
     await fastify.close();
   });
 
@@ -178,11 +188,11 @@ describe('create_jwk controller test suite', () => {
       updatedAt: expect.anything(),
     });
 
-    const decryptResult = await testClient
-      .decrypt({
+    const decryptResult = await testClient.send(
+      new DecryptCommand({
         CiphertextBlob: keyPair.encryptedPrivateKey.buffer,
       })
-      .promise();
+    );
     expect(decryptResult.Plaintext).toBeDefined();
   });
 });

package/test/feedback-controller.test.js

@@ -1,4 +1,3 @@
-require('aws-sdk');
 const { errorResponseMatcher } = require('@velocitycareerlabs/tests-helpers');
 const buildFastify = require('./helpers/careerwallet-build-fastify');
 

package/test/jwt-controller.test.js

@@ -1,4 +1,11 @@
-const AWS = require('aws-sdk');
+const {
+  KMSClient,
+  CreateKeyCommand,
+  CreateAliasCommand,
+  DeleteAliasCommand,
+  DecryptCommand,
+  EncryptCommand,
+} = require('@aws-sdk/client-kms');
 const { ObjectId } = require('mongodb');
 const { omit } = require('lodash/fp');
 const { nanoid } = require('nanoid');
@@ -74,18 +81,21 @@ describe('JWT Controller Test Suite', () => {
   let publicKey;
 
   beforeAll(async () => {
-    testClient = new AWS.KMS({
-      credentials: new AWS.Credentials('tests-kei-id', 'tests-key'),
+    testClient = new KMSClient({
+      credentials: {
+        accessKeyId: 'tests-key-id',
+        secretAccessKey: 'tests-key',
+      },
       region: 'us-west-1',
       endpoint: 'http://localhost:4566',
     });
-
-    const createKeyResponse = await testClient.createKey().promise();
-    const createAliasParams = {
-      AliasName: aliasName,
-      TargetKeyId: createKeyResponse.KeyMetadata.Arn,
-    };
-    await testClient.createAlias(createAliasParams).promise();
+    const createKeyResponse = await testClient.send(new CreateKeyCommand());
+    await testClient.send(
+      new CreateAliasCommand({
+        AliasName: aliasName,
+        TargetKeyId: createKeyResponse.KeyMetadata.Arn,
+      })
+    );
     ({ publicKey, privateKey: privk } = generateKeyPair({ format: 'jwk' }));
     fastify = await buildFastify({
       holderAppServerAccessTokenPublicKey: publicKey,
@@ -125,7 +135,7 @@ describe('JWT Controller Test Suite', () => {
   });
 
   afterAll(async () => {
-    await testClient.deleteAlias({ AliasName: aliasName }).promise();
+    await testClient.send(new DeleteAliasCommand({ AliasName: aliasName }));
     await fastify.close();
   });
 
@@ -744,11 +754,12 @@ describe('JWT Controller Test Suite', () => {
             curve: 'P-256',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: stringifyJwk(pk),
+            })
+          );
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -817,11 +828,12 @@ describe('JWT Controller Test Suite', () => {
             curve: 'P-256',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: Buffer.from(stringifyJwk(pk), 'utf8'),
+            })
+          );
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -863,15 +875,17 @@ describe('JWT Controller Test Suite', () => {
               _id: keyPairDb._id,
             },
           });
-          const decryptedPrivateKey = await testClient
-            .decrypt({
+          const decryptedPrivateKey = await testClient.send(
+            new DecryptCommand({
               CiphertextBlob: Buffer.from(keyPair.encryptedPrivateKey.buffer),
             })
-            .promise();
+          );
 
           const { payload } = await jwtVerify(
             response.json.compactJwt,
-            jwkFromStringified(decryptedPrivateKey.Plaintext.toString())
+            jwkFromStringified(
+              Buffer.from(decryptedPrivateKey.Plaintext).toString('utf8')
+            )
           );
           expect(payload.abc).toEqual('abv');
         });
@@ -881,11 +895,13 @@ describe('JWT Controller Test Suite', () => {
             curve: 'P-256',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: Buffer.from(stringifyJwk(pk)),
+            })
+          );
+
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -927,15 +943,17 @@ describe('JWT Controller Test Suite', () => {
               _id: keyPairDb._id,
             },
           });
-          const decryptedPrivateKey = await testClient
-            .decrypt({
+          const decryptedPrivateKey = await testClient.send(
+            new DecryptCommand({
               CiphertextBlob: Buffer.from(keyPair.encryptedPrivateKey.buffer),
             })
-            .promise();
+          );
 
           const { payload } = await jwtVerify(
             response.json.compactJwt,
-            jwkFromStringified(decryptedPrivateKey.Plaintext.toString())
+            jwkFromStringified(
+              Buffer.from(decryptedPrivateKey.Plaintext).toString()
+            )
           );
           expect(payload.abc).toEqual('abv');
         });
@@ -955,11 +973,12 @@ describe('JWT Controller Test Suite', () => {
             curve: 'P-256',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: stringifyJwk(pk),
+            })
+          );
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -1019,11 +1038,12 @@ describe('JWT Controller Test Suite', () => {
             curve: 'secp256k1',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: stringifyJwk(pk),
+            })
+          );
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -1073,11 +1093,12 @@ describe('JWT Controller Test Suite', () => {
             curve: 'P-256',
             format: 'jwk',
           });
-          const params = {
-            KeyId: fastify.config.managedAccountsKeyId,
-            Plaintext: stringifyJwk(pk),
-          };
-          const { CiphertextBlob } = await testClient.encrypt(params).promise();
+          const { CiphertextBlob } = await testClient.send(
+            new EncryptCommand({
+              KeyId: fastify.config.managedAccountsKeyId,
+              Plaintext: Buffer.from(stringifyJwk(pk)),
+            })
+          );
           const keyPairDb = await persistKeyPairs({
             encryptedPrivateKey: CiphertextBlob,
             publicKey: pubK,
@@ -1122,14 +1143,16 @@ describe('JWT Controller Test Suite', () => {
               _id: keyPairDb._id,
             },
           });
-          const decryptedPrivateKey = await testClient
-            .decrypt({
+          const decryptedPrivateKey = await testClient.send(
+            new DecryptCommand({
               CiphertextBlob: Buffer.from(keyPair.encryptedPrivateKey.buffer),
             })
-            .promise();
+          );
           const { payload } = await jwtVerify(
             response.json.compactJwt,
-            jwkFromStringified(decryptedPrivateKey.Plaintext.toString())
+            jwkFromStringified(
+              Buffer.from(decryptedPrivateKey.Plaintext).toString()
+            )
           );
           expect(payload.abc).toEqual('abv');
         });