@lucaapp/service-utils 1.13.0 → 1.14.0

package/dist/lib/kafka/events/locationGroupEmployees.d.ts

@@ -0,0 +1,12 @@
+declare type LocationGroupEmployees = {
+    uuid: string;
+    firstName: string;
+    lastName: string | null;
+    employeeNumber: string | null;
+    locationGroupId: string;
+    lucaPayConsumerEmail: string | null;
+    ambassadorShares: number | null;
+    createdAt: Date;
+    updatedAt: Date;
+};
+export type { LocationGroupEmployees };

package/dist/lib/kafka/events/locationGroupEmployees.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/lib/kafka/events.d.ts

@@ -1,12 +1,14 @@
 import type { Payment } from './events/payment';
 import type { Consumer } from './events/consumer';
 import type { Operator } from './events/operator';
+import type { LocationGroupEmployees } from './events/locationGroupEmployees';
 import type { WsEvent } from './events/wsEvent';
 import { Service } from '../serviceIdentity';
 declare enum KafkaTopic {
     PAYMENTS = "payments",
     CONSUMERS = "consumers",
     OPERATORS = "operators",
+    LOCATION_GROUP_EMPLOYEES = "location_group_employees",
     WS_EVENT_backend = "wsevent_backend",
     WS_EVENT_backend_pay = "wsevent_backend-pay",
     WS_EVENT_backend_pos = "wsevent_backend-pos"
@@ -15,6 +17,7 @@ declare type MessageFormats = {
     [KafkaTopic.PAYMENTS]: Payment;
     [KafkaTopic.CONSUMERS]: Consumer;
     [KafkaTopic.OPERATORS]: Operator;
+    [KafkaTopic.LOCATION_GROUP_EMPLOYEES]: LocationGroupEmployees;
     [KafkaTopic.WS_EVENT_backend]: WsEvent;
     [KafkaTopic.WS_EVENT_backend_pay]: WsEvent;
     [KafkaTopic.WS_EVENT_backend_pos]: WsEvent;
@@ -23,6 +26,7 @@ declare const MessageIssuer: {
     payments: Service;
     consumers: Service;
     operators: Service;
+    location_group_employees: Service;
     wsevent_backend: Service;
     "wsevent_backend-pay": Service;
     "wsevent_backend-pos": Service;

package/dist/lib/kafka/events.js

@@ -7,6 +7,7 @@ var KafkaTopic;
     KafkaTopic["PAYMENTS"] = "payments";
     KafkaTopic["CONSUMERS"] = "consumers";
     KafkaTopic["OPERATORS"] = "operators";
+    KafkaTopic["LOCATION_GROUP_EMPLOYEES"] = "location_group_employees";
     KafkaTopic["WS_EVENT_backend"] = "wsevent_backend";
     KafkaTopic["WS_EVENT_backend_pay"] = "wsevent_backend-pay";
     KafkaTopic["WS_EVENT_backend_pos"] = "wsevent_backend-pos";
@@ -16,6 +17,7 @@ const MessageIssuer = {
     [KafkaTopic.PAYMENTS]: serviceIdentity_1.Service.BACKEND_PAY,
     [KafkaTopic.CONSUMERS]: serviceIdentity_1.Service.BACKEND,
     [KafkaTopic.OPERATORS]: serviceIdentity_1.Service.BACKEND,
+    [KafkaTopic.LOCATION_GROUP_EMPLOYEES]: serviceIdentity_1.Service.BACKEND,
     [KafkaTopic.WS_EVENT_backend]: serviceIdentity_1.Service.BACKEND,
     [KafkaTopic.WS_EVENT_backend_pay]: serviceIdentity_1.Service.BACKEND_PAY,
     [KafkaTopic.WS_EVENT_backend_pos]: serviceIdentity_1.Service.BACKEND_POS,

package/dist/lib/serviceIdentity/serviceIdentity.d.ts

@@ -1,13 +1,15 @@
 import * as jose from 'jose';
 import { HttpMethod } from 'types/http';
-import { Json } from 'types/json';
-import { RequestHandler } from 'express';
+import { Request, RequestHandler } from 'express';
+import { Service } from './service';
+declare type JWKS = {
+    keys: jose.JWK[];
+};
 declare class ServiceIdentity {
     readonly identityName: string;
     readonly identityKid: string;
     private readonly identityPrivateKey;
     private readonly identityPublicKey;
-    private readonly debug;
     private readonly jwksCache;
     private readonly keyCache;
     private readonly axiosClient;
@@ -16,8 +18,12 @@ declare class ServiceIdentity {
     private getJwtVerifyOptions;
     getIdentityPublicKey: () => Promise<jose.KeyLike>;
     getIdentityPrivateKey: () => Promise<jose.KeyLike>;
-    callService: <T>(service: string, method: HttpMethod, url: string, data?: Json) => Promise<T>;
-    private getIdentityJWKS;
+    callService: <T>(service: Service, method: HttpMethod, url: string, data?: unknown) => Promise<T>;
+    signJWT: (service: string, method: HttpMethod, url: string, data?: unknown) => Promise<string>;
+    verifyJWT: (request: Request, service: string) => Promise<{
+        payload: jose.JWTPayload;
+    }>;
+    getIdentityJWKS: () => Promise<JWKS>;
     requireServiceIdentity: (service: string) => RequestHandler;
     identityJWKSRoute: RequestHandler;
 }

package/dist/lib/serviceIdentity/serviceIdentity.js

@@ -69,9 +69,24 @@ class ServiceIdentity {
             return this.keyCache.private;
         };
         this.callService = async (service, method, url, data) => {
-            const jwt = await new jose.SignJWT({
+            const jwt = await this.signJWT(service, method, url, data);
+            const request = {
+                headers: {
+                    [JWT_HEADER_NAME]: jwt,
+                    ...(0, requestTracer_1.getRequestIdHeader)(),
+                },
+                baseURL: `http://${service}:8080/`,
+                url,
+                method,
+            };
+            const response = await this.axiosClient.request(request);
+            return response.data;
+        };
+        this.signJWT = async (service, method, url, data) => {
+            return await new jose.SignJWT({
                 method,
                 url,
+                data,
             })
                 .setProtectedHeader({
                 alg: JWT_ALGORITHM,
@@ -84,18 +99,14 @@ class ServiceIdentity {
                 .setNotBefore(JWT_NBF)
                 .setExpirationTime(JWT_EXP)
                 .sign(await this.getIdentityPrivateKey());
-            const request = {
-                headers: {
-                    [JWT_HEADER_NAME]: jwt,
-                    ...(0, requestTracer_1.getRequestIdHeader)(),
-                },
-                baseURL: `http://${service}:8080/`,
-                url,
-                method,
-                data,
-            };
-            const response = await this.axiosClient.request(request);
-            return response.data;
+        };
+        this.verifyJWT = async (request, service) => {
+            const jwt = request.header(JWT_HEADER_NAME);
+            if (typeof jwt !== 'string') {
+                throw (0, boom_1.unauthorized)();
+            }
+            const { payload } = await jose.jwtVerify(jwt, this.getRemoteJWKS(service), this.getJwtVerifyOptions(service));
+            return { payload };
         };
         this.getIdentityJWKS = async () => {
             const publicKey = await this.getIdentityPublicKey();
@@ -103,26 +114,22 @@ class ServiceIdentity {
             jwk.kid = this.identityKid;
             return { keys: [jwk] };
         };
-        this.requireServiceIdentity = (service) => async (request, response, next) => {
-            const jwt = request.header(JWT_HEADER_NAME);
-            if (typeof jwt !== 'string') {
-                throw (0, boom_1.unauthorized)();
-            }
-            const { payload } = await jose.jwtVerify(jwt, this.getRemoteJWKS(service), this.getJwtVerifyOptions(service));
+        this.requireServiceIdentity = (service) => async (request, _, next) => {
+            const { payload } = await this.verifyJWT(request, service);
             if (request.originalUrl !== payload.url)
                 throw (0, boom_1.forbidden)(`${request.originalUrl} !== ${payload.url}`);
             if (request.method !== payload.method)
                 throw (0, boom_1.forbidden)(`${request.method} !== ${payload.method}`);
+            request.body = payload.data;
             next();
         };
-        this.identityJWKSRoute = async (request, response) => {
+        this.identityJWKSRoute = async (_, response) => {
             response.send(await this.getIdentityJWKS());
         };
         this.identityName = identityName;
         this.identityKid = identityKid;
         this.identityPrivateKey = identityPrivateKey;
         this.identityPublicKey = identityPublicKey;
-        this.debug = debug;
         this.axiosClient = axios_1.default.create({ proxy: false });
         if (!debug) {
             this.axiosClient.interceptors.response.use(response => response, error => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [