@zetra/citrineos-util 1.8.3-fork.37 → 1.8.3-fork.39

package/dist/authorization/OidcTokenProvider.d.ts

@@ -1,15 +1,2 @@
-import type { ILogObj } from 'tslog';
-import { Logger } from 'tslog';
-export interface OidcTokenProviderConfig {
-    tokenUrl: string;
-    clientId: string;
-    clientSecret: string;
-    audience: string;
-}
-export declare class OidcTokenProvider {
-    private config;
-    private oidcToken?;
-    private readonly _logger;
-    constructor(config: OidcTokenProviderConfig, logger?: Logger<ILogObj>);
-    getToken(): Promise<string>;
-}
+export { OidcTokenProvider } from '@zetra/citrineos-base';
+export type { OidcTokenProviderConfig } from '@zetra/citrineos-base';

package/dist/authorization/OidcTokenProvider.js

@@ -1,47 +1,8 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Logger } from 'tslog';
-export class OidcTokenProvider {
-    config;
-    oidcToken;
-    _logger;
-    constructor(config, logger) {
-        this.config = config;
-        this._logger = logger
-            ? logger.getSubLogger({ name: this.constructor.name })
-            : new Logger({ name: this.constructor.name });
-    }
-    async getToken() {
-        if (this.oidcToken && this.oidcToken.expiresAt > Date.now()) {
-            this._logger.debug('Returning cached OIDC token');
-            return this.oidcToken.accessToken;
-        }
-        this._logger.debug('Fetching new OIDC token');
-        const response = await fetch(this.config.tokenUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-            },
-            body: new URLSearchParams({
-                grant_type: 'client_credentials',
-                client_id: this.config.clientId,
-                client_secret: this.config.clientSecret,
-                audience: this.config.audience,
-            }),
-        });
-        if (!response.ok) {
-            const errorText = await response.text();
-            this._logger.error('Failed to fetch OIDC token:', errorText);
-            throw new Error(`Failed to fetch OIDC token: ${response.statusText}`);
-        }
-        const tokenData = await response.json();
-        this.oidcToken = {
-            accessToken: tokenData.access_token,
-            // Set expiry to 1 minute before actual expiration to be safe
-            expiresAt: Date.now() + (tokenData.expires_in - 60) * 1000,
-        };
-        return this.oidcToken.accessToken;
-    }
-}
+// The OidcTokenProvider now lives in @zetra/citrineos-base so that base-level modules
+// (e.g. AbstractModule message API callbacks) can authenticate callbacks as well.
+// Re-exported here to preserve existing import paths.
+export { OidcTokenProvider } from '@zetra/citrineos-base';
 //# sourceMappingURL=OidcTokenProvider.js.map

package/dist/authorization/OidcTokenProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"OidcTokenProvider.js","sourceRoot":"","sources":["../../src/authorization/OidcTokenProvider.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAc/B,MAAM,OAAO,iBAAiB;IAKlB;IAJF,SAAS,CAAa;IACb,OAAO,CAAkB;IAE1C,YACU,MAA+B,EACvC,MAAwB;QADhB,WAAM,GAAN,MAAM,CAAyB;QAGvC,IAAI,CAAC,OAAO,GAAG,MAAM;YACnB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC,CAAC,IAAI,MAAM,CAAU,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,mCAAmC;aACpD;YACD,IAAI,EAAE,IAAI,eAAe,CAAC;gBACxB,UAAU,EAAE,oBAAoB;gBAChC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAC/B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;gBACvC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;aAC/B,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,+BAA+B,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG;YACf,WAAW,EAAE,SAAS,CAAC,YAAY;YACnC,6DAA6D;YAC7D,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,IAAI;SAC3D,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;IACpC,CAAC;CACF"}
+{"version":3,"file":"OidcTokenProvider.js","sourceRoot":"","sources":["../../src/authorization/OidcTokenProvider.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAEtC,gFAAgF;AAChF,kFAAkF;AAClF,sDAAsD;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zetra/citrineos-util",
-  "version": "1.8.3-fork.37",
+  "version": "1.8.3-fork.39",
   "description": "The OCPP util module which supplies helpful utilities like cache and queue connectors, etc.",
   "type": "module",
   "main": "dist/index.js",
@@ -24,8 +24,8 @@
     "@types/jsrsasign": "10.5.14"
   },
   "dependencies": {
-    "@zetra/citrineos-base": "1.8.3-fork.37",
-    "@zetra/citrineos-data": "1.8.3-fork.37",
+    "@zetra/citrineos-base": "1.8.3-fork.39",
+    "@zetra/citrineos-data": "1.8.3-fork.39",
     "@fastify/swagger": "9.4.0",
     "@fastify/swagger-ui": "5.2.0",
     "@google-cloud/storage": "7.18.0",