@verii/server-credentialagent 1.1.0-pre.1764065131 → 1.1.0-pre.1764142377

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/server-credentialagent",
-  "version": "1.1.0-pre.1764065131",
+  "version": "1.1.0-pre.1764142377",
   "description": "Credential Agent application",
   "main": "src/index.js",
   "repository": "https://github.com/LFDT-Verii/core",
@@ -40,31 +40,31 @@
     "@fastify/view": "^11.0.0",
     "@spencejs/spence-factories": "^0.10.2",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@verii/auth": "1.1.0-pre.1764065131",
-    "@verii/base-contract-io": "1.1.0-pre.1764065131",
-    "@verii/blockchain-functions": "1.1.0-pre.1764065131",
-    "@verii/common-fetchers": "1.1.0-pre.1764065131",
-    "@verii/common-functions": "1.1.0-pre.1764065131",
-    "@verii/common-schemas": "1.1.0-pre.1764065131",
-    "@verii/config": "1.1.0-pre.1764065131",
-    "@verii/contract-permissions": "1.1.0-pre.1764065131",
-    "@verii/crypto": "1.1.0-pre.1764065131",
-    "@verii/csv-parser": "1.1.0-pre.1764065131",
-    "@verii/db-kms": "1.1.0-pre.1764065131",
-    "@verii/did-doc": "1.1.0-pre.1764065131",
-    "@verii/fastify-plugins": "1.1.0-pre.1764065131",
-    "@verii/http-client": "1.1.0-pre.1764065131",
-    "@verii/jwt": "1.1.0-pre.1764065131",
-    "@verii/metadata-registration": "1.1.0-pre.1764065131",
-    "@verii/organizations-registry": "1.1.0-pre.1764065131",
-    "@verii/rest-queries": "1.1.0-pre.1764065131",
-    "@verii/server-provider": "1.1.0-pre.1764065131",
-    "@verii/spencer-mongo-extensions": "1.1.0-pre.1764065131",
-    "@verii/test-regexes": "1.1.0-pre.1764065131",
-    "@verii/validation": "1.1.0-pre.1764065131",
-    "@verii/vc-checks": "1.1.0-pre.1764065131",
-    "@verii/verii-issuing": "1.1.0-pre.1764065131",
-    "@verii/verii-verification": "1.1.0-pre.1764065131",
+    "@verii/auth": "1.1.0-pre.1764142377",
+    "@verii/base-contract-io": "1.1.0-pre.1764142377",
+    "@verii/blockchain-functions": "1.1.0-pre.1764142377",
+    "@verii/common-fetchers": "1.1.0-pre.1764142377",
+    "@verii/common-functions": "1.1.0-pre.1764142377",
+    "@verii/common-schemas": "1.1.0-pre.1764142377",
+    "@verii/config": "1.1.0-pre.1764142377",
+    "@verii/contract-permissions": "1.1.0-pre.1764142377",
+    "@verii/crypto": "1.1.0-pre.1764142377",
+    "@verii/csv-parser": "1.1.0-pre.1764142377",
+    "@verii/db-kms": "1.1.0-pre.1764142377",
+    "@verii/did-doc": "1.1.0-pre.1764142377",
+    "@verii/fastify-plugins": "1.1.0-pre.1764142377",
+    "@verii/http-client": "1.1.0-pre.1764142377",
+    "@verii/jwt": "1.1.0-pre.1764142377",
+    "@verii/metadata-registration": "1.1.0-pre.1764142377",
+    "@verii/organizations-registry": "1.1.0-pre.1764142377",
+    "@verii/rest-queries": "1.1.0-pre.1764142377",
+    "@verii/server-provider": "1.1.0-pre.1764142377",
+    "@verii/spencer-mongo-extensions": "1.1.0-pre.1764142377",
+    "@verii/test-regexes": "1.1.0-pre.1764142377",
+    "@verii/validation": "1.1.0-pre.1764142377",
+    "@verii/vc-checks": "1.1.0-pre.1764142377",
+    "@verii/verii-issuing": "1.1.0-pre.1764142377",
+    "@verii/verii-verification": "1.1.0-pre.1764142377",
     "ajv": "8.17.1",
     "canonicalize": "^2.1.0",
     "date-fns": "~4.1.0",
@@ -83,10 +83,10 @@
   },
   "devDependencies": {
     "@spencejs/spence-config": "0.10.2",
-    "@verii/endpoints-organizations-registrar": "1.1.0-pre.1764065131",
-    "@verii/sample-data": "1.1.0-pre.1764065131",
+    "@verii/endpoints-organizations-registrar": "1.1.0-pre.1764142377",
+    "@verii/sample-data": "1.1.0-pre.1764142377",
     "@verii/test-regexes": "0.5.0-build",
-    "@verii/tests-helpers": "1.1.0-pre.1764065131",
+    "@verii/tests-helpers": "1.1.0-pre.1764142377",
     "cheerio": "1.1.2",
     "dotenv": "16.6.1",
     "eslint": "8.57.1",
@@ -107,5 +107,5 @@
     "prettier": "2.8.8",
     "qs": "6.14.0"
   },
-  "gitHead": "22f75261bf2f5fca4d48f4a5473e243a3f5e68e8"
+  "gitHead": "39d0123fb7911d1a2814777ad0e0a25e35bc13c8"
 }

package/src/fetchers/operator/identify-fetcher.js

@@ -18,15 +18,11 @@ const { setAuthHeader } = require('./webhook-auth-header');
 const { handleVendorError } = require('./vendor-errors-handler');
 
 const identifyUserOnVendor = async (payload, context) => {
-  const { tenant, vendorFetch } = context;
-  const { webhookUrl } = tenant;
+  const { vendorFetch } = context;
 
   try {
     const response = await vendorFetch.post('issuing/identify', payload, {
-      ...(webhookUrl ? { prefixUrl: webhookUrl } : {}),
-      headers: {
-        ...setAuthHeader(context),
-      },
+      headers: setAuthHeader(context),
     });
 
     return response.json();

package/src/fetchers/operator/inspection-fetcher.js

@@ -18,19 +18,13 @@ const { setAuthHeader } = require('./webhook-auth-header');
 const { handleVendorError } = require('./vendor-errors-handler');
 
 const sendCredentials = async (vendorEndpoint, payload, context) => {
-  const { tenant, vendorFetch } = context;
-  const { webhookUrl } = tenant;
+  const { vendorFetch } = context;
 
   try {
     const response = await vendorFetch.post(
       `inspection/${vendorEndpoint}`,
       payload,
-      {
-        ...(webhookUrl ? { prefixUrl: webhookUrl } : {}),
-        headers: {
-          ...setAuthHeader(context),
-        },
-      }
+      { headers: setAuthHeader(context) }
     );
 
     const { numProcessed } = await response.json();

package/src/fetchers/operator/issuing-fetcher.js

@@ -18,16 +18,12 @@ const { setAuthHeader } = require('./webhook-auth-header');
 const { handleVendorError } = require('./vendor-errors-handler');
 
 const requestOffersFromVendor = async (payload, context) => {
-  const { tenant, vendorFetch } = context;
-  const { webhookUrl } = tenant;
+  const { vendorFetch } = context;
 
   try {
     return vendorFetch.post('issuing/generate-offers', payload, {
       responseType: 'json',
-      ...(webhookUrl ? { prefixUrl: webhookUrl } : {}),
-      headers: {
-        ...setAuthHeader(context),
-      },
+      headers: setAuthHeader(context),
     });
   } catch (error) {
     handleVendorError(error);
@@ -37,16 +33,12 @@ const requestOffersFromVendor = async (payload, context) => {
 };
 
 const issuedCredentialsNotificationCallback = async (payload, context) => {
-  const { tenant, vendorFetch } = context;
-  const { webhookUrl } = tenant;
+  const { vendorFetch } = context;
 
   try {
     return vendorFetch.post('issuing/receive-issued-credentials', payload, {
       responseType: 'json',
-      ...(webhookUrl ? { prefixUrl: webhookUrl } : {}),
-      headers: {
-        ...setAuthHeader(context),
-      },
+      headers: setAuthHeader(context),
     });
   } catch (error) {
     handleVendorError(error);

package/src/init-holder-server.js

@@ -73,6 +73,10 @@ const initHolderServer = (fastify) => {
         cache: fastify.cache,
         isTest: fastify.config.isTest,
       },
+      requestDecorator: (req) =>
+        req.tenant?.webhookUrl
+          ? fastify.baseVendorFetch(req.tenant.webhookUrl, req)
+          : fastify.baseVendorFetch(req),
     })
     .register(httpClientPlugin, {
       name: 'registrarFetch',

package/src/init-operator-server.js

@@ -66,6 +66,10 @@ const initOperatorServer = (fastify) => {
         cache: fastify.cache,
         isTest: fastify.config.isTest,
       },
+      requestDecorator: (req) =>
+        req.tenant?.webhookUrl
+          ? fastify.baseVendorFetch(req.tenant.webhookUrl, req)
+          : fastify.baseVendorFetch(req),
     })
     .register(httpClientPlugin, {
       name: 'registrarFetch',

package/src/init-server.js

@@ -85,6 +85,10 @@ const initServer = (server) => {
         cache: server.cache,
         isTest: server.config.isTest,
       },
+      requestDecorator: (req) =>
+        req.tenant?.webhookUrl
+          ? server.baseVendorFetch(req.tenant.webhookUrl, req)
+          : server.baseVendorFetch(req),
     })
     .register(httpClientPlugin, {
       name: 'registrarFetch',

package/src/plugins/validate-cao-plugin.js

@@ -34,10 +34,7 @@ async function validateCao() {
     return;
   }
 
-  const registrarFetch = context.baseRegistrarFetch()(
-    context.config.oracleUrl,
-    context
-  );
+  const registrarFetch = context.baseRegistrarFetch(context);
   const caoErrorMessage =
     // eslint-disable-next-line max-len
     'The provided CAO is not permitted to operator on the network. Make sure the organization exists on the registrar and is approved for Credential Agent Operation';