@dv4resi/dvss-backend-module-offering-im 0.0.22 → 0.0.24

package/dist/index.js

@@ -177,7 +177,7 @@ exports.IntegrationRequestLoggerService = class _IntegrationRequestLoggerService
       integrationId: logData.integrationId,
       method,
       url,
-      headers,
+      headers: this.sanitizeHeaders(headers),
       requestBody,
       timestamp: logData.timestamp || /* @__PURE__ */ new Date()
     });
@@ -232,6 +232,33 @@ exports.IntegrationRequestLoggerService = class _IntegrationRequestLoggerService
       this.logRequest(logData);
     }
   }
+  /**
+   * Sanitize headers to remove sensitive information
+   *
+   * @param headers - The headers to sanitize
+   * @returns Sanitized headers
+   */
+  sanitizeHeaders(headers) {
+    if (!headers) {
+      return void 0;
+    }
+    const sanitized = {
+      ...headers
+    };
+    const sensitiveKeys = [
+      "authorization",
+      "api-key",
+      "apikey",
+      "x-api-key",
+      "cookie"
+    ];
+    for (const key of Object.keys(sanitized)) {
+      if (sensitiveKeys.includes(key.toLowerCase())) {
+        sanitized[key] = "***REDACTED***";
+      }
+    }
+    return sanitized;
+  }
 };
 exports.IntegrationRequestLoggerService = _ts_decorate5([
   common.Injectable(),
@@ -329,7 +356,7 @@ exports.TrafficGatewayService = class TrafficGatewayService {
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorDetails = this.extractErrorDetails(error);
-      const baseUrl = integration.config.platformConfig.baseUrl;
+      const baseUrl = request.baseUrl;
       const fullUrl = this.constructFullUrl(baseUrl, request.url);
       this.requestLogger.logError({
         integrationId: integration.id,
@@ -527,7 +554,7 @@ exports.IntegrationLibsModule = _ts_decorate8([
 // ../../packages/dvss-integration-libs/src/integration-traffic-router/constants/traffic-router.constant.ts
 var TRAFFIC_ROUTER_CONFIGURATION_STORE_KEY = "traffic-router-configuration-store";
 
-// ../../packages/dvss-integration-libs/src/integration-operation-skeletons/capabilities/auth/auth.base.ts
+// ../../packages/dvss-integration-libs/src/integration-operation-skeletons/capabilities/auth-management/auth.base.ts
 var BaseAuth = class {
   static {
     __name(this, "BaseAuth");
@@ -556,6 +583,9 @@ var CREDIT_FILTER_BY_ENUM = /* @__PURE__ */ (function(CREDIT_FILTER_BY_ENUM2) {
 // ../../packages/dvss-integration-libs/src/integration-operation-skeletons/models/capability-integration.model.ts
 var INTEGRATION_PROVIDER_ENUM = /* @__PURE__ */ (function(INTEGRATION_PROVIDER_ENUM2) {
   INTEGRATION_PROVIDER_ENUM2["TRYBE"] = "TRYBE";
+  INTEGRATION_PROVIDER_ENUM2["SUPREMA_BIOSTAR"] = "SUPREMA_BIOSTAR";
+  INTEGRATION_PROVIDER_ENUM2["SALTO_PRO"] = "SALTO_PRO";
+  INTEGRATION_PROVIDER_ENUM2["SCHINDLER"] = "SCHINDLER";
   return INTEGRATION_PROVIDER_ENUM2;
 })({});
 
@@ -818,6 +848,14 @@ exports.BaseIntegrationConfiguration = class BaseIntegrationConfiguration {
       icon: updateData.icon,
       config: configToUpdate,
       parentId: updateData.parentId,
+      propertyId: updateData.propertyId,
+      capabilityId: updateData.capabilityId,
+      providerId: updateData.capabilityProviderId,
+      subcategory: updateData.subcategory,
+      capabilityIntegrationResourceId: updateData.capabilityIntegrationResourceId,
+      groupId: updateData.groupId,
+      status: updateData.status,
+      availableFor: updateData.availableFor,
       updatedBy: loggedInUserId
     };
     return await this.integrationConfigurationDao.updateCapabilityIntegration({
@@ -1207,9 +1245,9 @@ var Table = class Table2 {
   [IsDrizzleTable] = true;
   /** @internal */
   [ExtraConfigBuilder] = void 0;
-  constructor(name, schema5, baseName) {
+  constructor(name, schema8, baseName) {
     this[TableName] = this[OriginalName] = name;
-    this[Schema] = schema5;
+    this[Schema] = schema8;
     this[BaseName] = baseName;
   }
 };
@@ -2185,11 +2223,11 @@ var View = class View2 {
   static [entityKind] = "View";
   /** @internal */
   [ViewBaseConfig];
-  constructor({ name: name2, schema: schema5, selectedFields, query }) {
+  constructor({ name: name2, schema: schema8, selectedFields, query }) {
     this[ViewBaseConfig] = {
       name: name2,
       originalName: name2,
-      schema: schema5,
+      schema: schema8,
       selectedFields,
       query,
       isExisting: !query,
@@ -2545,7 +2583,9 @@ exports.IntegrationConfigurationDao = class IntegrationConfigurationDao2 {
    */
   async updateCapabilityIntegration(input, loggedInUserId) {
     try {
-      this.logger.info(loggedInUserId, this.updateCapabilityIntegration.name, this.fileName, "Updating capability integration");
+      this.logger.info(loggedInUserId, this.updateCapabilityIntegration.name, this.fileName, "Updating capability integration", {
+        input
+      });
       const response = await this.conn.update(dvssBackendModuleDatastore.schema.capabilityIntegration).set({
         ...input.updateData
       }).where(eq(dvssBackendModuleDatastore.schema.capabilityIntegration.id, input.id));
@@ -2791,6 +2831,198 @@ function _ts_param4(paramIndex, decorator) {
   };
 }
 __name(_ts_param4, "_ts_param");
+exports.IntegrationSubcapabilityDao = class IntegrationSubcapabilityDao {
+  static {
+    __name(this, "IntegrationSubcapabilityDao");
+  }
+  conn;
+  logger;
+  fileName = "integration-subcapability.dao";
+  constructor(conn, logger) {
+    this.conn = conn;
+    this.logger = logger;
+  }
+  /**
+   * Returns subcapability id for given capabilityId and subcapability name.
+   * Enforces uniqueness: if more than one active row is found, throws an error.
+   * If no active row is found, returns undefined (caller decides how to handle).
+   */
+  async getSubcapabilityId(input, loggedInUserId) {
+    this.logger.info(loggedInUserId, this.getSubcapabilityId.name, this.fileName, "IntegrationSubcapabilityDao -> getSubcapabilityId called", {
+      input
+    });
+    try {
+      const rows = await this.conn.query.subcapability.findMany({
+        where: and(eq(dvssBackendModuleDatastore.schema.subcapability.capabilityId, input.capabilityId), eq(dvssBackendModuleDatastore.schema.subcapability.name, input.name), isNull(dvssBackendModuleDatastore.schema.subcapability.deletedAt))
+      });
+      if (rows.length === 0) {
+        this.logger.error(loggedInUserId, this.getSubcapabilityId.name, this.fileName, "Subcapability not found for given capabilityId and name", {
+          input
+        });
+        return void 0;
+      }
+      return rows[0].id;
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.getSubcapabilityId.name, this.fileName, "Error in getSubcapabilityId", error, {
+        input
+      });
+      throw error;
+    }
+  }
+};
+exports.IntegrationSubcapabilityDao = _ts_decorate13([
+  common.Injectable(),
+  _ts_param4(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
+  _ts_metadata10("design:type", Function),
+  _ts_metadata10("design:paramtypes", [
+    typeof MySql2Database === "undefined" ? Object : MySql2Database,
+    typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
+  ])
+], exports.IntegrationSubcapabilityDao);
+function _ts_decorate14(decorators, target, key, desc2) {
+  var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate14, "_ts_decorate");
+function _ts_metadata11(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata11, "_ts_metadata");
+function _ts_param5(paramIndex, decorator) {
+  return function(target, key) {
+    decorator(target, key, paramIndex);
+  };
+}
+__name(_ts_param5, "_ts_param");
+exports.IntegrationServiceCommunicationTopicDao = class IntegrationServiceCommunicationTopicDao {
+  static {
+    __name(this, "IntegrationServiceCommunicationTopicDao");
+  }
+  conn;
+  logger;
+  fileName = "integration-service-communication-topic.dao";
+  constructor(conn, logger) {
+    this.conn = conn;
+    this.logger = logger;
+  }
+  /**
+   * Upserts a service communication topic for a given deployment + capability/subcapability/operation.
+   * If a matching topic exists (by deploymentId + capability + subcapability + subcapabilityOperation),
+   * it will be updated; otherwise a new row will be inserted.
+   */
+  async upsertTopic(input, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    this.logger.info(loggedInUserId, this.upsertTopic.name, this.fileName, "IntegrationServiceCommunicationTopicDao -> upsertTopic called", {
+      input
+    });
+    try {
+      const existing = await this.conn.query.serviceCommunicationTopic.findFirst({
+        where: and(
+          eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.deploymentId, input.deploymentId),
+          eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.projectId, input.projectId),
+          isNull(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.deletedAt),
+          ...input.capability ? [
+            eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.capability, input.capability)
+          ] : [],
+          ...input.subcapability ? [
+            eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.subcapability, input.subcapability)
+          ] : [],
+          eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.subcapabilityOperation, input.subcapabilityOperation),
+          ...input.capabilityIntegrationId ? [
+            eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.capabilityIntegrationId, input.capabilityIntegrationId)
+          ] : []
+        )
+      });
+      if (existing) {
+        await this.conn.update(dvssBackendModuleDatastore.schema.serviceCommunicationTopic).set({
+          topicType: input.topicType,
+          topicName: input.topicName,
+          isUniversal: input.isUniversal ?? existing.isUniversal,
+          shouldPublish: input.shouldPublish ?? existing.shouldPublish,
+          shouldSubscribe: input.shouldSubscribe ?? existing.shouldSubscribe,
+          updatedAt: /* @__PURE__ */ new Date(),
+          updatedBy: loggedInUserId
+        }).where(eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.id, existing.id));
+        return {
+          status: true
+        };
+      }
+      await this.conn.insert(dvssBackendModuleDatastore.schema.serviceCommunicationTopic).values({
+        projectId: input.projectId,
+        propertyId: input.propertyId,
+        deploymentId: input.deploymentId,
+        capability: input.capability,
+        subcapability: input.subcapability,
+        subcapabilityOperation: input.subcapabilityOperation,
+        topicType: input.topicType,
+        topicName: input.topicName,
+        isUniversal: input.isUniversal ?? false,
+        shouldPublish: input.shouldPublish ?? false,
+        shouldSubscribe: input.shouldSubscribe ?? true,
+        createdBy: loggedInUserId,
+        capabilityIntegrationId: input.capabilityIntegrationId
+      });
+      return {
+        status: true
+      };
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.upsertTopic.name, this.fileName, "Error in upsertTopic", error, {
+        input
+      });
+      throw error;
+    }
+  }
+  /**
+   * Returns all service communication topics for a given integration.
+   * NOTE: Currently filters by deploymentId using the provided integrationId;
+   * once capabilityIntegrationId is available in the public typings, this can
+   * be updated to filter by that column instead.
+   */
+  async getServiceCommunicationTopics(integrationId, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    this.logger.info(loggedInUserId, this.getServiceCommunicationTopics.name, this.fileName, "IntegrationServiceCommunicationTopicDao -> getServiceCommunicationTopics called", {
+      integrationId
+    });
+    try {
+      const topics = await this.conn.select({
+        ...getTableColumns(dvssBackendModuleDatastore.schema.serviceCommunicationTopic),
+        subcapability: getTableColumns(dvssBackendModuleDatastore.schema.subcapability)
+      }).from(dvssBackendModuleDatastore.schema.serviceCommunicationTopic).innerJoin(dvssBackendModuleDatastore.schema.subcapability, eq(dvssBackendModuleDatastore.schema.subcapability.id, dvssBackendModuleDatastore.schema.serviceCommunicationTopic.subcapability)).where(and(eq(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.capabilityIntegrationId, integrationId), isNull(dvssBackendModuleDatastore.schema.serviceCommunicationTopic.deletedAt)));
+      return topics;
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.getServiceCommunicationTopics.name, this.fileName, "Error in getServiceCommunicationTopics", error, {
+        integrationId
+      });
+      throw error;
+    }
+  }
+};
+exports.IntegrationServiceCommunicationTopicDao = _ts_decorate14([
+  common.Injectable(),
+  _ts_param5(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
+  _ts_metadata11("design:type", Function),
+  _ts_metadata11("design:paramtypes", [
+    typeof MySql2Database === "undefined" ? Object : MySql2Database,
+    typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
+  ])
+], exports.IntegrationServiceCommunicationTopicDao);
+function _ts_decorate15(decorators, target, key, desc2) {
+  var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate15, "_ts_decorate");
+function _ts_metadata12(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata12, "_ts_metadata");
+function _ts_param6(paramIndex, decorator) {
+  return function(target, key) {
+    decorator(target, key, paramIndex);
+  };
+}
+__name(_ts_param6, "_ts_param");
 exports.IntegrationResourceManagementDao = class IntegrationResourceManagementDao {
   static {
     __name(this, "IntegrationResourceManagementDao");
@@ -2952,32 +3184,32 @@ exports.IntegrationResourceManagementDao = class IntegrationResourceManagementDa
     }
   }
 };
-exports.IntegrationResourceManagementDao = _ts_decorate13([
+exports.IntegrationResourceManagementDao = _ts_decorate15([
   common.Injectable(),
-  _ts_param4(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
-  _ts_metadata10("design:type", Function),
-  _ts_metadata10("design:paramtypes", [
+  _ts_param6(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
+  _ts_metadata12("design:type", Function),
+  _ts_metadata12("design:paramtypes", [
     typeof MySql2Database === "undefined" ? Object : MySql2Database,
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
   ])
 ], exports.IntegrationResourceManagementDao);
-function _ts_decorate14(decorators, target, key, desc2) {
+function _ts_decorate16(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate14, "_ts_decorate");
-function _ts_metadata11(k, v) {
+__name(_ts_decorate16, "_ts_decorate");
+function _ts_metadata13(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata11, "_ts_metadata");
-function _ts_param5(paramIndex, decorator) {
+__name(_ts_metadata13, "_ts_metadata");
+function _ts_param7(paramIndex, decorator) {
   return function(target, key) {
     decorator(target, key, paramIndex);
   };
 }
-__name(_ts_param5, "_ts_param");
+__name(_ts_param7, "_ts_param");
 exports.IntegrationUserManagementDao = class IntegrationUserManagementDao {
   static {
     __name(this, "IntegrationUserManagementDao");
@@ -2987,25 +3219,134 @@ exports.IntegrationUserManagementDao = class IntegrationUserManagementDao {
     this.conn = conn;
   }
 };
-exports.IntegrationUserManagementDao = _ts_decorate14([
+exports.IntegrationUserManagementDao = _ts_decorate16([
   common.Injectable(),
-  _ts_param5(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
-  _ts_metadata11("design:type", Function),
-  _ts_metadata11("design:paramtypes", [
+  _ts_param7(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
+  _ts_metadata13("design:type", Function),
+  _ts_metadata13("design:paramtypes", [
     typeof MySql2Database === "undefined" ? Object : MySql2Database
   ])
 ], exports.IntegrationUserManagementDao);
-function _ts_decorate15(decorators, target, key, desc2) {
+function _ts_decorate17(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate15, "_ts_decorate");
-function _ts_metadata12(k, v) {
+__name(_ts_decorate17, "_ts_decorate");
+function _ts_metadata14(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata12, "_ts_metadata");
+__name(_ts_metadata14, "_ts_metadata");
+function _ts_param8(paramIndex, decorator) {
+  return function(target, key) {
+    decorator(target, key, paramIndex);
+  };
+}
+__name(_ts_param8, "_ts_param");
+exports.IntegrationOnpremDeploymentDao = class IntegrationOnpremDeploymentDao {
+  static {
+    __name(this, "IntegrationOnpremDeploymentDao");
+  }
+  conn;
+  logger;
+  fileName = "integration-onprem-deployment.dao";
+  constructor(conn, logger) {
+    this.conn = conn;
+    this.logger = logger;
+  }
+  async addUpdateOnpremDeployment(input, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    try {
+      this.logger.info(loggedInUserId, this.addUpdateOnpremDeployment.name, this.fileName, `IntegrationOnpremDeploymentDao -> addUpdateOnpremDeployment called`, {
+        input
+      });
+      const existingEntry = await this.conn.query.onPremDeployment.findFirst({
+        where: and(eq(dvssBackendModuleDatastore.schema.onPremDeployment.projectId, input.projectId), eq(dvssBackendModuleDatastore.schema.onPremDeployment.capabilityIntegrationId, input.capabilityIntegrationId))
+      });
+      if (existingEntry) {
+        await this.updateOnpremDeployment(existingEntry.id, input, loggedInUserId);
+        return {
+          status: true,
+          id: existingEntry.id
+        };
+      }
+      return this.addOnpremDeployment(input, loggedInUserId);
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.addUpdateOnpremDeployment.name, this.fileName, "Error in addCapabilityIntegration", error, {
+        input
+      });
+      throw error;
+    }
+  }
+  async addOnpremDeployment(input, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    try {
+      const [insertedResult] = await this.conn.insert(dvssBackendModuleDatastore.schema.onPremDeployment).values(input).$returningId();
+      return {
+        status: true,
+        id: BigInt(insertedResult.id)
+      };
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.addOnpremDeployment.name, this.fileName, "Error in addOnpremDeployment", error, {
+        input
+      });
+      throw error;
+    }
+  }
+  async updateOnpremDeployment(id, updateData, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    try {
+      const result = await this.conn.update(dvssBackendModuleDatastore.schema.onPremDeployment).set(updateData).where(eq(dvssBackendModuleDatastore.schema.onPremDeployment.id, id)).execute();
+      return {
+        status: result[0].affectedRows > 0,
+        id
+      };
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.updateOnpremDeployment.name, this.fileName, "Error in updateOnpremDeployment", error, {
+        id,
+        updateData
+      });
+      throw error;
+    }
+  }
+  /**
+   * Gets an on-prem deployment by capability integration id.
+   * Used by Suprema integration to resolve deployment for a given integration.
+   */
+  async getOnpremDeployment(input, loggedInUserId = dvssBackendModuleUtility.SYSTEM_USER_ID) {
+    try {
+      this.logger.info(loggedInUserId, this.getOnpremDeployment.name, this.fileName, "IntegrationOnpremDeploymentDao -> getOnpremDeployment called", {
+        input
+      });
+      return await this.conn.query.onPremDeployment.findFirst({
+        where: and(eq(dvssBackendModuleDatastore.schema.onPremDeployment.projectId, input.projectId), eq(dvssBackendModuleDatastore.schema.onPremDeployment.capabilityIntegrationId, input.integrationId), isNull(dvssBackendModuleDatastore.schema.onPremDeployment.deletedAt))
+      });
+    } catch (error) {
+      this.logger.error(loggedInUserId, this.getOnpremDeployment.name, this.fileName, "Error in getOnpremDeployment", error, {
+        input
+      });
+      throw error;
+    }
+  }
+};
+exports.IntegrationOnpremDeploymentDao = _ts_decorate17([
+  common.Injectable(),
+  _ts_param8(0, common.Inject(dvssBackendModuleDatastore.appConstants.DB_CONNECTION)),
+  _ts_metadata14("design:type", Function),
+  _ts_metadata14("design:paramtypes", [
+    typeof MySql2Database === "undefined" ? Object : MySql2Database,
+    typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
+  ])
+], exports.IntegrationOnpremDeploymentDao);
+function _ts_decorate18(decorators, target, key, desc2) {
+  var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate18, "_ts_decorate");
+function _ts_metadata15(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata15, "_ts_metadata");
 var AppService3 = class {
   static {
     __name(this, "AppService");
@@ -3020,24 +3361,24 @@ var AppService3 = class {
     return "Hello World!";
   }
 };
-AppService3 = _ts_decorate15([
+AppService3 = _ts_decorate18([
   common.Injectable(),
-  _ts_metadata12("design:type", Function),
-  _ts_metadata12("design:paramtypes", [])
+  _ts_metadata15("design:type", Function),
+  _ts_metadata15("design:paramtypes", [])
 ], AppService3);
 
 // ../../packages/dvss-integration-trybe/src/app.controller.ts
-function _ts_decorate16(decorators, target, key, desc2) {
+function _ts_decorate19(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate16, "_ts_decorate");
-function _ts_metadata13(k, v) {
+__name(_ts_decorate19, "_ts_decorate");
+function _ts_metadata16(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata13, "_ts_metadata");
+__name(_ts_metadata16, "_ts_metadata");
 var AppController3 = class {
   static {
     __name(this, "AppController");
@@ -3050,43 +3391,101 @@ var AppController3 = class {
     return this.appService.getHello();
   }
 };
-_ts_decorate16([
+_ts_decorate19([
   common.Get("integration-trybe"),
-  _ts_metadata13("design:type", Function),
-  _ts_metadata13("design:paramtypes", []),
-  _ts_metadata13("design:returntype", String)
+  _ts_metadata16("design:type", Function),
+  _ts_metadata16("design:paramtypes", []),
+  _ts_metadata16("design:returntype", String)
 ], AppController3.prototype, "getHello", null);
-AppController3 = _ts_decorate16([
+AppController3 = _ts_decorate19([
   common.Controller(),
-  _ts_metadata13("design:type", Function),
-  _ts_metadata13("design:paramtypes", [
+  _ts_metadata16("design:type", Function),
+  _ts_metadata16("design:paramtypes", [
     typeof AppService3 === "undefined" ? Object : AppService3
   ])
 ], AppController3);
-function _ts_decorate17(decorators, target, key, desc2) {
+function _ts_decorate20(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate17, "_ts_decorate");
-function _ts_metadata14(k, v) {
+__name(_ts_decorate20, "_ts_decorate");
+function _ts_metadata17(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata14, "_ts_metadata");
+__name(_ts_metadata17, "_ts_metadata");
+function _ts_param9(paramIndex, decorator) {
+  return function(target, key) {
+    decorator(target, key, paramIndex);
+  };
+}
+__name(_ts_param9, "_ts_param");
+exports.TrybeApiClientService = class TrybeApiClientService {
+  static {
+    __name(this, "TrybeApiClientService");
+  }
+  trybeAuthService;
+  trafficGatewayService;
+  constructor(trybeAuthService, trafficGatewayService) {
+    this.trybeAuthService = trybeAuthService;
+    this.trafficGatewayService = trafficGatewayService;
+  }
+  /**
+   * Validates the integration config and executes an API request via
+   * TrafficGatewayService. BaseUrl and auth headers are applied automatically
+   * from the validated config.
+   */
+  async executeRequest(request, integration, loggedInUserId) {
+    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
+    return this.trafficGatewayService.executeIntegrationRequest({
+      ...request,
+      baseUrl: validated.config.platformConfig.baseUrl,
+      headers: validated.headers
+    }, validated, loggedInUserId);
+  }
+};
+exports.TrybeApiClientService = _ts_decorate20([
+  common.Injectable(),
+  _ts_param9(0, common.Inject(common.forwardRef(() => exports.TrybeAuthService))),
+  _ts_metadata17("design:type", Function),
+  _ts_metadata17("design:paramtypes", [
+    typeof exports.TrybeAuthService === "undefined" ? Object : exports.TrybeAuthService,
+    typeof exports.TrafficGatewayService === "undefined" ? Object : exports.TrafficGatewayService
+  ])
+], exports.TrybeApiClientService);
+
+// ../../packages/dvss-integration-trybe/src/capabilities/customer-management/customer-management.service.ts
+function _ts_decorate21(decorators, target, key, desc2) {
+  var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate21, "_ts_decorate");
+function _ts_metadata18(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata18, "_ts_metadata");
+function _ts_param10(paramIndex, decorator) {
+  return function(target, key) {
+    decorator(target, key, paramIndex);
+  };
+}
+__name(_ts_param10, "_ts_param");
 exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
   static {
     __name(this, "TrybeCustomerManagement");
   }
   logger;
-  trafficGatewayService;
+  trybeApiClientService;
   fileName = "customer-management.service";
   /**
    * Creates an instance of the service
    */
-  constructor(logger, trafficGatewayService) {
+  constructor(logger, trybeApiClientService) {
     this.logger = logger;
-    this.trafficGatewayService = trafficGatewayService;
+    this.trybeApiClientService = trybeApiClientService;
   }
   /**
    * Create a new customer on Trybe (POST /customers/customers).
@@ -3097,11 +3496,9 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
     this.logger.info(loggedInUserId, this.createCustomer.name, this.fileName, `${_TrybeCustomerManagement.name} -> ${this.createCustomer.name} Called`, {
       request
     });
-    const response = await this.trafficGatewayService.executeIntegrationRequest({
+    const response = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
       url: "/customers/customers",
-      baseUrl: integration.config.platformConfig.baseUrl,
-      headers: integration.headers,
       body: request
     }, integration, loggedInUserId);
     return response.data;
@@ -3120,11 +3517,9 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
       throw new Error("Either email or customerId is required to get a customer from Trybe");
     }
     if (request.customerId) {
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `/customers/customers/${request.customerId}`,
-        baseUrl: integration.config.platformConfig.baseUrl,
-        headers: integration.headers
+        url: `/customers/customers/${request.customerId}`
       }, integration, loggedInUserId);
       if (!response.data) {
         return void 0;
@@ -3132,11 +3527,9 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
       return response.data;
     }
     if (request.email) {
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `/customers/customers/?email=${request.email}`,
-        baseUrl: integration.config.platformConfig.baseUrl,
-        headers: integration.headers
+        url: `/customers/customers/?email=${request.email}`
       }, integration, loggedInUserId);
       if (!response.data || !Array.isArray(response.data)) {
         throw new dvssBackendModuleUtility.CustomException(dvssBackendModuleUtility.ERROR_NAMES.BAD_REQUEST, "Invalid Credentials");
@@ -3157,11 +3550,9 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
       customerId,
       request
     });
-    const response = await this.trafficGatewayService.executeIntegrationRequest({
+    const response = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.PUT,
       url: `/customers/customers/${customerId}`,
-      baseUrl: integration.config.platformConfig.baseUrl,
-      headers: integration.headers,
       body: request
     }, integration, loggedInUserId);
     return response.data;
@@ -3174,11 +3565,9 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
       this.logger.info(loggedInUserId, this.deleteCustomer.name, this.fileName, `${_TrybeCustomerManagement.name} -> ${this.deleteCustomer.name} Called`, {
         customerId
       });
-      await this.trafficGatewayService.executeIntegrationRequest({
+      await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.DELETE,
-        url: `/customers/customers/${customerId}`,
-        baseUrl: integration.config.platformConfig.baseUrl,
-        headers: integration.headers
+        url: `/customers/customers/${customerId}`
       }, integration, loggedInUserId);
       return {
         status: true
@@ -3189,12 +3578,13 @@ exports.TrybeCustomerManagement = class _TrybeCustomerManagement {
     }
   }
 };
-exports.TrybeCustomerManagement = _ts_decorate17([
+exports.TrybeCustomerManagement = _ts_decorate21([
   common.Injectable(),
-  _ts_metadata14("design:type", Function),
-  _ts_metadata14("design:paramtypes", [
+  _ts_param10(1, common.Inject(common.forwardRef(() => exports.TrybeApiClientService))),
+  _ts_metadata18("design:type", Function),
+  _ts_metadata18("design:paramtypes", [
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService,
-    typeof exports.TrafficGatewayService === "undefined" ? Object : exports.TrafficGatewayService
+    typeof exports.TrybeApiClientService === "undefined" ? Object : exports.TrybeApiClientService
   ])
 ], exports.TrybeCustomerManagement);
 
@@ -3209,18 +3599,18 @@ function isValidHttpUrl(urlString) {
 }
 __name(isValidHttpUrl, "isValidHttpUrl");
 
-// ../../packages/dvss-integration-trybe/src/capabilities/auth/auth.service.ts
-function _ts_decorate18(decorators, target, key, desc2) {
+// ../../packages/dvss-integration-trybe/src/capabilities/auth-management/auth.service.ts
+function _ts_decorate22(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate18, "_ts_decorate");
-function _ts_metadata15(k, v) {
+__name(_ts_decorate22, "_ts_decorate");
+function _ts_metadata19(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata15, "_ts_metadata");
+__name(_ts_metadata19, "_ts_metadata");
 exports.TrybeAuthService = class _TrybeAuthService {
   static {
     __name(this, "TrybeAuthService");
@@ -3318,10 +3708,10 @@ exports.TrybeAuthService = class _TrybeAuthService {
     throw new Error("Method not implemented.");
   }
 };
-exports.TrybeAuthService = _ts_decorate18([
+exports.TrybeAuthService = _ts_decorate22([
   common.Injectable(),
-  _ts_metadata15("design:type", Function),
-  _ts_metadata15("design:paramtypes", [
+  _ts_metadata19("design:type", Function),
+  _ts_metadata19("design:paramtypes", [
     typeof exports.TrybeCustomerManagement === "undefined" ? Object : exports.TrybeCustomerManagement,
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
   ])
@@ -3384,32 +3774,30 @@ function mapTrybeCreditsToSystem(res, integration) {
 __name(mapTrybeCreditsToSystem, "mapTrybeCreditsToSystem");
 
 // ../../packages/dvss-integration-trybe/src/capabilities/credit-management/credit-booking.service.ts
-function _ts_decorate19(decorators, target, key, desc2) {
+function _ts_decorate23(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate19, "_ts_decorate");
-function _ts_metadata16(k, v) {
+__name(_ts_decorate23, "_ts_decorate");
+function _ts_metadata20(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata16, "_ts_metadata");
+__name(_ts_metadata20, "_ts_metadata");
 exports.TrybeCreditBooking = class _TrybeCreditBooking {
   static {
     __name(this, "TrybeCreditBooking");
   }
   logger;
-  trafficGatewayService;
-  trybeAuthService;
+  trybeApiClientService;
   fileName = "credit-booking.service";
   /**
    * Creates an instance of the service
    */
-  constructor(logger, trafficGatewayService, trybeAuthService) {
+  constructor(logger, trybeApiClientService) {
     this.logger = logger;
-    this.trafficGatewayService = trafficGatewayService;
-    this.trybeAuthService = trybeAuthService;
+    this.trybeApiClientService = trybeApiClientService;
   }
   /**
    * Fetches customer credits from Trybe and returns system-format response
@@ -3420,7 +3808,6 @@ exports.TrybeCreditBooking = class _TrybeCreditBooking {
     this.logger.info(loggedInUserId, this.fetchCustomerCredits.name, this.fileName, `${_TrybeCreditBooking.name} -> ${this.fetchCustomerCredits.name} Called`, {
       request
     });
-    const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
     const query = new URLSearchParams();
     const opts = request.options;
     if (opts?.page != null) query.set("page", String(opts.page));
@@ -3443,22 +3830,19 @@ exports.TrybeCreditBooking = class _TrybeCreditBooking {
     }
     const queryString = query.toString();
     const url = `/customers/customers/${request.customerId}/credits` + (queryString ? `?${queryString}` : "");
-    const raw = await this.trafficGatewayService.executeIntegrationRequest({
+    const raw = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.GET,
-      url,
-      baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-      headers: validatedIntegration.headers
-    }, validatedIntegration, loggedInUserId);
-    return mapTrybeCreditsToSystem(raw, validatedIntegration);
+      url
+    }, integration, loggedInUserId);
+    return mapTrybeCreditsToSystem(raw, integration);
   }
 };
-exports.TrybeCreditBooking = _ts_decorate19([
+exports.TrybeCreditBooking = _ts_decorate23([
   common.Injectable(),
-  _ts_metadata16("design:type", Function),
-  _ts_metadata16("design:paramtypes", [
+  _ts_metadata20("design:type", Function),
+  _ts_metadata20("design:paramtypes", [
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService,
-    typeof exports.TrafficGatewayService === "undefined" ? Object : exports.TrafficGatewayService,
-    typeof exports.TrybeAuthService === "undefined" ? Object : exports.TrybeAuthService
+    typeof exports.TrybeApiClientService === "undefined" ? Object : exports.TrybeApiClientService
   ])
 ], exports.TrybeCreditBooking);
 
@@ -3476,25 +3860,25 @@ function mapTrybeSiteResponseToSystem(response) {
 __name(mapTrybeSiteResponseToSystem, "mapTrybeSiteResponseToSystem");
 
 // ../../packages/dvss-integration-trybe/src/capabilities/integration-configuration/integration-configuration.service.ts
-function _ts_decorate20(decorators, target, key, desc2) {
+function _ts_decorate24(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate20, "_ts_decorate");
-function _ts_metadata17(k, v) {
+__name(_ts_decorate24, "_ts_decorate");
+function _ts_metadata21(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata17, "_ts_metadata");
+__name(_ts_metadata21, "_ts_metadata");
 exports.TrybeIntegrationConfigurationService = class TrybeIntegrationConfigurationService extends exports.BaseIntegrationConfiguration {
   static {
     __name(this, "TrybeIntegrationConfigurationService");
   }
+  trybeApiClientService;
   trybeAuthService;
-  trafficGatewayService;
-  constructor(integrationConfigurationDao, commonValidationDatabaseService, logger, trybeAuthService, trafficGatewayService) {
-    super(integrationConfigurationDao, commonValidationDatabaseService, logger), this.trybeAuthService = trybeAuthService, this.trafficGatewayService = trafficGatewayService;
+  constructor(integrationConfigurationDao, commonValidationDatabaseService, logger, trybeApiClientService, trybeAuthService) {
+    super(integrationConfigurationDao, commonValidationDatabaseService, logger), this.trybeApiClientService = trybeApiClientService, this.trybeAuthService = trybeAuthService;
   }
   /**
    * Add capability integration: validate Trybe config, then configuredFor (offering), then delegate to base.
@@ -3538,24 +3922,22 @@ exports.TrybeIntegrationConfigurationService = class TrybeIntegrationConfigurati
     const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
     const siteId = validatedIntegration.config.integrationConfig.siteId;
     const url = `/shop/sites/${siteId}`;
-    const response = await this.trafficGatewayService.executeIntegrationRequest({
+    const response = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.GET,
-      url,
-      baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-      headers: validatedIntegration.headers
+      url
     }, validatedIntegration, loggedInUserId);
     return mapTrybeSiteResponseToSystem(response);
   }
 };
-exports.TrybeIntegrationConfigurationService = _ts_decorate20([
+exports.TrybeIntegrationConfigurationService = _ts_decorate24([
   common.Injectable(),
-  _ts_metadata17("design:type", Function),
-  _ts_metadata17("design:paramtypes", [
+  _ts_metadata21("design:type", Function),
+  _ts_metadata21("design:paramtypes", [
     typeof exports.IntegrationConfigurationDao === "undefined" ? Object : exports.IntegrationConfigurationDao,
     typeof dvssBackendModuleDatastore.CommonValidationDatabaseService === "undefined" ? Object : dvssBackendModuleDatastore.CommonValidationDatabaseService,
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService,
-    typeof exports.TrybeAuthService === "undefined" ? Object : exports.TrybeAuthService,
-    typeof exports.TrafficGatewayService === "undefined" ? Object : exports.TrafficGatewayService
+    typeof exports.TrybeApiClientService === "undefined" ? Object : exports.TrybeApiClientService,
+    typeof exports.TrybeAuthService === "undefined" ? Object : exports.TrybeAuthService
   ])
 ], exports.TrybeIntegrationConfigurationService);
 
@@ -3572,17 +3954,17 @@ var TRYBE_CATALOGING_BY_ENUM = /* @__PURE__ */ (function(TRYBE_CATALOGING_BY_ENU
 })({});
 
 // ../../packages/dvss-integration-trybe/src/capabilities/integration-resource-management/integration-resource-management.service.ts
-function _ts_decorate21(decorators, target, key, desc2) {
+function _ts_decorate25(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate21, "_ts_decorate");
-function _ts_metadata18(k, v) {
+__name(_ts_decorate25, "_ts_decorate");
+function _ts_metadata22(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata18, "_ts_metadata");
+__name(_ts_metadata22, "_ts_metadata");
 var OFFERING_INTEGRATION_MAPPING_ALREADY_EXISTS = "OFFERING_INTEGRATION_MAPPING_ALREADY_EXISTS";
 var VALID_JOURNEY_VALUES = /* @__PURE__ */ new Set([
   "SESSION",
@@ -3653,10 +4035,10 @@ exports.TrybeIntegrationResourceManagementService = class TrybeIntegrationResour
     return await super.updateOfferingIntegrationResourceConfiguration(input, context);
   }
 };
-exports.TrybeIntegrationResourceManagementService = _ts_decorate21([
+exports.TrybeIntegrationResourceManagementService = _ts_decorate25([
   common.Injectable(),
-  _ts_metadata18("design:type", Function),
-  _ts_metadata18("design:paramtypes", [
+  _ts_metadata22("design:type", Function),
+  _ts_metadata22("design:paramtypes", [
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService,
     typeof exports.IntegrationResourceManagementDao === "undefined" ? Object : exports.IntegrationResourceManagementDao
   ])
@@ -3782,17 +4164,17 @@ function getSummaryLabelsInPropertyTimezone(timezone, summary) {
 __name(getSummaryLabelsInPropertyTimezone, "getSummaryLabelsInPropertyTimezone");
 
 // ../../packages/dvss-integration-trybe/src/utils/webhook/trybe-webhook-util.ts
-function _ts_decorate22(decorators, target, key, desc2) {
+function _ts_decorate26(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate22, "_ts_decorate");
-function _ts_metadata19(k, v) {
+__name(_ts_decorate26, "_ts_decorate");
+function _ts_metadata23(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata19, "_ts_metadata");
+__name(_ts_metadata23, "_ts_metadata");
 exports.TrybeWebhookUtilService = class TrybeWebhookUtilService {
   static {
     __name(this, "TrybeWebhookUtilService");
@@ -3984,10 +4366,10 @@ exports.TrybeWebhookUtilService = class TrybeWebhookUtilService {
     }
   }
 };
-exports.TrybeWebhookUtilService = _ts_decorate22([
+exports.TrybeWebhookUtilService = _ts_decorate26([
   common.Injectable(),
-  _ts_metadata19("design:type", Function),
-  _ts_metadata19("design:paramtypes", [
+  _ts_metadata23("design:type", Function),
+  _ts_metadata23("design:paramtypes", [
     typeof exports.IntegrationBookingDao === "undefined" ? Object : exports.IntegrationBookingDao,
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService
   ])
@@ -4384,30 +4766,28 @@ function mapTrybeAppointmentAvailabilityToSystemResponse(slots) {
 __name(mapTrybeAppointmentAvailabilityToSystemResponse, "mapTrybeAppointmentAvailabilityToSystemResponse");
 
 // ../../packages/dvss-integration-trybe/src/capabilities/wellness/wellness-management.service.ts
-function _ts_decorate23(decorators, target, key, desc2) {
+function _ts_decorate27(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate23, "_ts_decorate");
-function _ts_metadata20(k, v) {
+__name(_ts_decorate27, "_ts_decorate");
+function _ts_metadata24(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-__name(_ts_metadata20, "_ts_metadata");
+__name(_ts_metadata24, "_ts_metadata");
 exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
   static {
     __name(this, "TrybeWellnessManagement");
   }
   logger;
-  trafficGatewayService;
-  trybeAuthService;
+  trybeApiClientService;
   integrationCommonDao;
   fileName = "wellness-management.service";
-  constructor(logger, trafficGatewayService, trybeAuthService, integrationCommonDao) {
+  constructor(logger, trybeApiClientService, integrationCommonDao) {
     this.logger = logger;
-    this.trafficGatewayService = trafficGatewayService;
-    this.trybeAuthService = trybeAuthService;
+    this.trybeApiClientService = trybeApiClientService;
     this.integrationCommonDao = integrationCommonDao;
   }
   fetchWellnessAppointmentSession() {
@@ -4446,22 +4826,19 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
   async createOrder(request, integration, loggedInUserId) {
     let orderId;
     try {
-      const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validated.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const offering = await this.getOffering({
         offeringId: request.bookableItems[0].externalId,
         offeringType: request.bookableItems[0].type
       }, integration, loggedInUserId);
-      const res = await this.trafficGatewayService.executeIntegrationRequest({
+      const res = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.POST,
         url: "/shop/orders",
-        baseUrl: validated.config.platformConfig.baseUrl,
-        headers: validated.headers,
         body: {
           site_id: siteId,
           status: "new"
         }
-      }, validated, loggedInUserId);
+      }, integration, loggedInUserId);
       orderId = res.data.id;
       const items = [];
       await this.addCustomerToOrder(orderId, request.customerId, integration, loggedInUserId);
@@ -4506,9 +4883,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
           orderReference: submitOrderResponse.data?.order_ref ?? order.meta.orderReference,
           room: bookableItems.find((item) => item.booking_summary?.room?.id)?.booking_summary?.room,
           total: (submitOrderResponse.data?.totals?.total ?? 0) / request.currencyMultiplier,
-          subTotal: (submitOrderResponse.data?.totals?.subtotal ?? 0) / request.currencyMultiplier,
-          totalTax: (submitOrderResponse.data?.total_tax ?? 0) / request.currencyMultiplier,
-          discount: (submitOrderResponse.data?.discount_total ?? 0) / request.currencyMultiplier
+          subTotal: ((submitOrderResponse.data?.totals?.subtotal ?? 0) - (submitOrderResponse.data?.totals?.exclusive_tax ?? 0)) / request.currencyMultiplier,
+          totalTax: (submitOrderResponse.data?.taxes?.reduce((acc, tax) => acc + (tax.amount ?? 0), 0) ?? 0) / request.currencyMultiplier,
+          discount: (submitOrderResponse.data?.discount_total ?? 0) / request.currencyMultiplier,
+          serviceCharge: (submitOrderResponse.data?.service_charge?.amount ?? 0) / request.currencyMultiplier
         },
         items: bookableItems.map((bookableItem) => {
           return {
@@ -4541,17 +4919,14 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       orderId,
       customerId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    await this.trafficGatewayService.executeIntegrationRequest({
+    await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
       url: `/shop/orders/${orderId}/customer`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers,
       body: {
         id: customerId,
         source: "trybe"
       }
-    }, validated, loggedInUserId);
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.addCustomerToOrder.name, this.fileName, "Successfully added customer to Trybe order", {
       orderId,
       customerId
@@ -4561,13 +4936,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
     this.logger.info(loggedInUserId, this.getOrder.name, this.fileName, "Fetching Trybe order details", {
       orderId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    const res = await this.trafficGatewayService.executeIntegrationRequest({
+    const res = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.GET,
-      url: `/shop/orders/${orderId}`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers
-    }, validated, loggedInUserId);
+      url: `/shop/orders/${orderId}`
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.getOrder.name, this.fileName, "Successfully fetched Trybe order details", {
       orderId,
       guestCount: res.data.guests.length
@@ -4602,7 +4974,6 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       offeringId: request.item.offeringId,
       offeringType: request.item.offeringType
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
     const { orderId, item } = request;
     const offeringType = this.mapOfferingTypeToTrybeApi(item.offeringType);
     let body;
@@ -4642,13 +5013,11 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
         guest_ids: item.guestIds
       };
     }
-    const res = await this.trafficGatewayService.executeIntegrationRequest({
+    const res = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
       url: `/shop/orders/${orderId}/items`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers,
       body
-    }, validated, loggedInUserId);
+    }, integration, loggedInUserId);
     const data = res.data;
     const result = {
       name: data.booking_summary?.offering?.name ?? data.type_name ?? void 0,
@@ -4667,16 +5036,13 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       orderId,
       customerCreditId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    await this.trafficGatewayService.executeIntegrationRequest({
+    await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
       url: `/shop/orders/${orderId}/customer-credits`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers,
       body: {
         id: customerCreditId
       }
-    }, validated, loggedInUserId);
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.addCustomerCreditsToOrder.name, this.fileName, "Successfully added customer credits to Trybe order", {
       orderId,
       customerCreditId
@@ -4686,13 +5052,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
     this.logger.info(loggedInUserId, this.submitOrder.name, this.fileName, "Submitting Trybe order", {
       orderId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    const response = await this.trafficGatewayService.executeIntegrationRequest({
+    const response = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
-      url: `/shop/orders/${orderId}/submit`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers
-    }, validated, loggedInUserId);
+      url: `/shop/orders/${orderId}/submit`
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.submitOrder.name, this.fileName, "Successfully submitted Trybe order", {
       orderId
     });
@@ -4702,13 +5065,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
     this.logger.info(loggedInUserId, this.cancelOrder.name, this.fileName, "Cancelling Trybe order", {
       orderId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    await this.trafficGatewayService.executeIntegrationRequest({
+    await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
-      url: `/shop/orders/${orderId}/cancel`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers
-    }, validated, loggedInUserId);
+      url: `/shop/orders/${orderId}/cancel`
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.cancelOrder.name, this.fileName, "Successfully cancelled Trybe order", {
       orderId
     });
@@ -4742,7 +5102,6 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       itemId,
       offeringType: request.item.type
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
     const offeringType = this.mapOfferingTypeToTrybeApi(request.item.type);
     let body;
     if (offeringType === TRYBE_OFFERING_TYPE_API.APPOINTMENT) {
@@ -4772,13 +5131,11 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
     } else {
       throw new Error("Course is not updatable");
     }
-    const response = await this.trafficGatewayService.executeIntegrationRequest({
+    const response = await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.PUT,
       url: `/shop/orders/${orderId}/items/${itemId}`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers,
       body
-    }, validated, loggedInUserId);
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.updateOrderItem.name, this.fileName, "Successfully updated Trybe order item", {
       orderId,
       itemId
@@ -4791,12 +5148,9 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       amount: request.amount,
       paymentTypeId: request.paymentTypeId
     });
-    const validated = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-    await this.trafficGatewayService.executeIntegrationRequest({
+    await this.trybeApiClientService.executeRequest({
       apiMethod: HTTP_METHOD.POST,
       url: `/shop/orders/${request.orderId}/payments`,
-      baseUrl: validated.config.platformConfig.baseUrl,
-      headers: validated.headers,
       body: {
         amount: request.amount,
         processor: "manual",
@@ -4806,7 +5160,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
           payment_type_id: request.paymentTypeId
         }
       }
-    }, validated, loggedInUserId);
+    }, integration, loggedInUserId);
     this.logger.info(loggedInUserId, this.addPaymentToOrder.name, this.fileName, "Successfully added payment to Trybe order", {
       orderId: request.orderId,
       amount: request.amount
@@ -4817,8 +5171,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       if (request.shouldFetchAllAppointments && request.options?.page !== void 0) {
         throw new Error("Pagination options are not supported when fetching all appointments.");
       }
@@ -4831,18 +5184,14 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       }
       const queryString = query.toString();
       const apiUrl = `/shop/appointment-types?site_id=${siteId}` + (request.practitionerIds && request.practitionerIds.length > 0 ? `&practitioner_id=${request.practitionerIds.join(",")}` : "") + (queryString ? `&${queryString}` : "");
-      const firstPageResponse = await this.trafficGatewayService.executeIntegrationRequest({
+      const firstPageResponse = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
-      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllAppointments, (page) => this.trafficGatewayService.executeIntegrationRequest({
+        url: apiUrl
+      }, integration, loggedInUserId);
+      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllAppointments, (page) => this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `${apiUrl}&page=${page}`,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId));
+        url: `${apiUrl}&page=${page}`
+      }, integration, loggedInUserId));
       this.logger.info(loggedInUserId, this.fetchAppointments.name, this.fileName, "Successfully fetched Trybe appointments", {
         totalRecords: firstPageResponse.meta.total
       });
@@ -4857,15 +5206,12 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const apiUrl = `/shop/appointment-types/${request.appointmentId}?site_id=${siteId}`;
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
       this.logger.info(loggedInUserId, this.fetchAppointments.name, this.fileName, "Successfully fetched Trybe appointments", {
         appointmentId: request.appointmentId
       });
@@ -4880,8 +5226,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       if (request.shouldFetchAllSessions && request.options?.page !== void 0) {
         throw new Error("Pagination options are not supported when fetching all sessions.");
       }
@@ -4894,18 +5239,14 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       }
       const queryString = query.toString();
       const apiUrl = `/shop/session-types?site_id=${siteId}` + (request.practitionerIds && request.practitionerIds.length > 0 ? `&practitioner_id=${request.practitionerIds.join(",")}` : "") + (queryString ? `&${queryString}` : "");
-      const firstPageResponse = await this.trafficGatewayService.executeIntegrationRequest({
+      const firstPageResponse = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
-      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllSessions, (page) => this.trafficGatewayService.executeIntegrationRequest({
+        url: apiUrl
+      }, integration, loggedInUserId);
+      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllSessions, (page) => this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `${apiUrl}&page=${page}`,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId));
+        url: `${apiUrl}&page=${page}`
+      }, integration, loggedInUserId));
       this.logger.info(loggedInUserId, this.fetchSessions.name, this.fileName, "Successfully fetched Trybe sessions", {
         totalRecords: firstPageResponse.meta.total
       });
@@ -4920,15 +5261,12 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const apiUrl = `/shop/session-types/${request.sessionId}?site_id=${siteId}`;
-      return await this.trafficGatewayService.executeIntegrationRequest({
+      return await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
     } catch (err) {
       this.logger.error(loggedInUserId, this.fetchSession.name, this.fileName, "Error fetching Trybe session", err);
       throw err;
@@ -4939,8 +5277,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const organisationId = validatedIntegration.config.integrationConfig.organisationId;
+      const organisationId = integration.config?.integrationConfig?.organisationId;
       if (request.shouldFetchAllCourses && request.options?.page !== void 0) {
         throw new Error("Pagination options are not supported when fetching all courses.");
       }
@@ -4953,18 +5290,14 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       }
       const queryString = query.toString();
       const apiUrl = `/shop/course-types?organisation_id=${organisationId}` + (queryString ? `&${queryString}` : "");
-      const firstPageResponse = await this.trafficGatewayService.executeIntegrationRequest({
+      const firstPageResponse = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
-      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllCourses, (page) => this.trafficGatewayService.executeIntegrationRequest({
+        url: apiUrl
+      }, integration, loggedInUserId);
+      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllCourses, (page) => this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `${apiUrl}&page=${page}`,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId));
+        url: `${apiUrl}&page=${page}`
+      }, integration, loggedInUserId));
       this.logger.info(loggedInUserId, this.fetchCourses.name, this.fileName, "Successfully fetched Trybe courses", {
         totalRecords: firstPageResponse.meta.total
       });
@@ -4979,15 +5312,12 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const organisationId = validatedIntegration.config.integrationConfig.organisationId;
+      const organisationId = integration.config?.integrationConfig?.organisationId;
       const apiUrl = `/shop/course-types/${request.courseId}?organisation_id=${organisationId}`;
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
       this.logger.info(loggedInUserId, this.fetchCourse.name, this.fileName, "Successfully fetched Trybe course", {
         courseId: request.courseId
       });
@@ -5002,21 +5332,16 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const apiUrl = `/shop/practitioners/?site_id=${siteId}`;
-      const firstPageResponse = await this.trafficGatewayService.executeIntegrationRequest({
+      const firstPageResponse = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
-      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllPractitioners, (page) => this.trafficGatewayService.executeIntegrationRequest({
+        url: apiUrl
+      }, integration, loggedInUserId);
+      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllPractitioners, (page) => this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `${apiUrl}&page=${page}`,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId));
+        url: `${apiUrl}&page=${page}`
+      }, integration, loggedInUserId));
       this.logger.info(loggedInUserId, this.fetchPractitioners.name, this.fileName, "Successfully fetched Trybe practitioners", {
         totalRecords: firstPageResponse.meta.total
       });
@@ -5031,8 +5356,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const organisationId = validatedIntegration.config.integrationConfig.organisationId;
+      const organisationId = integration.config?.integrationConfig?.organisationId;
       if (request.shouldFetchAllCategories && request.options?.page !== void 0) {
         throw new Error("Pagination options are not supported when fetching all categories.");
       }
@@ -5045,18 +5369,14 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       }
       const queryString = query.toString();
       const apiUrl = `/shop/organisations/${organisationId}/categories` + (queryString ? `?${queryString}` : "");
-      const firstPageResponse = await this.trafficGatewayService.executeIntegrationRequest({
+      const firstPageResponse = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
-      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllCategories, (page) => this.trafficGatewayService.executeIntegrationRequest({
+        url: apiUrl
+      }, integration, loggedInUserId);
+      const records = await fetchAllPages(firstPageResponse, request.shouldFetchAllCategories, (page) => this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: `${apiUrl}${apiUrl.includes("?") ? "&" : "?"}page=${page}`,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId));
+        url: `${apiUrl}${apiUrl.includes("?") ? "&" : "?"}page=${page}`
+      }, integration, loggedInUserId));
       this.logger.info(loggedInUserId, this.fetchCategories.name, this.fileName, "Successfully fetched Trybe categories", {
         totalRecords: firstPageResponse.meta.total
       });
@@ -5071,7 +5391,6 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
       const query = new URLSearchParams();
       if (request.options?.page != null) {
         query.set("page", String(request.options.page));
@@ -5081,12 +5400,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       }
       const queryString = query.toString();
       const apiUrl = `/shop/coupon-codes/${request.couponCodeId}/offering-discounts` + (queryString ? `?${queryString}` : "");
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
       this.logger.info(loggedInUserId, this.fetchBookableItemsFromCredit.name, this.fileName, "Successfully fetched bookable items from credit", {
         couponCodeId: request.couponCodeId
       });
@@ -5101,8 +5418,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const finalTimezone = await this.integrationCommonDao.getTimezoneForRequest({
         projectId: integration.projectId,
         loggedInUserId
@@ -5115,12 +5431,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       const formattedDateTimeFrom = formatDateForTrybe(request.dateTimeFrom, true, finalTimezone);
       const formattedDateTimeTo = formatDateForTrybe(request.dateTimeTo, false, finalTimezone);
       const apiUrl = `/shop/item-availability/sessions/${siteId}/${request.externalOfferingBookableItemId}?date_time_from=${encodeURIComponent(formattedDateTimeFrom)}&date_time_to=${encodeURIComponent(formattedDateTimeTo)}&offeringId=${request.externalOfferingBookableItemId}`;
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
       this.logger.info(loggedInUserId, this.fetchSessionAvailabilityForOffering.name, this.fileName, "Successfully fetched session availability for offering", {
         externalOfferingBookableItemId: request.externalOfferingBookableItemId
       });
@@ -5135,8 +5449,7 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       request
     });
     try {
-      const validatedIntegration = this.trybeAuthService.validateConfig(integration, loggedInUserId);
-      const siteId = validatedIntegration.config.integrationConfig.siteId;
+      const siteId = integration.config?.integrationConfig?.siteId;
       const finalTimezone = await this.integrationCommonDao.getTimezoneForRequest({
         projectId: integration.projectId,
         loggedInUserId
@@ -5149,12 +5462,10 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
       const formattedDateTimeFrom = formatDateForTrybe(request.dateTimeFrom, true, finalTimezone);
       const formattedDateTimeTo = formatDateForTrybe(request.dateTimeTo, false, finalTimezone);
       const apiUrl = `/shop/item-availability/appointment-slots/${siteId}/${request.externalOfferingBookableItemId}?date_time_from=${encodeURIComponent(formattedDateTimeFrom)}&date_time_to=${encodeURIComponent(formattedDateTimeTo)}&OfferingID=${request.externalOfferingBookableItemId}`;
-      const response = await this.trafficGatewayService.executeIntegrationRequest({
+      const response = await this.trybeApiClientService.executeRequest({
         apiMethod: HTTP_METHOD.GET,
-        url: apiUrl,
-        baseUrl: validatedIntegration.config.platformConfig.baseUrl,
-        headers: validatedIntegration.headers
-      }, validatedIntegration, loggedInUserId);
+        url: apiUrl
+      }, integration, loggedInUserId);
       this.logger.info(loggedInUserId, this.fetchAppointmentAvailabilityForOffering.name, this.fileName, "Successfully fetched appointment availability for offering", {
         externalOfferingBookableItemId: request.externalOfferingBookableItemId
       });
@@ -5177,13 +5488,12 @@ exports.TrybeWellnessManagement = class _TrybeWellnessManagement {
     }
   }
 };
-exports.TrybeWellnessManagement = _ts_decorate23([
+exports.TrybeWellnessManagement = _ts_decorate27([
   common.Injectable(),
-  _ts_metadata20("design:type", Function),
-  _ts_metadata20("design:paramtypes", [
+  _ts_metadata24("design:type", Function),
+  _ts_metadata24("design:paramtypes", [
     typeof dvssBackendModuleUtility.LoggerService === "undefined" ? Object : dvssBackendModuleUtility.LoggerService,
-    typeof exports.TrafficGatewayService === "undefined" ? Object : exports.TrafficGatewayService,
-    typeof exports.TrybeAuthService === "undefined" ? Object : exports.TrybeAuthService,
+    typeof exports.TrybeApiClientService === "undefined" ? Object : exports.TrybeApiClientService,
     typeof exports.IntegrationCommonDao === "undefined" ? Object : exports.IntegrationCommonDao
   ])
 ], exports.TrybeWellnessManagement);
@@ -5193,19 +5503,19 @@ dotenv.config({
 });
 
 // ../../packages/dvss-integration-trybe/src/app.module.ts
-function _ts_decorate24(decorators, target, key, desc2) {
+function _ts_decorate28(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate24, "_ts_decorate");
+__name(_ts_decorate28, "_ts_decorate");
 exports.IntegrationTrybeModule = class AppModule2 {
   static {
     __name(this, "AppModule");
   }
 };
-exports.IntegrationTrybeModule = _ts_decorate24([
+exports.IntegrationTrybeModule = _ts_decorate28([
   common.Module({
     imports: [
       // Load environment variables from root .env file
@@ -5224,6 +5534,7 @@ exports.IntegrationTrybeModule = _ts_decorate24([
     providers: [
       AppService3,
       exports.TrybeAuthService,
+      exports.TrybeApiClientService,
       exports.TrybeCustomerManagement,
       exports.TrybeCreditBooking,
       exports.TrybeWellnessManagement,
@@ -5235,14 +5546,13 @@ exports.IntegrationTrybeModule = _ts_decorate24([
       exports.IntegrationRequestLoggerService,
       exports.RateLimiterService,
       exports.TrafficGatewayService,
-      exports.TrybeCustomerManagement,
-      exports.TrybeAuthService,
       exports.TrybeIntegrationConfigurationService,
       exports.TrybeIntegrationResourceManagementService,
       dvssBackendModuleDatastore.CommonValidationDatabaseService
     ],
     exports: [
       exports.TrybeAuthService,
+      exports.TrybeApiClientService,
       exports.TrybeCustomerManagement,
       exports.TrybeCreditBooking,
       exports.TrybeWellnessManagement,
@@ -5254,19 +5564,19 @@ exports.IntegrationTrybeModule = _ts_decorate24([
 ], exports.IntegrationTrybeModule);
 
 // src/app.module.ts
-function _ts_decorate25(decorators, target, key, desc2) {
+function _ts_decorate29(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc2);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate25, "_ts_decorate");
+__name(_ts_decorate29, "_ts_decorate");
 exports.OfferingIntegrationManager = class AppModule3 {
   static {
     __name(this, "AppModule");
   }
 };
-exports.OfferingIntegrationManager = _ts_decorate25([
+exports.OfferingIntegrationManager = _ts_decorate29([
   common.Module({
     imports: [
       exports.IntegrationTrybeModule,