@prosopo/api-express-router 2.5.5 → 3.0.3

package/CHANGELOG.md

@@ -0,0 +1,70 @@
+# @prosopo/api-express-router
+
+## 3.0.3
+### Patch Changes
+
+- 9671152: uuid
+
+## 3.0.2
+### Patch Changes
+
+  - @prosopo/common@3.0.2
+  - @prosopo/api-route@2.6.7
+
+## 3.0.1
+### Patch Changes
+
+  - @prosopo/common@3.0.1
+  - @prosopo/api-route@2.6.6
+
+## 3.0.0
+### Major Changes
+
+- 64b5bcd: Access Controls
+
+### Patch Changes
+
+- Updated dependencies [64b5bcd]
+  - @prosopo/common@3.0.0
+  - @prosopo/api-route@2.6.5
+
+## 2.6.4
+### Patch Changes
+
+- 86c22b8: structured logging
+- Updated dependencies [86c22b8]
+  - @prosopo/api-route@2.6.4
+  - @prosopo/common@2.7.2
+
+## 2.6.3
+### Patch Changes
+
+  - @prosopo/common@2.7.1
+  - @prosopo/api-route@2.6.3
+
+## 2.6.2
+### Patch Changes
+
+- Updated dependencies [8f0644a]
+  - @prosopo/common@2.7.0
+  - @prosopo/api-route@2.6.2
+
+## 2.6.1
+
+### Patch Changes
+
+- Updated dependencies [04cc7ee]
+  - @prosopo/common@2.6.1
+  - @prosopo/api-route@2.6.1
+
+## 2.6.0
+
+### Minor Changes
+
+- a0bfc8a: bump all pkg versions since independent versioning applied
+
+### Patch Changes
+
+- Updated dependencies [a0bfc8a]
+  - @prosopo/api-route@2.6.0
+  - @prosopo/common@2.6.0

package/dist/cjs/apiExpressRouterFactory.cjs

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const express = require("express");
+const errorHandler = require("./errorHandler.cjs");
+class ApiExpressRouterFactory {
+  createRouter(routersProvider, apiEndpointAdapter) {
+    const router = express.Router();
+    const apiRoutes = routersProvider.getRoutes();
+    this.registerRoutes(router, apiRoutes, apiEndpointAdapter);
+    router.use(errorHandler.handleErrors);
+    return router;
+  }
+  registerRoutes(router, routes, apiEndpointAdapter) {
+    for (const route of routes) {
+      router.post(
+        route.path,
+        async (request, response, next) => {
+          return await apiEndpointAdapter.handleRequest(
+            route.endpoint,
+            request,
+            response,
+            next
+          );
+        }
+      );
+    }
+  }
+}
+exports.ApiExpressRouterFactory = ApiExpressRouterFactory;

package/dist/cjs/endpointAdapter/apiExpressDefaultEndpointAdapter.cjs

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
+class ApiExpressDefaultEndpointAdapter {
+  constructor(logLevel, errorStatusCode) {
+    this.logLevel = logLevel;
+    this.errorStatusCode = errorStatusCode;
+  }
+  async handleRequest(endpoint, request, response, next) {
+    let args;
+    try {
+      args = endpoint.getRequestArgsSchema()?.parse(request.body);
+    } catch (error) {
+      return next(
+        new common.ProsopoApiError("API.PARSE_ERROR", {
+          context: { code: 400, error }
+        })
+      );
+    }
+    try {
+      const apiEndpointResponse = await endpoint.processRequest(
+        args,
+        request.logger
+      );
+      response.json(apiEndpointResponse);
+    } catch (error) {
+      request.logger.error(() => ({
+        err: error
+      }));
+      response.status(500).send("An internal server error occurred.");
+    }
+  }
+}
+exports.ApiExpressDefaultEndpointAdapter = ApiExpressDefaultEndpointAdapter;

package/dist/cjs/errorHandler.cjs

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
+const handleErrors = (err, request, response, next) => {
+  const { code, statusMessage, jsonError } = common.unwrapError(err, request.i18n);
+  response.statusMessage = statusMessage;
+  response.set("content-type", "application/json");
+  response.status(code);
+  response.send({ error: jsonError });
+  response.end();
+};
+exports.handleErrors = handleErrors;

package/dist/cjs/index.cjs

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const apiExpressRouterFactory$1 = require("./apiExpressRouterFactory.cjs");
+const apiExpressDefaultEndpointAdapter = require("./endpointAdapter/apiExpressDefaultEndpointAdapter.cjs");
+const errorHandler = require("./errorHandler.cjs");
+const authMiddleware = require("./middlewares/authMiddleware.cjs");
+const requestLoggerMiddleware = require("./middlewares/requestLoggerMiddleware.cjs");
+const apiExpressRouterFactory = new apiExpressRouterFactory$1.ApiExpressRouterFactory();
+const createApiExpressDefaultEndpointAdapter = (logLevel, errorStatusCode = 500) => {
+  return new apiExpressDefaultEndpointAdapter.ApiExpressDefaultEndpointAdapter(logLevel, errorStatusCode);
+};
+exports.handleErrors = errorHandler.handleErrors;
+exports.authMiddleware = authMiddleware.authMiddleware;
+exports.verifySignature = authMiddleware.verifySignature;
+exports.requestLoggerMiddleware = requestLoggerMiddleware.requestLoggerMiddleware;
+exports.apiExpressRouterFactory = apiExpressRouterFactory;
+exports.createApiExpressDefaultEndpointAdapter = createApiExpressDefaultEndpointAdapter;

package/dist/cjs/middlewares/authMiddleware.cjs

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const util = require("@polkadot/util");
+const common = require("@prosopo/common");
+const authMiddleware = (pair, authAccount) => {
+  return async (req, res, next) => {
+    try {
+      const { signature, timestamp } = extractHeaders(req);
+      let error;
+      if (authAccount) {
+        try {
+          verifySignature(signature, timestamp, authAccount);
+          next();
+          return;
+        } catch (e) {
+          req.logger.warn(() => ({
+            err: e,
+            data: {
+              account: authAccount?.address
+            }
+          }));
+          error = e;
+        }
+      }
+      if (pair) {
+        verifySignature(signature, timestamp, pair);
+        next();
+        return;
+      }
+      res.status(401).json({
+        error: "Unauthorized",
+        message: new common.ProsopoEnvError(error || "CONTRACT.CANNOT_FIND_KEYPAIR")
+      });
+      return;
+    } catch (err) {
+      req.logger.error(() => ({ err, msg: "Auth Middleware Error" }));
+      res.status(401).json({ error: "Unauthorized", message: err });
+      return;
+    }
+  };
+};
+const extractHeaders = (req) => {
+  const signature = req.headers.signature;
+  const timestamp = req.headers.timestamp;
+  if (!timestamp) {
+    throw new common.ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
+      context: { error: "Missing timestamp", code: 400 }
+    });
+  }
+  if (!signature) {
+    throw new common.ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
+      context: { error: "Missing signature", code: 400 }
+    });
+  }
+  if (Array.isArray(signature) || Array.isArray(timestamp) || !util.isHex(signature)) {
+    throw new common.ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
+      context: { error: "Invalid header format", code: 400 }
+    });
+  }
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const ts = Number.parseInt(timestamp);
+  if (now - ts > 3e5) {
+    throw new common.ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
+      context: { error: "Timestamp is too old", code: 400 }
+    });
+  }
+  return { signature, timestamp };
+};
+const verifySignature = (signature, message, pair) => {
+  const u8Sig = util.hexToU8a(signature);
+  if (!pair.verify(message, u8Sig, pair.publicKey)) {
+    throw new common.ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
+      context: {
+        error: "Signature verification failed",
+        code: 401,
+        account: pair.address,
+        message,
+        signature
+      }
+    });
+  }
+};
+exports.authMiddleware = authMiddleware;
+exports.verifySignature = verifySignature;

package/dist/cjs/middlewares/requestLoggerMiddleware.cjs

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
+const uuid = require("uuid");
+function requestLoggerMiddleware(env) {
+  return (req, res, next) => {
+    const requestId = req.headers["x-request-id"] || `e-${uuid.v4()}`;
+    const logger = common.getLogger(
+      common.parseLogLevel(env.config.logLevel),
+      "request-logger"
+    ).with({
+      requestId
+    });
+    req.logger = logger;
+    req.requestId = requestId;
+    next();
+  };
+}
+exports.requestLoggerMiddleware = requestLoggerMiddleware;

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiExpressDefaultEndpointAdapter.d.ts","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEhF,cAAM,gCAAiC,YAAW,yBAAyB;IAEzE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,MAAM;IAG5B,aAAa,CACzB,QAAQ,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,EAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;CAyBhB;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"apiExpressDefaultEndpointAdapter.d.ts","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEhF,cAAM,gCAAiC,YAAW,yBAAyB;IAEzE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,MAAM;IAG5B,aAAa,CACzB,QAAQ,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,EAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;CA2BhB;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js

@@ -19,7 +19,9 @@ class ApiExpressDefaultEndpointAdapter {
             response.json(apiEndpointResponse);
         }
         catch (error) {
-            request.logger.error(error.message);
+            request.logger.error(() => ({
+                err: error,
+            }));
             response.status(500).send("An internal server error occurred.");
         }
     }

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiExpressDefaultEndpointAdapter.js","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAiB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKjE,MAAM,gCAAgC;IACrC,YACkB,QAAkB,EAClB,eAAuB;QADvB,aAAQ,GAAR,QAAQ,CAAU;QAClB,oBAAe,GAAf,eAAe,CAAQ;IACtC,CAAC;IAEG,KAAK,CAAC,aAAa,CACzB,QAA0C,EAC1C,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,QAAQ,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;aACpC,CAAC,CACF,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,cAAc,CACxD,IAAI,EACJ,OAAO,CAAC,MAAM,CACd,CAAC;YAEF,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;YAE/C,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;CACD;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"apiExpressDefaultEndpointAdapter.js","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAiB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKjE,MAAM,gCAAgC;IACrC,YACkB,QAAkB,EAClB,eAAuB;QADvB,aAAQ,GAAR,QAAQ,CAAU;QAClB,oBAAe,GAAf,eAAe,CAAQ;IACtC,CAAC;IAEG,KAAK,CAAC,aAAa,CACzB,QAA0C,EAC1C,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,QAAQ,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;aACpC,CAAC,CACF,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,cAAc,CACxD,IAAI,EACJ,OAAO,CAAC,MAAM,CACd,CAAC;YAEF,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3B,GAAG,EAAE,KAAK;aACV,CAAC,CAAC,CAAC;YAEJ,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;CACD;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}

package/dist/index.d.ts

@@ -5,4 +5,6 @@ declare const apiExpressRouterFactory: ApiExpressRouterFactory;
 declare const createApiExpressDefaultEndpointAdapter: (logLevel: LogLevel, errorStatusCode?: number) => ApiExpressEndpointAdapter;
 export { apiExpressRouterFactory, createApiExpressDefaultEndpointAdapter, type ApiExpressEndpointAdapter, };
 export * from "./errorHandler.js";
+export * from "./middlewares/authMiddleware.js";
+export * from "./middlewares/requestLoggerMiddleware.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAEhG,QAAA,MAAM,uBAAuB,yBAAgC,CAAC;AAE9D,QAAA,MAAM,sCAAsC,aACjC,QAAQ,+BAEhB,yBAEF,CAAC;AAEF,OAAO,EACN,uBAAuB,EACvB,sCAAsC,EACtC,KAAK,yBAAyB,GAC9B,CAAC;AAEF,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAEhG,QAAA,MAAM,uBAAuB,yBAAgC,CAAC;AAE9D,QAAA,MAAM,sCAAsC,aACjC,QAAQ,+BAEhB,yBAEF,CAAC;AAEF,OAAO,EACN,uBAAuB,EACvB,sCAAsC,EACtC,KAAK,yBAAyB,GAC9B,CAAC;AAEF,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0CAA0C,CAAC"}

package/dist/index.js

@@ -6,4 +6,6 @@ const createApiExpressDefaultEndpointAdapter = (logLevel, errorStatusCode = 500)
 };
 export { apiExpressRouterFactory, createApiExpressDefaultEndpointAdapter, };
 export * from "./errorHandler.js";
+export * from "./middlewares/authMiddleware.js";
+export * from "./middlewares/requestLoggerMiddleware.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AAGzG,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,EAAE,CAAC;AAE9D,MAAM,sCAAsC,GAAG,CAC9C,QAAkB,EAClB,eAAe,GAAG,GAAG,EACO,EAAE;IAC9B,OAAO,IAAI,gCAAgC,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,OAAO,EACN,uBAAuB,EACvB,sCAAsC,GAEtC,CAAC;AAEF,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AAGzG,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,EAAE,CAAC;AAE9D,MAAM,sCAAsC,GAAG,CAC9C,QAAkB,EAClB,eAAe,GAAG,GAAG,EACO,EAAE;IAC9B,OAAO,IAAI,gCAAgC,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,OAAO,EACN,uBAAuB,EACvB,sCAAsC,GAEtC,CAAC;AAEF,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0CAA0C,CAAC"}

package/dist/middlewares/authMiddleware.d.ts

@@ -0,0 +1,5 @@
+import type { KeyringPair } from "@prosopo/types";
+import type { NextFunction, Request, Response } from "express";
+export declare const authMiddleware: (pair: KeyringPair | undefined, authAccount?: KeyringPair | undefined) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare const verifySignature: (signature: string, message: string, pair: KeyringPair) => void;
+//# sourceMappingURL=authMiddleware.d.ts.map

package/dist/middlewares/authMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/authMiddleware.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,SACpB,WAAW,GAAG,SAAS,gBACf,WAAW,GAAG,SAAS,WAElB,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAwC7D,CAAC;AAyCF,eAAO,MAAM,eAAe,cAChB,MAAM,WACR,MAAM,QACT,WAAW,SAejB,CAAC"}

package/dist/middlewares/authMiddleware.js

@@ -0,0 +1,85 @@
+import { hexToU8a, isHex } from "@polkadot/util";
+import { ProsopoApiError, ProsopoEnvError } from "@prosopo/common";
+export const authMiddleware = (pair, authAccount) => {
+    return async (req, res, next) => {
+        try {
+            const { signature, timestamp } = extractHeaders(req);
+            let error;
+            if (authAccount) {
+                try {
+                    verifySignature(signature, timestamp, authAccount);
+                    next();
+                    return;
+                }
+                catch (e) {
+                    req.logger.warn(() => ({
+                        err: e,
+                        data: {
+                            account: authAccount?.address,
+                        },
+                    }));
+                    error = e;
+                }
+            }
+            if (pair) {
+                verifySignature(signature, timestamp, pair);
+                next();
+                return;
+            }
+            res.status(401).json({
+                error: "Unauthorized",
+                message: new ProsopoEnvError(error || "CONTRACT.CANNOT_FIND_KEYPAIR"),
+            });
+            return;
+        }
+        catch (err) {
+            req.logger.error(() => ({ err, msg: "Auth Middleware Error" }));
+            res.status(401).json({ error: "Unauthorized", message: err });
+            return;
+        }
+    };
+};
+const extractHeaders = (req) => {
+    const signature = req.headers.signature;
+    const timestamp = req.headers.timestamp;
+    if (!timestamp) {
+        throw new ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
+            context: { error: "Missing timestamp", code: 400 },
+        });
+    }
+    if (!signature) {
+        throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
+            context: { error: "Missing signature", code: 400 },
+        });
+    }
+    if (Array.isArray(signature) ||
+        Array.isArray(timestamp) ||
+        !isHex(signature)) {
+        throw new ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
+            context: { error: "Invalid header format", code: 400 },
+        });
+    }
+    const now = new Date().getTime();
+    const ts = Number.parseInt(timestamp);
+    if (now - ts > 300000) {
+        throw new ProsopoApiError("GENERAL.INVALID_TIMESTAMP", {
+            context: { error: "Timestamp is too old", code: 400 },
+        });
+    }
+    return { signature, timestamp };
+};
+export const verifySignature = (signature, message, pair) => {
+    const u8Sig = hexToU8a(signature);
+    if (!pair.verify(message, u8Sig, pair.publicKey)) {
+        throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
+            context: {
+                error: "Signature verification failed",
+                code: 401,
+                account: pair.address,
+                message,
+                signature,
+            },
+        });
+    }
+};
+//# sourceMappingURL=authMiddleware.js.map

package/dist/middlewares/authMiddleware.js.map

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

package/dist/middlewares/requestLoggerMiddleware.d.ts

@@ -0,0 +1,4 @@
+import type { ProviderEnvironment } from "@prosopo/env";
+import type { NextFunction, Request, Response } from "express";
+export declare function requestLoggerMiddleware(env: ProviderEnvironment): (req: Request, res: Response, next: NextFunction) => void;
+//# sourceMappingURL=requestLoggerMiddleware.d.ts.map

package/dist/middlewares/requestLoggerMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestLoggerMiddleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,SAClD,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAkBvD"}

package/dist/middlewares/requestLoggerMiddleware.js

@@ -0,0 +1,14 @@
+import { getLogger, parseLogLevel } from "@prosopo/common";
+import { v4 as uuidv4 } from "uuid";
+export function requestLoggerMiddleware(env) {
+    return (req, res, next) => {
+        const requestId = req.headers["x-request-id"] || `e-${uuidv4()}`;
+        const logger = getLogger(parseLogLevel(env.config.logLevel), "request-logger").with({
+            requestId,
+        });
+        req.logger = logger;
+        req.requestId = requestId;
+        next();
+    };
+}
+//# sourceMappingURL=requestLoggerMiddleware.js.map

package/dist/middlewares/requestLoggerMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestLoggerMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG3D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,UAAU,uBAAuB,CAAC,GAAwB;IAC/D,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC1D,MAAM,SAAS,GACb,GAAG,CAAC,OAAO,CAAC,cAAc,CAAY,IAAI,KAAK,MAAM,EAAE,EAAE,CAAC;QAE5D,MAAM,MAAM,GAAG,SAAS,CACvB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAClC,gBAAgB,CAChB,CAAC,IAAI,CAAC;YACN,SAAS;SACT,CAAC,CAAC;QAGH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;QACpB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;QAG1B,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC"}

package/dist/tests/unit/middlewares/authMiddleware.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=authMiddleware.unit.test.d.ts.map

package/dist/tests/unit/middlewares/authMiddleware.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authMiddleware.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/unit/middlewares/authMiddleware.unit.test.ts"],"names":[],"mappings":""}

package/dist/tests/unit/middlewares/authMiddleware.unit.test.js

@@ -0,0 +1,135 @@
+import { hexToU8a, isHex } from "@polkadot/util";
+import { ProsopoApiError, ProsopoEnvError, getLogger, } from "@prosopo/common";
+import { describe, expect, it, vi } from "vitest";
+import { authMiddleware } from "../../../middlewares/authMiddleware.js";
+const loggerOuter = getLogger("info", import.meta.url);
+const mockLogger = {
+    debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
+    log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
+    info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
+    error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
+    trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
+    fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
+    warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
+};
+vi.mock("@polkadot/util", async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        hexToU8a: vi.fn(),
+        isHex: vi.fn(),
+    };
+});
+const mockPair = {
+    publicKey: "mockPublicKey",
+    verify: vi.fn(),
+};
+const mockEnv = {
+    pair: mockPair,
+    authAccount: mockPair,
+    logger: mockLogger,
+};
+describe("authMiddleware", () => {
+    it("should call next() if signature is valid", async () => {
+        const mockLogger = {
+            debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
+            log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
+            info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
+            error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
+            trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
+            fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
+            warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
+        };
+        const mockReq = {
+            url: "/v1/prosopo/provider/captcha/image",
+            originalUrl: "/v1/prosopo/provider/captcha/image",
+            headers: {
+                signature: "0x1234",
+                timestamp: new Date().getTime(),
+            },
+            logger: mockLogger,
+        };
+        const mockRes = {
+            status: vi.fn().mockReturnThis(),
+            json: vi.fn(),
+        };
+        const mockNext = vi.fn();
+        vi.mocked(isHex).mockReturnValue(true);
+        vi.mocked(hexToU8a).mockReturnValue(new Uint8Array());
+        vi.mocked(mockPair.verify).mockReturnValue(true);
+        const middleware = authMiddleware(mockEnv.pair, mockEnv.authAccount);
+        await middleware(mockReq, mockRes, mockNext);
+        expect(mockNext).toHaveBeenCalled();
+        expect(mockRes.status).not.toHaveBeenCalled();
+    });
+    it("should return 401 if signature is invalid", async () => {
+        const mockLogger = {
+            debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
+            log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
+            info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
+            error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
+            trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
+            fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
+            warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
+        };
+        const mockReq = {
+            url: "/v1/prosopo/provider/captcha/image",
+            originalUrl: "/v1/prosopo/provider/captcha/image",
+            headers: {
+                signature: "0x1234",
+                timestamp: new Date().getTime(),
+            },
+            logger: mockLogger,
+        };
+        const mockRes = {
+            status: vi.fn().mockReturnThis(),
+            json: vi.fn(),
+        };
+        const mockNext = vi.fn();
+        vi.mocked(isHex).mockReturnValue(true);
+        vi.mocked(hexToU8a).mockReturnValue(new Uint8Array());
+        vi.mocked(mockPair.verify).mockReturnValue(false);
+        const middleware = authMiddleware(mockEnv.pair, mockEnv.authAccount);
+        await middleware(mockReq, mockRes, mockNext);
+        expect(mockNext).not.toHaveBeenCalled();
+        expect(mockRes.status).toHaveBeenCalledWith(401);
+        expect(mockRes.json).toHaveBeenCalledWith({
+            error: "Unauthorized",
+            message: expect.any(ProsopoApiError),
+        });
+    });
+    it("should return 401 if key pair is missing", async () => {
+        const mockLogger = {
+            debug: vi.fn().mockImplementation(loggerOuter.debug.bind(loggerOuter)),
+            log: vi.fn().mockImplementation(loggerOuter.log.bind(loggerOuter)),
+            info: vi.fn().mockImplementation(loggerOuter.info.bind(loggerOuter)),
+            error: vi.fn().mockImplementation(loggerOuter.error.bind(loggerOuter)),
+            trace: vi.fn().mockImplementation(loggerOuter.trace.bind(loggerOuter)),
+            fatal: vi.fn().mockImplementation(loggerOuter.fatal.bind(loggerOuter)),
+            warn: vi.fn().mockImplementation(loggerOuter.warn.bind(loggerOuter)),
+        };
+        const mockReq = {
+            url: "/v1/prosopo/provider/captcha/image",
+            originalUrl: "/v1/prosopo/provider/captcha/image",
+            headers: {
+                signature: "0x1234",
+                timestamp: new Date().getTime(),
+            },
+            logger: mockLogger,
+        };
+        const mockRes = {
+            status: vi.fn().mockReturnThis(),
+            json: vi.fn(),
+        };
+        const mockNext = vi.fn();
+        const middleware = authMiddleware(undefined, undefined);
+        await middleware(mockReq, mockRes, mockNext);
+        expect(mockNext).not.toHaveBeenCalled();
+        expect(mockRes.status).toHaveBeenCalledWith(401);
+        expect(mockRes.json).toHaveBeenCalledWith({
+            error: "Unauthorized",
+            message: expect.any(ProsopoEnvError),
+        });
+    });
+});
+//# sourceMappingURL=authMiddleware.unit.test.js.map

package/dist/tests/unit/middlewares/authMiddleware.unit.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authMiddleware.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/middlewares/authMiddleware.unit.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/api-express-router",
-	"version": "2.5.5",
+	"version": "3.0.3",
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
@@ -20,12 +20,13 @@
 		"build:cjs": "npx vite --config vite.cjs.config.ts build"
 	},
 	"dependencies": {
-		"@prosopo/api-route": "2.5.5",
-		"@prosopo/common": "2.5.5",
+		"@prosopo/api-route": "2.6.7",
+		"@prosopo/common": "3.0.2",
+		"uuid": "11.1.0",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "2.5.5"
+		"@prosopo/config": "3.1.0"
 	},
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",

package/vite.test.config.ts

@@ -30,4 +30,4 @@ if (fs.existsSync(envFile)) {
 
 dotenv.config({ path: envPath });
 
-export default ViteTestConfig;
+export default ViteTestConfig();