Wes/sync

.github/workflows/e2e-cypress-alt.yml

@@ -1,4 +1,4 @@
-name: E2E Tests Alternate Preferences
+name: E2E Tests (Server) Alternate Preferences
 
 on: pull_request
 
@@ -24,7 +24,7 @@ jobs:
           xpack.security.enabled: false
 
       redis:
-        image: redis
+        image: redis:7.2-alpine
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 20s
@@ -55,16 +55,15 @@ jobs:
         run: |
           ENV_FILE_PATH=./apps/server/.env
           touch ${ENV_FILE_PATH}
+
           # Vars
           echo -e "${{ needs.setup-env.outputs.env_vars }}" >> ${ENV_FILE_PATH}
           echo RESOURCEVERSION="" >> ${ENV_FILE_PATH}
+
           # Secrets (can't load these from another job, due to GH security features)
           echo SOPHTRONAPIUSERID=${{ secrets.SOPHTRON_API_USER_ID }} >> ${ENV_FILE_PATH}
           echo SOPHTRONAPIUSERSECRET=${{ secrets.SOPHTRON_API_USER_SECRET }} >> ${ENV_FILE_PATH}
-          echo MXCLIENTID=${{ secrets.MX_CLIENT_ID }} >> ${ENV_FILE_PATH}
-          echo MXAPISECRET=${{ secrets.MX_API_SECRET }} >> ${ENV_FILE_PATH}
 
-          cat ${ENV_FILE_PATH}
       - name: Cypress run
         uses: cypress-io/github-action@v6
         env:

.github/workflows/e2e-cypress-prod.yml

@@ -1,4 +1,4 @@
-name: E2E Tests Prod
+name: E2E Tests (Server) Prod
 
 on: pull_request
 

.github/workflows/e2e-cypress.yml

@@ -1,4 +1,4 @@
-name: E2E Tests
+name: E2E Tests (Server) General
 
 on: pull_request
 

.github/workflows/unit-tests.yml

@@ -43,11 +43,7 @@ jobs:
           echo SOPHTRONAPIUSERID=testUserId >> ${ENV_FILE_PATH}
           echo SOPHTRONAPIUSERSECRET=testUserSecret >> ${ENV_FILE_PATH}
 
-          echo MXCLIENTID=testClientId >> ${ENV_FILE_PATH}
-          echo MXAPISECRET=testClientSecret >> ${ENV_FILE_PATH}
-
           # Secrets (can't load these from another job, due to GH security features)          
-          cat ${ENV_FILE_PATH}
 
       - name: Run Jest Tests
         run: |

apps/server/cachedDefaults/testData/alternateTestPreferences.json

@@ -1,13 +1,13 @@
 {
   "defaultAggregator": "sophtron",
 
-  "supportedAggregators": ["mx", "sophtron"],
+  "supportedAggregators": ["sophtron"],
 
   "defaultAggregatorVolume": {},
 
   "institutionAggregatorVolumeMap": {},
 
   "hiddenInstitutions": [],
 
-  "recommendedInstitutions": ["a76f5333-8493-42cf-bc86-dcc8a0f17d4c"]
+  "recommendedInstitutions": ["14627498-29cb-4296-a77f-910859eef104"]
 }

apps/server/cypress/e2e/suite1/queryParameters.cy.ts

@@ -1,4 +1,4 @@
-import { JobTypes } from "../../../src/shared/contract";
+import { JobTypes } from "@repo/utils";
 import {
   clickContinue,
   expectConnectionSuccess,

apps/server/cypress/e2e/suite1/testExample.cy.ts

@@ -1,4 +1,4 @@
-import { JobTypes } from "../../../src/shared/contract";
+import { JobTypes } from "@repo/utils";
 import {
   clickContinue,
   expectConnectionSuccess,

apps/server/cypress/e2e/suite2/mx.cy.ts

@@ -1,31 +0,0 @@
-import { JobTypes } from "../../../src/shared/contract";
-import { generateVcDataTests } from "@repo/utils-dev-dependency";
-import { enterMxCredentials, searchAndSelectMx } from "../../shared/utils/mx";
-import {
-  clickContinue,
-  expectConnectionSuccess,
-  refreshAConnection,
-} from "@repo/utils-dev-dependency";
-
-const makeAConnection = async (jobType) => {
-  searchAndSelectMx();
-  enterMxCredentials();
-  clickContinue();
-
-  if ([JobTypes.ALL, JobTypes.VERIFICATION].includes(jobType)) {
-    cy.findByText("Checking").click();
-    clickContinue();
-  }
-  expectConnectionSuccess();
-};
-
-describe("mx aggregator", () => {
-  generateVcDataTests({ makeAConnection });
-
-  it("refreshes an mx connection if given the correct parameters and hides the back button", () => {
-    refreshAConnection({
-      enterCredentials: enterMxCredentials,
-      selectInstitution: searchAndSelectMx,
-    });
-  });
-});

apps/server/cypress/e2e/suite2/sophtron.cy.ts

@@ -1,4 +1,4 @@
-import { JobTypes } from "../../../src/shared/contract";
+import { JobTypes } from "@repo/utils";
 import { generateVcDataTests, visitAgg } from "@repo/utils-dev-dependency";
 import {
   expectConnectionSuccess,

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.0.13-beta",
+  "version": "0.0.14-beta",
   "packageManager": "npm@10.8.2",
   "scripts": {
     "cypress:open": "cypress open --config-file cypress.config.ts",
@@ -32,7 +32,9 @@
     "@repo/utils": "*",
     "@types/crypto-js": "^4.2.2",
     "@types/express": "^4.17.21",
+    "@types/he": "^1.2.3",
     "@types/uuid": "^9.0.8",
+    "@ucp-npm/mx-adapter": "^0.0.16-alpha",
     "@ucp-npm/template-adapter": "*",
     "@ucp-npm/finicity-adapter": "*",
     "assert-browserify": "^2.0.0",
@@ -44,6 +46,7 @@
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "express-rate-limit": "^7.0.2",
+    "he": "^1.2.0",
     "joi": "^17.13.3",
     "js-logger": "^1.6.1",
     "mx-platform-node": "^0.42.0",

apps/server/src/adapterIndex.test.ts

@@ -1,74 +1,50 @@
-import { VCDataTypes } from '@repo/utils'
-import { getAggregatorAdapter, getVC } from './adapterIndex'
-import type { Aggregator } from './adapterSetup'
-import {
-  mxVcAccountsData,
-  mxVcIntegrationAccountsData
-} from './test/testData/mxVcData'
-import { sophtronVcAccountsData } from './test/testData/sophtronVcData'
-import { TEST_EXAMPLE_A_AGGREGATOR_STRING, TestAdapter } from './test-adapter'
-
-const connectionId = 'testConectionId'
-const type = VCDataTypes.ACCOUNTS
-const userId = 'testUserId'
-
-describe('adapterSetup', () => {
-  describe('getVC', () => {
-    it('uses mx integration if the aggregator is mx_int', async () => {
+import { VCDataTypes } from "@repo/utils";
+import { getAggregatorAdapter, getVC } from "./adapterIndex";
+import type { Aggregator } from "./adapterSetup";
+import { sophtronVcAccountsData } from "./test/testData/sophtronVcData";
+import { TEST_EXAMPLE_A_AGGREGATOR_STRING, TestAdapter } from "./test-adapter";
+
+const connectionId = "testConectionId";
+const type = VCDataTypes.ACCOUNTS;
+const userId = "testUserId";
+
+describe("adapterSetup", () => {
+  describe("getVC", () => {
+    it("uses sophtron if the aggregator is sophtron", async () => {
       const response = await getVC({
-        aggregator: 'mx_int',
+        aggregator: "sophtron",
         connectionId,
         type,
-        userId
-      })
+        userId,
+      });
 
-      expect(response).toEqual(mxVcIntegrationAccountsData)
-    })
-    it('uses mx prod if the aggregator is mx', async () => {
-      const response = await getVC({
-        aggregator: 'mx',
-        connectionId,
-        type,
-        userId
-      })
+      expect(response).toEqual(sophtronVcAccountsData);
+    });
 
-      expect(response).toEqual(mxVcAccountsData)
-    })
-    it('uses sophtron if the aggregator is sophtron', async () => {
-      const response = await getVC({
-        aggregator: 'sophtron',
-        connectionId,
-        type,
-        userId
-      })
-
-      expect(response).toEqual(sophtronVcAccountsData)
-    })
-
-    it('throws an error if the aggregator doesnt have a handler', async () => {
+    it("throws an error if the aggregator doesnt have a handler", async () => {
       await expect(
         async () =>
           await getVC({
-            aggregator: 'junk' as Aggregator,
+            aggregator: "junk" as Aggregator,
             connectionId,
             type,
-            userId
-          })
-      ).rejects.toThrow('Unsupported aggregator junk')
-    })
-  })
-
-  describe('getAggregatorAdapter', () => {
-    it('throws an error if its an unsupported aggregator', async () => {
-      expect(() => getAggregatorAdapter('junk' as Aggregator)).toThrow(
-        'Unsupported aggregator junk'
-      )
-    })
-
-    it('returns the testExample widget adapter', () => {
-      const adapter = getAggregatorAdapter(TEST_EXAMPLE_A_AGGREGATOR_STRING)
-
-      expect(adapter).toBeInstanceOf(TestAdapter)
-    })
-  })
-})
+            userId,
+          }),
+      ).rejects.toThrow("Unsupported aggregator junk");
+    });
+  });
+
+  describe("getAggregatorAdapter", () => {
+    it("throws an error if its an unsupported aggregator", async () => {
+      expect(() => getAggregatorAdapter("junk" as Aggregator)).toThrow(
+        "Unsupported aggregator junk",
+      );
+    });
+
+    it("returns the testExample widget adapter", () => {
+      const adapter = getAggregatorAdapter(TEST_EXAMPLE_A_AGGREGATOR_STRING);
+
+      expect(adapter).toBeInstanceOf(TestAdapter);
+    });
+  });
+});