node-server-engine 1.1.6 → 1.1.8

package/dist/utils/jwt/jwt.js

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.adminKeySet = void 0;
 exports.generateJwtToken = generateJwtToken;
 exports.initKeySets = initKeySets;
 exports.jwtVerify = jwtVerify;
@@ -20,7 +19,6 @@ var _checkEnvironment = require("../checkEnvironment");
 var _envAssert = require("../envAssert");
 var _report = require("../report");
 let keySet = exports.keySet = void 0;
-let adminKeySet = exports.adminKeySet = void 0;
 const namespace = 'engine:utils:jwt';
 
 /** Initiate key fetching mechanism */
@@ -47,22 +45,12 @@ async function initKeySets() {
     });
   }
   const promise = [keySet.init.bind(keySet)()];
-
-  // Load the key set for the admin api
-  if (!process.env.ADMIN_API_ECDSA_PUBLIC_KEY) throw new _EngineError.EngineError({
-    message: "Admin API's authentication JWT signing public key is not defined"
-  });
-  exports.adminKeySet = adminKeySet = new _KeySet.KeySet(process.env.ADMIN_API_ECDSA_PUBLIC_KEY, {
-    pem: true
-  });
-  promise.push(adminKeySet.init.bind(adminKeySet)());
   await Promise.all(promise);
 }
 
 /** Stop fetching keys regularly */
 function shutdownKeySets() {
   if (keySet) keySet.shutdown.bind(keySet)();
-  if (adminKeySet) adminKeySet.shutdown.bind(adminKeySet)();
 }
 
 /** Get the JWT public key */
@@ -73,7 +61,7 @@ function jwtGetKey(header, callback) {
     return;
   }
   // Check that KeySet has been initialized
-  if (!keySet || !adminKeySet) {
+  if (!keySet) {
     callback(new _EngineError.EngineError({
       message: 'KeySet has not been initialized'
     }));
@@ -134,9 +122,7 @@ async function jwtVerify(token, issuer = _const.TokenIssuer.AUTH_SERVICE) {
   }
   (0, _checkEnvironment.assertEnvironment)({
     ACCESS_TOKEN_AUDIENCE: _envAssert.envAssert.isString(),
-    ACCESS_TOKEN_ISSUER: _envAssert.envAssert.isString(),
-    ADMIN_API_ACCESS_TOKEN_AUDIENCE: _envAssert.envAssert.isString(),
-    ADMIN_ACCESS_TOKEN_ISSUER: _envAssert.envAssert.isString()
+    ACCESS_TOKEN_ISSUER: _envAssert.envAssert.isString()
   });
   let options;
   switch (issuer) {
@@ -147,13 +133,6 @@ async function jwtVerify(token, issuer = _const.TokenIssuer.AUTH_SERVICE) {
         algorithms
       };
       break;
-    case _const.TokenIssuer.ADMIN_API:
-      options = {
-        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE],
-        issuer: [process.env.ADMIN_ACCESS_TOKEN_ISSUER],
-        algorithms
-      };
-      break;
     default:
       throw new _EngineError.EngineError({
         message: `Invalid token issuer specified "${issuer}"`

package/dist/utils/jwt/jwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.js","names":["_jsonwebtoken","require","_fs","_interopRequireDefault","_const","_EngineError","_KeySet","_WebError","_checkEnvironment","_envAssert","_report","keySet","exports","adminKeySet","namespace","initKeySets","process","env","CHART","ECDSA_PUBLIC_KEY","EngineError","message","KeySet","file","AUTH_SERVICE_URL","internal","promise","init","bind","ADMIN_API_ECDSA_PUBLIC_KEY","pem","push","Promise","all","shutdownKeySets","shutdown","jwtGetKey","header","callback","NODE_ENV","JWT_SECRET","kid","data","reportDebug","key","getKey","error","Error","WebError","statusCode","errorCode","jwtVerify","token","issuer","TokenIssuer","AUTH_SERVICE","algorithms","assertEnvironment","envAssert","isString","ACCESS_TOKEN_AUDIENCE","ACCESS_TOKEN_ISSUER","ADMIN_API_ACCESS_TOKEN_AUDIENCE","ADMIN_ACCESS_TOKEN_ISSUER","options","audience","ADMIN_API","resolve","reject","verify","result","undefined","generateJwtToken","user","signOptions","algorithm","expiresIn","keyid","Object","keys","getKeys","privateKey","fs","readFileSync","PRIVATE_KEY_PATH","sign"],"sources":["../../../src/utils/jwt/jwt.ts"],"sourcesContent":["import {\n  verify,\n  JwtHeader,\n  SigningKeyCallback,\n  Algorithm,\n  VerifyOptions,\n  sign\n} from 'jsonwebtoken';\nimport fs from 'fs';\nimport path from 'path';\nimport { UserTokenPayload } from './jwt.types';\nimport { TokenIssuer } from 'const';\nimport { EngineError } from 'entities/EngineError';\nimport { KeySet } from 'entities/KeySet';\nimport { WebError } from 'entities/WebError';\nimport { assertEnvironment } from 'utils/checkEnvironment';\nimport { envAssert } from 'utils/envAssert';\nimport { reportDebug } from 'utils/report';\n\nexport let keySet: KeySet | undefined;\nexport let adminKeySet: KeySet | undefined;\n\nconst namespace = 'engine:utils:jwt';\n\n/** Initiate key fetching mechanism */\nexport async function initKeySets(): Promise<void> {\n  // Create the KeySet instance\n  // The auth-service fetches its key from its disk and not from a network request\n  // This prevents fetch failures the first time the auth-service is started\n  if (process.env.CHART === 'auth-service') {\n    if (!process.env.ECDSA_PUBLIC_KEY)\n      throw new EngineError({\n        message: 'Environment variable \"ECDSA_PUBLIC_KEY\" is not defined'\n      });\n    keySet = new KeySet(process.env.ECDSA_PUBLIC_KEY, { file: true });\n  } else {\n    if (process.env.AUTH_SERVICE_URL)\n      keySet = new KeySet(\n        `${process.env.AUTH_SERVICE_URL}/.well-known/jwks.json`,\n        { internal: true }\n      );\n    else\n      keySet = new KeySet(`./keys/jwks.json`, { internal: true, file: true });\n\n    if (!keySet)\n      throw new EngineError({\n        message:\n          'Environment variable \"AUTH_SERVICE_URL\" is not defined or JWKS not found'\n      });\n  }\n  const promise = [keySet.init.bind(keySet)()];\n\n  // Load the key set for the admin api\n  if (!process.env.ADMIN_API_ECDSA_PUBLIC_KEY)\n    throw new EngineError({\n      message:\n        \"Admin API's authentication JWT signing public key is not defined\"\n    });\n  adminKeySet = new KeySet(process.env.ADMIN_API_ECDSA_PUBLIC_KEY, {\n    pem: true\n  });\n  promise.push(adminKeySet.init.bind(adminKeySet)());\n\n  await Promise.all(promise);\n}\n\n/** Stop fetching keys regularly */\nexport function shutdownKeySets(): void {\n  if (keySet) keySet.shutdown.bind(keySet)();\n  if (adminKeySet) adminKeySet.shutdown.bind(adminKeySet)();\n}\n\n/** Get the JWT public key */\nfunction jwtGetKey(header: JwtHeader, callback: SigningKeyCallback): void {\n  // In test environment we return the symmetric signature secret\n  if (process.env.NODE_ENV === 'test') {\n    callback(null, process.env.JWT_SECRET);\n    return;\n  }\n  // Check that KeySet has been initialized\n  if (!keySet || !adminKeySet) {\n    callback(new EngineError({ message: 'KeySet has not been initialized' }));\n    return;\n  }\n  // Check that the token has a key ID\n  if (!header.kid) {\n    callback(\n      new EngineError({\n        message:\n          'Token has not key ID in header, impossible to match with known key',\n        data: header\n      })\n    );\n    return;\n  }\n\n  // In test environment we use a symmetrical secret bases signature\n  if (process.env.NODE_ENV === 'test') {\n    callback(null, process.env.JWT_SECRET);\n    return;\n  }\n  reportDebug({\n    namespace,\n    message: `Looking for key with ID \"${header.kid}\"`\n  });\n  // Go through each key set to check if the token's key is in one of them\n  let key;\n  try {\n    key = keySet.getKey(header.kid);\n  } catch (error: Error | null | unknown) {\n    callback(error instanceof Error ? error : null);\n    return;\n  }\n\n  if (key) {\n    reportDebug({ namespace, message: `Found key with ID \"${header.kid}\"` });\n    callback(null, key);\n    return;\n  }\n  callback(\n    new WebError({\n      statusCode: 401,\n      errorCode: 'unauthorized',\n      message: 'Could not find the tokens key in any key set',\n      data: { kid: header.kid }\n    })\n  );\n}\n\n/** Verify an user Json Web Token */\nexport async function jwtVerify(\n  token: string,\n  issuer: TokenIssuer = TokenIssuer.AUTH_SERVICE\n): Promise<UserTokenPayload> {\n  let algorithms = ['ES256' as Algorithm];\n  if (process.env.NODE_ENV === 'test') {\n    assertEnvironment({ JWT_SECRET: envAssert.isString() });\n    algorithms = ['HS256' as Algorithm];\n  }\n  assertEnvironment({\n    ACCESS_TOKEN_AUDIENCE: envAssert.isString(),\n    ACCESS_TOKEN_ISSUER: envAssert.isString(),\n    ADMIN_API_ACCESS_TOKEN_AUDIENCE: envAssert.isString(),\n    ADMIN_ACCESS_TOKEN_ISSUER: envAssert.isString()\n  });\n  let options: VerifyOptions | undefined;\n\n  switch (issuer) {\n    case TokenIssuer.AUTH_SERVICE:\n      options = {\n        audience: [process.env.ACCESS_TOKEN_AUDIENCE as string],\n        issuer: [process.env.ACCESS_TOKEN_ISSUER as string],\n        algorithms\n      };\n      break;\n    case TokenIssuer.ADMIN_API:\n      options = {\n        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string],\n        issuer: [process.env.ADMIN_ACCESS_TOKEN_ISSUER as string],\n        algorithms\n      };\n      break;\n    default:\n      throw new EngineError({\n        message: `Invalid token issuer specified \"${issuer as string}\"`\n      });\n  }\n\n  return new Promise<UserTokenPayload>((resolve, reject) => {\n    verify(token, jwtGetKey, options, (error, result) => {\n      if (error) {\n        reject(\n          new WebError({\n            errorCode: 'unauthorized',\n            statusCode: 401,\n            message: 'Invalid token supplied',\n            data: { token },\n            error: error instanceof Error ? error : undefined\n          })\n        );\n        return;\n      }\n      resolve(result as UserTokenPayload);\n    });\n  });\n}\n\nexport function generateJwtToken(user: unknown) {\n  const signOptions = {\n    algorithm: 'ES256' as const, // or 'ES256' as Algorithm\n    expiresIn: '1h',\n    issuer: process.env.ACCESS_TOKEN_ISSUER,\n    audience: process.env.ACCESS_TOKEN_AUDIENCE,\n    keyid: Object.keys(keySet?.getKeys() ?? {})[0]\n  };\n\n  const privateKey = fs.readFileSync(\n    process.env.PRIVATE_KEY_PATH ?? 'keys/private-key.pem',\n    'utf8'\n  );\n  const token = sign({ user }, privateKey, signOptions);\n\n  return token;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"jwt.js","names":["_jsonwebtoken","require","_fs","_interopRequireDefault","_const","_EngineError","_KeySet","_WebError","_checkEnvironment","_envAssert","_report","keySet","exports","namespace","initKeySets","process","env","CHART","ECDSA_PUBLIC_KEY","EngineError","message","KeySet","file","AUTH_SERVICE_URL","internal","promise","init","bind","Promise","all","shutdownKeySets","shutdown","jwtGetKey","header","callback","NODE_ENV","JWT_SECRET","kid","data","reportDebug","key","getKey","error","Error","WebError","statusCode","errorCode","jwtVerify","token","issuer","TokenIssuer","AUTH_SERVICE","algorithms","assertEnvironment","envAssert","isString","ACCESS_TOKEN_AUDIENCE","ACCESS_TOKEN_ISSUER","options","audience","resolve","reject","verify","result","undefined","generateJwtToken","user","signOptions","algorithm","expiresIn","keyid","Object","keys","getKeys","privateKey","fs","readFileSync","PRIVATE_KEY_PATH","sign"],"sources":["../../../src/utils/jwt/jwt.ts"],"sourcesContent":["import {\n  verify,\n  JwtHeader,\n  SigningKeyCallback,\n  Algorithm,\n  VerifyOptions,\n  sign\n} from 'jsonwebtoken';\nimport fs from 'fs';\nimport { UserTokenPayload } from './jwt.types';\nimport { TokenIssuer } from 'const';\nimport { EngineError } from 'entities/EngineError';\nimport { KeySet } from 'entities/KeySet';\nimport { WebError } from 'entities/WebError';\nimport { assertEnvironment } from 'utils/checkEnvironment';\nimport { envAssert } from 'utils/envAssert';\nimport { reportDebug } from 'utils/report';\n\nexport let keySet: KeySet | undefined;\n\nconst namespace = 'engine:utils:jwt';\n\n/** Initiate key fetching mechanism */\nexport async function initKeySets(): Promise<void> {\n  // Create the KeySet instance\n  // The auth-service fetches its key from its disk and not from a network request\n  // This prevents fetch failures the first time the auth-service is started\n  if (process.env.CHART === 'auth-service') {\n    if (!process.env.ECDSA_PUBLIC_KEY)\n      throw new EngineError({\n        message: 'Environment variable \"ECDSA_PUBLIC_KEY\" is not defined'\n      });\n    keySet = new KeySet(process.env.ECDSA_PUBLIC_KEY, { file: true });\n  } else {\n    if (process.env.AUTH_SERVICE_URL)\n      keySet = new KeySet(\n        `${process.env.AUTH_SERVICE_URL}/.well-known/jwks.json`,\n        { internal: true }\n      );\n    else\n      keySet = new KeySet(`./keys/jwks.json`, { internal: true, file: true });\n\n    if (!keySet)\n      throw new EngineError({\n        message:\n          'Environment variable \"AUTH_SERVICE_URL\" is not defined or JWKS not found'\n      });\n  }\n  const promise = [keySet.init.bind(keySet)()];\n\n  await Promise.all(promise);\n}\n\n/** Stop fetching keys regularly */\nexport function shutdownKeySets(): void {\n  if (keySet) keySet.shutdown.bind(keySet)();\n}\n\n/** Get the JWT public key */\nfunction jwtGetKey(header: JwtHeader, callback: SigningKeyCallback): void {\n  // In test environment we return the symmetric signature secret\n  if (process.env.NODE_ENV === 'test') {\n    callback(null, process.env.JWT_SECRET);\n    return;\n  }\n  // Check that KeySet has been initialized\n  if (!keySet) {\n    callback(new EngineError({ message: 'KeySet has not been initialized' }));\n    return;\n  }\n  // Check that the token has a key ID\n  if (!header.kid) {\n    callback(\n      new EngineError({\n        message:\n          'Token has not key ID in header, impossible to match with known key',\n        data: header\n      })\n    );\n    return;\n  }\n\n  // In test environment we use a symmetrical secret bases signature\n  if (process.env.NODE_ENV === 'test') {\n    callback(null, process.env.JWT_SECRET);\n    return;\n  }\n  reportDebug({\n    namespace,\n    message: `Looking for key with ID \"${header.kid}\"`\n  });\n  // Go through each key set to check if the token's key is in one of them\n  let key;\n  try {\n    key = keySet.getKey(header.kid);\n  } catch (error: Error | null | unknown) {\n    callback(error instanceof Error ? error : null);\n    return;\n  }\n\n  if (key) {\n    reportDebug({ namespace, message: `Found key with ID \"${header.kid}\"` });\n    callback(null, key);\n    return;\n  }\n  callback(\n    new WebError({\n      statusCode: 401,\n      errorCode: 'unauthorized',\n      message: 'Could not find the tokens key in any key set',\n      data: { kid: header.kid }\n    })\n  );\n}\n\n/** Verify an user Json Web Token */\nexport async function jwtVerify(\n  token: string,\n  issuer: TokenIssuer = TokenIssuer.AUTH_SERVICE\n): Promise<UserTokenPayload> {\n  let algorithms = ['ES256' as Algorithm];\n  if (process.env.NODE_ENV === 'test') {\n    assertEnvironment({ JWT_SECRET: envAssert.isString() });\n    algorithms = ['HS256' as Algorithm];\n  }\n  assertEnvironment({\n    ACCESS_TOKEN_AUDIENCE: envAssert.isString(),\n    ACCESS_TOKEN_ISSUER: envAssert.isString()\n  });\n  let options: VerifyOptions | undefined;\n\n  switch (issuer) {\n    case TokenIssuer.AUTH_SERVICE:\n      options = {\n        audience: [process.env.ACCESS_TOKEN_AUDIENCE as string],\n        issuer: [process.env.ACCESS_TOKEN_ISSUER as string],\n        algorithms\n      };\n      break;\n    default:\n      throw new EngineError({\n        message: `Invalid token issuer specified \"${issuer as string}\"`\n      });\n  }\n\n  return new Promise<UserTokenPayload>((resolve, reject) => {\n    verify(token, jwtGetKey, options, (error, result) => {\n      if (error) {\n        reject(\n          new WebError({\n            errorCode: 'unauthorized',\n            statusCode: 401,\n            message: 'Invalid token supplied',\n            data: { token },\n            error: error instanceof Error ? error : undefined\n          })\n        );\n        return;\n      }\n      resolve(result as UserTokenPayload);\n    });\n  });\n}\n\nexport function generateJwtToken(user: unknown) {\n  const signOptions = {\n    algorithm: 'ES256' as const, // or 'ES256' as Algorithm\n    expiresIn: '1h',\n    issuer: process.env.ACCESS_TOKEN_ISSUER,\n    audience: process.env.ACCESS_TOKEN_AUDIENCE,\n    keyid: Object.keys(keySet?.getKeys() ?? {})[0]\n  };\n\n  const privateKey = fs.readFileSync(\n    process.env.PRIVATE_KEY_PATH ?? 'keys/private-key.pem',\n    'utf8'\n  );\n  const token = sign({ user }, privateKey, signOptions);\n\n  return token;\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utils/report/report.js

@@ -15,7 +15,6 @@ var _WebError = require("../../entities/WebError");
 require("../../middleware/authHmac/authHmac.types");
 require("../../middleware/authJwt/authJwt.types");
 require("../../middleware/authTls/authTls.types");
-require("../../middleware/authAdmin/authAdmin.types");
 /** Default generic logger */
 function reportInfo(data) {
   return (0, _output.output)({
@@ -57,7 +56,7 @@ function reportError(error, request) {
     logEntry = {
       ...logEntry,
       context: {
-        user: request.user?.id ?? request.hosts?.join(',') ?? request.admin?.email,
+        user: request.user?.id ?? request.hosts?.join(','),
         httpRequest: {
           url: request.originalUrl,
           method: request.method,

package/dist/utils/report/report.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.js","names":["_output","require","_const","_EngineError","_WebError","reportInfo","data","output","severity","LogSeverity","INFO","message","reportError","error","request","logEntry","Error","stack_trace","stack","ERROR","CRITICAL","EngineError","errorType","constructor","name","WebError","statusCode","undefined","errorCode","context","user","id","hosts","join","admin","email","httpRequest","url","originalUrl","method","referrer","header","userAgent","remoteIp","ip","responseStatusCode","NAMESPACE_SELECTORS","exports","initNamespaceSelector","process","env","DEBUG","split","map","namespace","RegExp","replace","resetNamespaceSelector","debugNamespace","reportDebug","isEngineReport","startsWith","match","some","selector","test","spaces","prefix","length","setNameSpace","globalNamespace","clearNamespace"],"sources":["../../../src/utils/report/report.ts"],"sourcesContent":["import { Request } from 'express';\nimport { output } from './output';\nimport { LogEntry, FullLogEntry } from './output.types';\nimport { DebugLogEntry, InfoLogEntry } from './report.types';\nimport { LogSeverity } from 'const';\nimport { EngineError } from 'entities/EngineError';\nimport { WebError } from 'entities/WebError';\nimport {} from 'middleware/authHmac/authHmac.types';\nimport {} from 'middleware/authJwt/authJwt.types';\nimport {} from 'middleware/authTls/authTls.types';\nimport {} from 'middleware/authAdmin/authAdmin.types';\n\n/** Default generic logger */\nexport function reportInfo(data: InfoLogEntry | string): FullLogEntry {\n  return output({\n    severity: LogSeverity.INFO,\n    ...(typeof data === 'string' ? { message: data } : data)\n  });\n}\n\n/** Error specific logger */\nexport function reportError(\n  error: unknown | Error | EngineError | WebError,\n  request?: Request\n): FullLogEntry {\n  let logEntry: LogEntry =\n    error instanceof Error\n      ? {\n          message: error.message,\n          stack_trace: error.stack,\n          severity: LogSeverity.ERROR\n        }\n      : {\n          message: 'An unknown error occurred',\n          data: error,\n          severity: LogSeverity.CRITICAL\n        };\n\n  if (error instanceof EngineError) {\n    logEntry = {\n      ...logEntry,\n      severity: error.severity,\n      errorType: error.constructor.name,\n      data: error.data,\n      '@type':\n        !(error instanceof WebError) || error.statusCode >= 500\n          ? 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'\n          : undefined\n    };\n  }\n\n  if (error instanceof WebError) {\n    logEntry = {\n      ...logEntry,\n      errorCode: error.errorCode,\n      statusCode: error.statusCode\n    };\n  }\n\n  if (request) {\n    logEntry = {\n      ...logEntry,\n      context: {\n        user:\n          request.user?.id ?? request.hosts?.join(',') ?? request.admin?.email,\n        httpRequest: {\n          url: request.originalUrl,\n          method: request.method,\n          referrer: request.header('Referer'),\n          userAgent: request.header('User-Agent'),\n          remoteIp: request.ip,\n          responseStatusCode:\n            error instanceof WebError ? error.statusCode : undefined\n        }\n      }\n    };\n  }\n\n  return output(logEntry);\n}\n\nexport let NAMESPACE_SELECTORS: undefined | Array<RegExp>;\n\n/** Generate the namespace selectors based on the debug variable */\nfunction initNamespaceSelector(): void {\n  if (process.env.DEBUG)\n    NAMESPACE_SELECTORS = process.env.DEBUG.split(',').map(\n      (namespace) => new RegExp('^' + namespace.replace(/\\*/g, '.*?') + '$')\n    );\n}\n\n/** Reset the namespace selectors */\nexport function resetNamespaceSelector(): void {\n  NAMESPACE_SELECTORS = undefined;\n}\n\nlet debugNamespace: string | undefined;\n\n/** Log a message for debugging purpose, based on a namespace specified in an environment variable */\nexport function reportDebug(data: DebugLogEntry): FullLogEntry | undefined {\n  if (!NAMESPACE_SELECTORS) initNamespaceSelector();\n  let { namespace } = data;\n  const isEngineReport = namespace ? namespace.startsWith('engine') : false;\n\n  if (debugNamespace && !isEngineReport) {\n    namespace = debugNamespace + ':' + namespace;\n  }\n\n  const match =\n    namespace &&\n    NAMESPACE_SELECTORS &&\n    NAMESPACE_SELECTORS.some((selector) => selector.test(namespace));\n  if (!match) return;\n\n  // Generate a prefix with the right most part of the namespace\n  const spaces = namespace.split(':');\n  const prefix = spaces[spaces.length - 1];\n\n  return output({\n    severity: LogSeverity.DEBUG,\n    ...data,\n    message: `[${prefix}] ${data.message}`\n  });\n}\n\n/** Specify a global debugging namespace */\nreportDebug.setNameSpace = function (globalNamespace: string): void {\n  debugNamespace = globalNamespace;\n};\n\n/** Remove any defined global namespace */\nreportDebug.clearNamespace = function (): void {\n  debugNamespace = undefined;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"report.js","names":["_output","require","_const","_EngineError","_WebError","reportInfo","data","output","severity","LogSeverity","INFO","message","reportError","error","request","logEntry","Error","stack_trace","stack","ERROR","CRITICAL","EngineError","errorType","constructor","name","WebError","statusCode","undefined","errorCode","context","user","id","hosts","join","httpRequest","url","originalUrl","method","referrer","header","userAgent","remoteIp","ip","responseStatusCode","NAMESPACE_SELECTORS","exports","initNamespaceSelector","process","env","DEBUG","split","map","namespace","RegExp","replace","resetNamespaceSelector","debugNamespace","reportDebug","isEngineReport","startsWith","match","some","selector","test","spaces","prefix","length","setNameSpace","globalNamespace","clearNamespace"],"sources":["../../../src/utils/report/report.ts"],"sourcesContent":["import { Request } from 'express';\nimport { output } from './output';\nimport { LogEntry, FullLogEntry } from './output.types';\nimport { DebugLogEntry, InfoLogEntry } from './report.types';\nimport { LogSeverity } from 'const';\nimport { EngineError } from 'entities/EngineError';\nimport { WebError } from 'entities/WebError';\nimport {} from 'middleware/authHmac/authHmac.types';\nimport {} from 'middleware/authJwt/authJwt.types';\nimport {} from 'middleware/authTls/authTls.types';\n\n/** Default generic logger */\nexport function reportInfo(data: InfoLogEntry | string): FullLogEntry {\n  return output({\n    severity: LogSeverity.INFO,\n    ...(typeof data === 'string' ? { message: data } : data)\n  });\n}\n\n/** Error specific logger */\nexport function reportError(\n  error: unknown | Error | EngineError | WebError,\n  request?: Request\n): FullLogEntry {\n  let logEntry: LogEntry =\n    error instanceof Error\n      ? {\n          message: error.message,\n          stack_trace: error.stack,\n          severity: LogSeverity.ERROR\n        }\n      : {\n          message: 'An unknown error occurred',\n          data: error,\n          severity: LogSeverity.CRITICAL\n        };\n\n  if (error instanceof EngineError) {\n    logEntry = {\n      ...logEntry,\n      severity: error.severity,\n      errorType: error.constructor.name,\n      data: error.data,\n      '@type':\n        !(error instanceof WebError) || error.statusCode >= 500\n          ? 'type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent'\n          : undefined\n    };\n  }\n\n  if (error instanceof WebError) {\n    logEntry = {\n      ...logEntry,\n      errorCode: error.errorCode,\n      statusCode: error.statusCode\n    };\n  }\n\n  if (request) {\n    logEntry = {\n      ...logEntry,\n      context: {\n        user:\n          request.user?.id ?? request.hosts?.join(','),\n        httpRequest: {\n          url: request.originalUrl,\n          method: request.method,\n          referrer: request.header('Referer'),\n          userAgent: request.header('User-Agent'),\n          remoteIp: request.ip,\n          responseStatusCode:\n            error instanceof WebError ? error.statusCode : undefined\n        }\n      }\n    };\n  }\n\n  return output(logEntry);\n}\n\nexport let NAMESPACE_SELECTORS: undefined | Array<RegExp>;\n\n/** Generate the namespace selectors based on the debug variable */\nfunction initNamespaceSelector(): void {\n  if (process.env.DEBUG)\n    NAMESPACE_SELECTORS = process.env.DEBUG.split(',').map(\n      (namespace) => new RegExp('^' + namespace.replace(/\\*/g, '.*?') + '$')\n    );\n}\n\n/** Reset the namespace selectors */\nexport function resetNamespaceSelector(): void {\n  NAMESPACE_SELECTORS = undefined;\n}\n\nlet debugNamespace: string | undefined;\n\n/** Log a message for debugging purpose, based on a namespace specified in an environment variable */\nexport function reportDebug(data: DebugLogEntry): FullLogEntry | undefined {\n  if (!NAMESPACE_SELECTORS) initNamespaceSelector();\n  let { namespace } = data;\n  const isEngineReport = namespace ? namespace.startsWith('engine') : false;\n\n  if (debugNamespace && !isEngineReport) {\n    namespace = debugNamespace + ':' + namespace;\n  }\n\n  const match =\n    namespace &&\n    NAMESPACE_SELECTORS &&\n    NAMESPACE_SELECTORS.some((selector) => selector.test(namespace));\n  if (!match) return;\n\n  // Generate a prefix with the right most part of the namespace\n  const spaces = namespace.split(':');\n  const prefix = spaces[spaces.length - 1];\n\n  return output({\n    severity: LogSeverity.DEBUG,\n    ...data,\n    message: `[${prefix}] ${data.message}`\n  });\n}\n\n/** Specify a global debugging namespace */\nreportDebug.setNameSpace = function (globalNamespace: string): void {\n  debugNamespace = globalNamespace;\n};\n\n/** Remove any defined global namespace */\nreportDebug.clearNamespace = function (): void {\n  debugNamespace = undefined;\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-server-engine",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Framework used to develop backend services. This package ships with a lot of features to standardize the creation of services, letting you focus on the business logic.",
   "main": "dist/index.js",
   "scripts": {
@@ -9,10 +9,11 @@
     "lint": "eslint ./src",
     "lint:fix": "eslint ./src --fix",
     "prepublish": "npm run build",
+    "prepublishOnly": "npm run build",
     "test": "cross-env NODE_ENV=test nyc --reporter=none mocha test/hooks.ts \"src/**/*.test.ts\"",
-    "coverage": "nyc report --reporter=text",
+    "test:file": "cross-env NODE_ENV=test nyc --reporter=none mocha test/hooks.ts",
+    "coverage": "nyc report --report-dir=./.test-coverage --reporter=html --reporter=text",
     "coverage:ci": "nyc report --reporter=text-summary",
-    "prepublishOnly": "npm run build",
     "test:ci": "npm run test -- --reporter spec",
     "test:compose": "docker-compose up --abort-on-container-exit --build"
   },
@@ -44,7 +45,7 @@
     "@google/generative-ai": "^0.21.0",
     "ajv": "^8.17.1",
     "axios": "^1.7.9",
-    "backend-test-tools": "^1.0.4",
+    "backend-test-tools": "^1.0.6",
     "body-parser": "^1.20.3",
     "busboy": "^1.6.0",
     "callsite": "^1.0.0",
@@ -104,6 +105,7 @@
     "@types/callsite": "^1.0.34",
     "@types/chai": "^5.0.1",
     "@types/chai-as-promised": "^8.0.1",
+    "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/filesize-parser": "^1.5.3",
     "@types/flat": "^5.0.5",
@@ -130,8 +132,8 @@
     "@typescript-eslint/eslint-plugin": "^8.18.1",
     "babel-plugin-istanbul": "^7.0.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "chai": "^5.1.2",
-    "chai-as-promised": "^8.0.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
     "cross-env": "^7.0.3",
     "eslint": "^9.17.0",
     "factory-waifu": "^1.0.1",
@@ -147,7 +149,7 @@
     "rimraf": "^6.0.1",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",
-    "sinon-chai": "^4.0.0",
+    "sinon-chai": "^3.5.0",
     "supertest": "^7.0.0",
     "tmp": "^0.2.3",
     "ts-node": "^10.9.2",

package/src/const/tokenIssuer.ts

@@ -1,9 +1,7 @@
 /** Enum to identify access tokens JWT issuers */
 export enum TokenIssuer {
   /** For tokens issued by the auth service */
-  AUTH_SERVICE,
-  /** For tokens issued by the admin API */
-  ADMIN_API
+  AUTH_SERVICE
 }
 
 export const TOKEN_ISSUERS = Object.values(TokenIssuer);

package/src/entities/Endpoint/Endpoint.test.ts

@@ -176,95 +176,6 @@ describe('Entity - Endpoint', () => {
     await server.shutdown();
   });
 
-  // AUTH ADMIN
-
-  it('it should authenticate with authAdmin middleware', async () => {
-    const email = faker.internet.email();
-    const permission = faker.lorem.word();
-    const token = generateAccessToken(
-      email,
-      {
-        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string],
-        issuer: process.env.ADMIN_ACCESS_TOKEN_ISSUER as string
-      },
-      { per: permission }
-    );
-    const endpoint = new Endpoint({
-      ...config,
-      authType: EndpointAuthType.ADMIN,
-      authParams: { permission },
-      handler: (req: Request, res: Response) => {
-        res.sendStatus(200);
-      }
-    } as EndpointOptions<EndpointAuthType.ADMIN>);
-
-    endpoint.register(app);
-    await request(app)
-      .get(PATH)
-      .set('Authorization', 'Bearer ' + token)
-      .expect(200);
-  });
-
-  it('it should authenticate with authAdmin middleware and check permission', async () => {
-    const email = faker.internet.email();
-    const permission = faker.lorem.word();
-    const token = generateAccessToken(
-      email,
-      {
-        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string],
-        issuer: process.env.ADMIN_ACCESS_TOKEN_ISSUER as string
-      },
-      { per: permission }
-    );
-
-    const endpoint = new Endpoint({
-      ...config,
-      authType: EndpointAuthType.ADMIN,
-      authParams: { permission },
-      handler: (req: Request, res: Response) => {
-        res.sendStatus(200);
-      }
-    } as EndpointOptions<EndpointAuthType.ADMIN>);
-
-    endpoint.register(app);
-    await request(app)
-      .get(PATH)
-      .set('Authorization', 'Bearer ' + token)
-      .expect(200);
-  });
-
-  it('it should authenticate with authAdmin middleware and check permissions', async () => {
-    const email = faker.internet.email();
-    const permissions = [
-      faker.lorem.word(),
-      faker.lorem.word(),
-      faker.lorem.word()
-    ];
-    const token = generateAccessToken(
-      email,
-      {
-        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string],
-        issuer: process.env.ADMIN_ACCESS_TOKEN_ISSUER as string
-      },
-      { per: permissions }
-    );
-
-    const endpoint = new Endpoint({
-      ...config,
-      authType: EndpointAuthType.ADMIN,
-      authParams: { permission: permissions[1] },
-      handler: (req: Request, res: Response) => {
-        res.sendStatus(200);
-      }
-    } as EndpointOptions<EndpointAuthType.ADMIN>);
-
-    endpoint.register(app);
-    await request(app)
-      .get(PATH)
-      .set('Authorization', 'Bearer ' + token)
-      .expect(200);
-  });
-
   it('it should reject if the user has no valid JWT', async () => {
     const endpoint = new Endpoint({
       ...config,

package/src/entities/Endpoint/Endpoint.types.ts

@@ -15,9 +15,7 @@ import {
   authHmac,
   authTls,
   authStatic,
-  authAdmin,
-  FileUploaderConfig,
-  RequestAdminProps
+  FileUploaderConfig
 } from 'middleware';
 
 export enum EndpointMethod {
@@ -37,8 +35,7 @@ export enum EndpointAuthType {
   JWT = 'jwt',
   TLS = 'tls',
   HMAC = 'hmac',
-  STATIC = 'static',
-  ADMIN = 'admin'
+  STATIC = 'static'
 }
 
 export const EndpointAuthTypes = Object.values(EndpointAuthType);
@@ -54,12 +51,6 @@ export type MiddlewareChainElement<T extends EndpointAuthType> =
   | Middleware<T>
   | any;
 
-/** Auth related parameters used with Admin authentication  */
-interface EndpointAuthAdminParams {
-  /** [Admin] User permission required to use this endpoint */
-  permission: string;
-}
-
 /** Auth related parameters used with HMAC authentication  */
 interface EndpointAuthHmacParams {
   /** [HMAC] Secret used for signature */
@@ -86,8 +77,6 @@ interface EndpointAuthSpecificParams {
   [EndpointAuthType.HMAC]: EndpointAuthHmacParams;
   /** Auth parameters for static authentication */
   [EndpointAuthType.STATIC]: any;
-  /** Auth parameters for admin token authentication */
-  [EndpointAuthType.ADMIN]: EndpointAuthAdminParams;
 }
 
 export type EndpointAuthParams<T extends EndpointAuthType> =
@@ -114,9 +103,7 @@ export const EndpointAuthHandlers = {
   /** Auth handler for HMAC authentication */
   [EndpointAuthType.HMAC]: authHmac,
   /** Auth handler for static authentication */
-  [EndpointAuthType.STATIC]: authStatic,
-  /** Auth handler for admin token authentication */
-  [EndpointAuthType.ADMIN]: authAdmin
+  [EndpointAuthType.STATIC]: authStatic
 };
 
 export type EndpointHandler<T extends EndpointAuthType> = (
@@ -172,18 +159,6 @@ export interface TlsRequest<
   hosts: Array<string>;
 }
 
-/** Request type when using HMAC authentication */
-export interface AdminRequest<
-  P = ParamsDictionary,
-  ResBody = any,
-  ReqBody = any,
-  ReqQuery = ParsedQs,
-  Locals extends Record<string, any> = Record<string, any>
-> extends Request<P, ResBody, ReqBody, ReqQuery, Locals> {
-  /** User that identified using a JWT */
-  admin: RequestAdminProps;
-}
-
 /** Mapping of request types in endpoints based on auth type used */
 export interface EndpointRequestType {
   /** Request type for no authentication */
@@ -196,8 +171,6 @@ export interface EndpointRequestType {
   [EndpointAuthType.HMAC]: Request;
   /** Auth handler for static authentication */
   [EndpointAuthType.STATIC]: Request;
-  /** Auth handler for admin token authentication */
-  [EndpointAuthType.ADMIN]: AdminRequest;
 }
 
 export type SafeMiddleWareChain = Array<

package/src/entities/KeySet/KeySet.test.ts

@@ -100,7 +100,7 @@ describe('Entity - KeySet', function () {
 
   it('should read a key from a PEM string', async () => {
     const pem = await readFile(
-      process.env.ADMIN_API_ECDSA_PUBLIC_KEY as string,
+      process.env.ECDSA_PUBLIC_KEY as string,
       'utf-8'
     );
 

package/src/entities/Server/Server.ts

@@ -6,6 +6,7 @@ import path from 'path';
 import { setTimeout as setTimeoutPromise } from 'timers/promises';
 import { ValidatorSpec } from 'envalid';
 import express, { Application } from 'express';
+import cors from 'cors';
 import { Server as WebSocketServer } from 'ws';
 import { SocketClient } from '../SocketClient';
 import {
@@ -110,6 +111,14 @@ export class Server {
 
     // Create the primary express core that serves the business logic
     this.app = express();
+
+    this.app.use(
+      cors({
+        origin: process.env.CORS_ORIGIN ?? '*',
+        methods: 'GET,POST,PUT,DELETE'
+      })
+    );
+
     this.registerMiddleware(this.app);
     this.httpServer = createHttpServer(this.app);
 

package/src/middleware/index.ts

@@ -12,6 +12,5 @@ export * from './fileUploader';
 export * from './metrics';
 export * from './requestMetrics';
 export * from './version';
-export * from './authAdmin';
 export * from './geminiFileUploader';
 export * from './checkPermission';

package/src/utils/index.ts

@@ -19,7 +19,6 @@ export * from './request';
 export * from './tlsConfig';
 export * from './tlsRequest';
 export * from './sendPush';
-export * from './getDynamicLink';
 export * from './sendEmail';
 
 // String manipulation

package/src/utils/jwt/jwt.test.ts

@@ -25,17 +25,4 @@ describe('Utils - JWT', () => {
     const result = await jwtVerify(token, TokenIssuer.AUTH_SERVICE);
     expect(result.sub).to.equal(id);
   });
-
-  it('should pass a token with one correct audience [Admin-API]', async () => {
-    const id = randomUUID();
-    const token = generateAccessToken(id, {
-      audience: [
-        process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string,
-        faker.lorem.word()
-      ],
-      issuer: process.env.ADMIN_ACCESS_TOKEN_ISSUER
-    });
-    const result = await jwtVerify(token, TokenIssuer.ADMIN_API);
-    expect(result.sub).to.equal(id);
-  });
 });

package/src/utils/jwt/jwt.ts

@@ -7,7 +7,6 @@ import {
   sign
 } from 'jsonwebtoken';
 import fs from 'fs';
-import path from 'path';
 import { UserTokenPayload } from './jwt.types';
 import { TokenIssuer } from 'const';
 import { EngineError } from 'entities/EngineError';
@@ -18,7 +17,6 @@ import { envAssert } from 'utils/envAssert';
 import { reportDebug } from 'utils/report';
 
 export let keySet: KeySet | undefined;
-export let adminKeySet: KeySet | undefined;
 
 const namespace = 'engine:utils:jwt';
 
@@ -50,24 +48,12 @@ export async function initKeySets(): Promise<void> {
   }
   const promise = [keySet.init.bind(keySet)()];
 
-  // Load the key set for the admin api
-  if (!process.env.ADMIN_API_ECDSA_PUBLIC_KEY)
-    throw new EngineError({
-      message:
-        "Admin API's authentication JWT signing public key is not defined"
-    });
-  adminKeySet = new KeySet(process.env.ADMIN_API_ECDSA_PUBLIC_KEY, {
-    pem: true
-  });
-  promise.push(adminKeySet.init.bind(adminKeySet)());
-
   await Promise.all(promise);
 }
 
 /** Stop fetching keys regularly */
 export function shutdownKeySets(): void {
   if (keySet) keySet.shutdown.bind(keySet)();
-  if (adminKeySet) adminKeySet.shutdown.bind(adminKeySet)();
 }
 
 /** Get the JWT public key */
@@ -78,7 +64,7 @@ function jwtGetKey(header: JwtHeader, callback: SigningKeyCallback): void {
     return;
   }
   // Check that KeySet has been initialized
-  if (!keySet || !adminKeySet) {
+  if (!keySet) {
     callback(new EngineError({ message: 'KeySet has not been initialized' }));
     return;
   }
@@ -139,9 +125,7 @@ export async function jwtVerify(
   }
   assertEnvironment({
     ACCESS_TOKEN_AUDIENCE: envAssert.isString(),
-    ACCESS_TOKEN_ISSUER: envAssert.isString(),
-    ADMIN_API_ACCESS_TOKEN_AUDIENCE: envAssert.isString(),
-    ADMIN_ACCESS_TOKEN_ISSUER: envAssert.isString()
+    ACCESS_TOKEN_ISSUER: envAssert.isString()
   });
   let options: VerifyOptions | undefined;
 
@@ -153,13 +137,6 @@ export async function jwtVerify(
         algorithms
       };
       break;
-    case TokenIssuer.ADMIN_API:
-      options = {
-        audience: [process.env.ADMIN_API_ACCESS_TOKEN_AUDIENCE as string],
-        issuer: [process.env.ADMIN_ACCESS_TOKEN_ISSUER as string],
-        algorithms
-      };
-      break;
     default:
       throw new EngineError({
         message: `Invalid token issuer specified "${issuer as string}"`

package/src/utils/report/report.ts

@@ -8,7 +8,6 @@ import { WebError } from 'entities/WebError';
 import {} from 'middleware/authHmac/authHmac.types';
 import {} from 'middleware/authJwt/authJwt.types';
 import {} from 'middleware/authTls/authTls.types';
-import {} from 'middleware/authAdmin/authAdmin.types';
 
 /** Default generic logger */
 export function reportInfo(data: InfoLogEntry | string): FullLogEntry {
@@ -62,7 +61,7 @@ export function reportError(
       ...logEntry,
       context: {
         user:
-          request.user?.id ?? request.hosts?.join(',') ?? request.admin?.email,
+          request.user?.id ?? request.hosts?.join(','),
         httpRequest: {
           url: request.originalUrl,
           method: request.method,

package/test/env.ts

@@ -15,10 +15,7 @@ process.env = {
   PAYLOAD_SIGNATURE_SECRET: faker.lorem.word(),
   ACCESS_TOKEN_AUDIENCE: audience,
   ACCESS_TOKEN_ISSUER: faker.lorem.word(),
-  ADMIN_API_ACCESS_TOKEN_AUDIENCE: audience,
-  ADMIN_ACCESS_TOKEN_ISSUER: faker.lorem.word(),
   AUTH_SERVICE_PUBLIC_URL: faker.internet.url(),
-  ADMIN_API_PUBLIC_URL: faker.internet.url(),
   VALID_IPS: '::ffff:127.0.0.1,127.0.0.1,::1',
   REDIS_HOST: process.env.REDIS_HOST ?? '127.0.0.1',
   REDIS_PORT: '6379',
@@ -33,9 +30,7 @@ process.env = {
   TLS_REQUEST_KEY_PASSPHRASE: path.resolve('certs/ecdsa.key.pub'),
   ECDSA_PRIVATE_KEY: path.resolve('certs/ecdsa.key'),
   ECDSA_PUBLIC_KEY: path.resolve('certs/ecdsa.key.pub'),
-  ADMIN_API_ECDSA_PUBLIC_KEY: path.resolve('certs/ecdsa.key.pub'),
   GITHUB_WEBHOOK_SECRET: faker.lorem.word(),
-  LINKS_SERVICE_URL: faker.internet.url(),
   STATIC_TOKEN: faker.lorem.word(),
   HOSTNAME: faker.lorem.slug(),
   ELASTIC_SEARCH_HOST:

package/test/hooks.ts

@@ -27,8 +27,6 @@ before(async () => {
 
 beforeEach(async () => {
   process.env = { ...savedEnv };
-  sequelize.init();
-  sequelize.addModels(modelArray);
 });
 
 afterEach(async () => {

package/dist/middleware/authAdmin/authAdmin.d.ts

@@ -1,4 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { EndpointAuthParams, EndpointAuthType } from '../../entities/Endpoint';
-/** Generate a middleware to authenticate the client connection with a Admin api */
-export declare function authAdmin(options: EndpointAuthParams<EndpointAuthType.ADMIN>): (request: Request, response: Response, next: NextFunction) => Promise<void>;