refactor: re-export OCPPAuthServiceFactory in ocpp barrel and fix cross-sub-component...

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index a70705daa777b14750028fce18429ae6a2fe3bcb..75987af15a5a73e7b5fc10b09b4d19dba498e8cd 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -144,7 +144,6 @@ import {
   warnTemplateKeysDeprecation,
 } from './Helpers.js'
 import { IdTagsCache } from './IdTagsCache.js'
-import { OCPPAuthServiceFactory } from './ocpp/auth/services/OCPPAuthServiceFactory.js'
 import {
   buildMeterValue,
   buildTransactionEndMeterValue,
@@ -158,6 +157,7 @@ import {
   OCPP20ServiceUtils,
   OCPP20TransactionEventEnumType,
   OCPP20TriggerReasonEnumType,
+  OCPPAuthServiceFactory,
   type OCPPIncomingRequestService,
   type OCPPRequestService,
   sendAndSetConnectorStatus,

diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
index ab9c5b72f437c32750d47e5f79c1201359217779..67492407204398acacbdc098ce5419268e66834e 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
@@ -135,7 +135,7 @@ import {
   hasPendingReservations,
   resetConnectorStatus,
 } from '../../Helpers.js'
-import { OCPPAuthServiceFactory } from '../auth/services/OCPPAuthServiceFactory.js'
+import { OCPPAuthServiceFactory } from '../auth/index.js'
 import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js'
 import {
   buildMeterValue,

diff --git a/src/charging-station/ocpp/index.ts b/src/charging-station/ocpp/index.ts
index f73198678810ddfae2ffca2543b0001ee8c233a3..0aab4035501aebcaa77740959b9ab0dcf5e95cbe 100644 (file)
--- a/src/charging-station/ocpp/index.ts
+++ b/src/charging-station/ocpp/index.ts
@@ -10,6 +10,7 @@ export { OCPP20RequestService } from './2.0/OCPP20RequestService.js'
 export { OCPP20ResponseService } from './2.0/OCPP20ResponseService.js'
 export { OCPP20ServiceUtils } from './2.0/OCPP20ServiceUtils.js'
 export { OCPP20VariableManager } from './2.0/OCPP20VariableManager.js'
+export { OCPPAuthServiceFactory } from './auth/services/OCPPAuthServiceFactory.js'
 export { OCPPIncomingRequestService } from './OCPPIncomingRequestService.js'
 export { OCPPRequestService } from './OCPPRequestService.js'
 export {