@zetra/citrineos-certificates 1.8.3-fork.3 → 1.8.4

package/dist/module/2.0.1/MessageApi.d.ts

@@ -1,5 +1,5 @@
-import type { CallAction, IMessageConfirmation } from '@citrineos/base';
-import { AbstractModuleApi, OCPP2_0_1 } from '@citrineos/base';
+import type { CallAction, IMessageConfirmation } from '@zetra/citrineos-base';
+import { AbstractModuleApi, OCPP2_0_1 } from '@zetra/citrineos-base';
 import type { FastifyInstance } from 'fastify';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/module/2.0.1/MessageApi.js

@@ -7,10 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@citrineos/base';
+import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
 import { Logger } from 'tslog';
 import { CertificatesModule } from '../module.js';
-import { DeleteCertificateAttempt } from '@citrineos/data';
+import { DeleteCertificateAttempt } from '@zetra/citrineos-data';
 /**
  * Server API for the Certificates module.
  */

package/dist/module/DataApi.d.ts

@@ -1,5 +1,5 @@
-import { AbstractModuleApi, type IFileStorage, type IMessageConfirmation, type IMessageQuerystring, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace, type WebsocketServerConfig } from '@citrineos/base';
-import { Certificate, GenerateCertificateChainRequest, InstalledCertificate, InstallRootCertificateRequest, RegenerateExistingCertificate, type TenantQueryString, TlsCertificatesRequest, type UpdateTlsCertificateQueryString, UploadExistingCertificate } from '@citrineos/data';
+import { AbstractModuleApi, type IFileStorage, type IMessageConfirmation, type IMessageQuerystring, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace, type WebsocketServerConfig } from '@zetra/citrineos-base';
+import { Certificate, GenerateCertificateChainRequest, InstalledCertificate, InstallRootCertificateRequest, RegenerateExistingCertificate, type TenantQueryString, TlsCertificatesRequest, type UpdateTlsCertificateQueryString, UploadExistingCertificate } from '@zetra/citrineos-data';
 import type { FastifyInstance, FastifyRequest } from 'fastify';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/module/DataApi.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { AbstractModuleApi, AsDataEndpoint, DEFAULT_TENANT_ID, HttpMethod, IMessageQuerystringSchema, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_CallAction, OCPP2_0_1_Namespace, OCPPVersion, } from '@citrineos/base';
-import { Certificate, CountryNameEnumType, GenerateCertificateChainRequest, GenerateCertificateChainSchema, InstalledCertificate, InstallRootCertificateRequest, InstallRootCertificateSchema, RegenerateExistingCertificate, RegenerateInstalledCertificateSchema, SignatureAlgorithmEnumType, TenantQuerySchema, TlsCertificateSchema, TlsCertificatesRequest, UpdateTlsCertificateQuerySchema, UploadExistingCertificate, UploadExistingCertificateSchema, } from '@citrineos/data';
-import { generateCertificate } from '@citrineos/util';
+import { AbstractModuleApi, AsDataEndpoint, DEFAULT_TENANT_ID, HttpMethod, IMessageQuerystringSchema, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_CallAction, OCPP2_0_1_Namespace, OCPPVersion, } from '@zetra/citrineos-base';
+import { Certificate, CountryNameEnumType, GenerateCertificateChainRequest, GenerateCertificateChainSchema, InstalledCertificate, InstallRootCertificateRequest, InstallRootCertificateSchema, RegenerateExistingCertificate, RegenerateInstalledCertificateSchema, SignatureAlgorithmEnumType, TenantQuerySchema, TlsCertificateSchema, TlsCertificatesRequest, UpdateTlsCertificateQuerySchema, UploadExistingCertificate, UploadExistingCertificateSchema, } from '@zetra/citrineos-data';
+import { generateCertificate } from '@zetra/citrineos-util';
 import jsrsasign from 'jsrsasign';
 import moment from 'moment';
 import { Logger } from 'tslog';
@@ -264,7 +264,7 @@ export class CertificatesDataApi extends AbstractModuleApi {
         newCertificateRecord.countryName = existingCertificateRecord.countryName;
         newCertificateRecord.isCA = existingCertificateRecord.isCA;
         newCertificateRecord.pathLen = existingCertificateRecord.pathLen;
-        newCertificateRecord.signedBy = existingCertificateRecord.id;
+        newCertificateRecord.signedBy = String(existingCertificateRecord.id);
         newCertificateRecord.certificateFileHash = existingCertificateRecord.certificateFileHash;
         const [newCertificatePem, newPrivateKeyPem] = generateCertificate(newCertificateRecord, this._logger, existingPrivateKey, existingCertificateString);
         newCertificateRecord.certificateFileHash =

package/dist/module/DataApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataApi.js","sourceRoot":"","sources":["../../src/module/DataApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataApi.js","sourceRoot":"","sources":["../../src/module/DataApi.ts"],"names":[],"mappings":"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"}

package/dist/module/installCertificateHelperService.d.ts

@@ -1,6 +1,6 @@
-import { Certificate, CountryNameEnumType, type ICertificateRepository, type IDeleteCertificateAttemptRepository, type IInstallCertificateAttemptRepository, type IInstalledCertificateRepository, InstalledCertificate, SignatureAlgorithmEnumType, UploadExistingCertificate } from '@citrineos/data';
-import { type CertificateAuthorityService, WebsocketNetworkConnection } from '@citrineos/util';
-import { type IFileStorage, OCPP2_0_1, type WebsocketServerConfig } from '@citrineos/base';
+import { Certificate, CountryNameEnumType, type ICertificateRepository, type IDeleteCertificateAttemptRepository, type IInstallCertificateAttemptRepository, type IInstalledCertificateRepository, InstalledCertificate, SignatureAlgorithmEnumType, UploadExistingCertificate } from '@zetra/citrineos-data';
+import { type CertificateAuthorityService, WebsocketNetworkConnection } from '@zetra/citrineos-util';
+import { type IFileStorage, OCPP2_0_1, type WebsocketServerConfig } from '@zetra/citrineos-base';
 import { type ILogObj, Logger } from 'tslog';
 export declare const enum PemType {
     Root = "Root",

package/dist/module/installCertificateHelperService.js

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Certificate, CountryNameEnumType, InstallCertificateAttempt, InstalledCertificate, SignatureAlgorithmEnumType, UploadExistingCertificate, } from '@citrineos/data';
-import { extractCertificateDetails, generateCSR, WebsocketNetworkConnection, } from '@citrineos/util';
-import { OCPP2_0_1 } from '@citrineos/base';
+import { Certificate, CountryNameEnumType, InstallCertificateAttempt, InstalledCertificate, SignatureAlgorithmEnumType, UploadExistingCertificate, } from '@zetra/citrineos-data';
+import { extractCertificateDetails, generateCSR, WebsocketNetworkConnection, } from '@zetra/citrineos-util';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Logger } from 'tslog';
 import fs from 'fs';
 import jsrsasign from 'jsrsasign';

package/dist/module/module.d.ts

@@ -1,6 +1,6 @@
-import { AbstractModule, type BootstrapConfig, type CallAction, type HandlerProperties, type ICache, type IFileStorage, type IMessage, type IMessageHandler, type IMessageSender, OCPP2_0_1, OCPPValidator, type SystemConfig } from '@citrineos/base';
-import type { ICertificateRepository, IDeleteCertificateAttemptRepository, IDeviceModelRepository, IInstallCertificateAttemptRepository, IInstalledCertificateRepository, IOCPPMessageRepository } from '@citrineos/data';
-import { CertificateAuthorityService, WebsocketNetworkConnection } from '@citrineos/util';
+import { AbstractModule, type BootstrapConfig, type CallAction, type HandlerProperties, type ICache, type IFileStorage, type IMessage, type IMessageHandler, type IMessageSender, OCPP2_0_1, OCPPValidator, type SystemConfig } from '@zetra/citrineos-base';
+import type { ICertificateRepository, IDeleteCertificateAttemptRepository, IDeviceModelRepository, IInstallCertificateAttemptRepository, IInstalledCertificateRepository, IOCPPMessageRepository } from '@zetra/citrineos-data';
+import { CertificateAuthorityService, WebsocketNetworkConnection } from '@zetra/citrineos-util';
 import { InstallCertificateHelperService } from './installCertificateHelperService.js';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/module/module.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { AbstractModule, AsHandler, ErrorCode, EventGroup, MessageOrigin, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@citrineos/base';
-import { InstalledCertificate, sequelize, SequelizeOCPPMessageRepository } from '@citrineos/data';
-import { CertificateAuthorityService, parseCSRForVerification, RabbitMqReceiver, RabbitMqSender, sendOCSPRequest, validatePEMEncodedCSR, WebsocketNetworkConnection, } from '@citrineos/util';
+import { AbstractModule, AsHandler, ErrorCode, EventGroup, MessageOrigin, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@zetra/citrineos-base';
+import { InstalledCertificate, sequelize, SequelizeOCPPMessageRepository } from '@zetra/citrineos-data';
+import { CertificateAuthorityService, parseCSRForVerification, RabbitMqReceiver, RabbitMqSender, sendOCSPRequest, validatePEMEncodedCSR, WebsocketNetworkConnection, } from '@zetra/citrineos-util';
 import { Crypto } from '@peculiar/webcrypto';
 import jsrsasign from 'jsrsasign';
 import * as pkijs from 'pkijs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zetra/citrineos-certificates",
-  "version": "1.8.3-fork.3",
+  "version": "1.8.4",
   "type": "module",
   "description": "The certificates module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
   "main": "dist/index.js",
@@ -21,8 +21,8 @@
     "@types/node-forge": "1.3.2"
   },
   "dependencies": {
-    "@zetra/citrineos-base": "1.8.3-fork.3",
-    "@zetra/citrineos-data": "1.8.3-fork.3",
-    "@zetra/citrineos-util": "1.8.3-fork.3"
+    "@zetra/citrineos-base": "1.8.4",
+    "@zetra/citrineos-data": "1.8.4",
+    "@zetra/citrineos-util": "1.8.4"
   }
 }