npm - @digicatapult/tsoa-oauth-express - Versions diffs - 0.1.109 → 1.0.0 - Mend

@digicatapult/tsoa-oauth-express 0.1.109 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/build/index.d.ts CHANGED Viewed

@@ -1,10 +1,23 @@
 import type express from 'express';
 import jwt from 'jsonwebtoken';
-export type ErrorReason = 'INVALID_SECURITY_TYPE' | 'NO_TOKEN' | 'MISSING_SCOPES' | 'INVALID_TOKEN';
+export type ErrorReason = 'INVALID_SECURITY_TYPE' | 'NO_TOKEN' | 'MISSING_SCOPES' | 'INVALID_TOKEN' | 'INTERNAL_ERROR';
+/**
+ * Error which represents and authentication failure
+ */
 export declare class OauthError extends Error {
     reason: ErrorReason;
     constructor(reason: ErrorReason);
 }
+/**
+ * Error which represents multiple authentication failures when using `mergeAcceptAny`
+ */
+export declare class AggregateOAuthError extends Error {
+    errors: OauthError[];
+    constructor(errors: OauthError[]);
+}
+/**
+ * Options to be used when creating an authenticator.
+ */
 export interface AuthOptions {
     securityName?: string;
     verifyOptions?: jwt.VerifyOptions & {
@@ -13,7 +26,29 @@ export interface AuthOptions {
     jwksUri: () => Promise<string>;
     getAccessToken: (req: express.Request) => Promise<string | undefined>;
     getScopesFromToken: (decoded: string | jwt.JwtPayload) => Promise<string[]>;
-    tryRefreshTokens?: (req: express.Request) => Promise<boolean>;
+    tryRefreshTokens?: (req: express.Request) => Promise<string | false>;
 }
-export type TsoaExpressAuthenticator = (request: express.Request, securityName: string, scopes?: string[]) => Promise<void>;
+/**
+ * User type populated onto `express` when authentication is successful
+ */
+export type TsoaExpressUser = {
+    securityName: string;
+    jwt: jwt.JwtPayload | string;
+};
+/**
+ * Tsoa authentication function
+ */
+export type TsoaExpressAuthenticator = (request: express.Request, securityName: string, scopes?: string[]) => Promise<TsoaExpressUser>;
+/**
+ * Builds an authenticator for using with `tsoa`
+ * @param options
+ * @returns
+ */
 export default function mkExpressAuthentication(options: AuthOptions): TsoaExpressAuthenticator;
+/**
+ * Takes an array of TsoaExpressAuthenticator's producing a new TsoaExpressAuthenticator that will try each authenticator in turn. If any authenticator
+ * succeeds authentication will pass with the reuslt of that authenticator . If all fail the first failure reason is thrown. At least one TsoaExpressAuthenticator must be provided
+ * @param authenticators The array of TsoaExpressAuthenticator to evaluate a request against
+ * @returns A TsoaExpressAuthenticator which aggregates the provided authenticators
+ */
+export declare function mergeAcceptAny(authenticators: [TsoaExpressAuthenticator, ...TsoaExpressAuthenticator[]]): TsoaExpressAuthenticator;

package/build/index.js CHANGED Viewed

@@ -1,33 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OauthError = void 0;
-exports.default = mkExpressAuthentication;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const jwks_rsa_1 = __importDefault(require("jwks-rsa"));
-class OauthError extends Error {
-    constructor(reason) {
-        super(`Auth failed for reason: ${reason}`);
-        this.reason = reason;
+import jwt from 'jsonwebtoken';
+import jwksClient from 'jwks-rsa';
+/**
+ * Error which represents and authentication failure
+ */ export class OauthError extends Error {
+    reason;
+    constructor(reason){
+        super(`Auth failed for reason: ${reason}`), this.reason = reason;
     }
 }
-exports.OauthError = OauthError;
-async function handleError(err, request, options) {
-    if (!err) {
-        return;
-    }
-    if (!(err instanceof jsonwebtoken_1.default.TokenExpiredError)) {
-        throw new OauthError('INVALID_TOKEN');
-    }
-    const refresh = options.tryRefreshTokens;
-    if (!refresh) {
-        throw new OauthError('INVALID_TOKEN');
-    }
-    const refreshSucceeded = await refresh(request);
-    if (!refreshSucceeded) {
-        throw new OauthError('INVALID_TOKEN');
+/**
+ * Error which represents multiple authentication failures when using `mergeAcceptAny`
+ */ export class AggregateOAuthError extends Error {
+    errors;
+    constructor(errors){
+        super(`Auth failed with multiple errors: [${errors.map((e)=>e.reason).join(', ')}]`), this.errors = errors;
     }
 }
 async function checkScopes(token, requiredScopes, options) {
@@ -38,27 +24,31 @@ async function checkScopes(token, requiredScopes, options) {
         throw new OauthError('MISSING_SCOPES');
     }
     const tokenScopes = new Set(await options.getScopesFromToken(token));
-    for (const requiredScope of requiredScopes) {
+    for (const requiredScope of requiredScopes){
         if (!tokenScopes.has(requiredScope)) {
             throw new OauthError('MISSING_SCOPES');
         }
     }
 }
-function mkExpressAuthentication(options) {
+/**
+ * Builds an authenticator for using with `tsoa`
+ * @param options
+ * @returns
+ */ export default function mkExpressAuthentication(options) {
     let client;
     let requiredSecurityName = options.securityName ?? 'oauth2';
-    const assertClient = async () => {
+    const assertClient = async ()=>{
         if (!client) {
-            client = (0, jwks_rsa_1.default)({
+            client = jwksClient({
                 jwksUri: await options.jwksUri(),
-                requestHeaders: {}, // Optional
-                timeout: 30000, // Defaults to 30s
+                requestHeaders: {},
+                timeout: 30000
             });
         }
         return client;
     };
-    const getKey = (header, callback) => {
-        client.getSigningKey(header.kid, function (err, key) {
+    const getKey = (header, callback)=>{
+        client.getSigningKey(header.kid, function(err, key) {
             if (err || !key) {
                 callback(err || new Error('Error getting jwks key'));
                 return;
@@ -66,6 +56,49 @@ function mkExpressAuthentication(options) {
             callback(null, key.getPublicKey());
         });
     };
+    const verifyToken = async (accessToken)=>{
+        return new Promise((resolve, reject)=>{
+            jwt.verify(accessToken, getKey, options.verifyOptions, function(err, decoded) {
+                if (err) {
+                    resolve({
+                        type: 'error',
+                        err
+                    });
+                    return;
+                }
+                if (!decoded) {
+                    reject(new OauthError('INTERNAL_ERROR'));
+                    return;
+                }
+                resolve({
+                    type: 'success',
+                    result: decoded
+                });
+            });
+        });
+    };
+    async function handleErrorAndRefresh(verifyResult, request) {
+        if (verifyResult.type === 'success') {
+            return verifyResult.result;
+        }
+        const err = verifyResult.err;
+        if (!(err instanceof jwt.TokenExpiredError)) {
+            throw new OauthError('INVALID_TOKEN');
+        }
+        const refresh = options.tryRefreshTokens;
+        if (!refresh) {
+            throw new OauthError('INVALID_TOKEN');
+        }
+        const accessToken = await refresh(request);
+        if (!accessToken) {
+            throw new OauthError('INVALID_TOKEN');
+        }
+        const refreshVerify = await verifyToken(accessToken);
+        if (refreshVerify.type === 'error') {
+            throw new OauthError('INVALID_TOKEN');
+        }
+        return refreshVerify.result;
+    }
     return async function expressAuthentication(request, securityName, scopes) {
         await assertClient();
         if (securityName !== requiredSecurityName) {
@@ -75,13 +108,40 @@ function mkExpressAuthentication(options) {
         if (!accessToken) {
             throw new OauthError('NO_TOKEN');
         }
-        const [err, result] = await new Promise((resolve) => {
-            jsonwebtoken_1.default.verify(accessToken, getKey, options.verifyOptions, function (err, decoded) {
-                resolve([err, decoded]);
-            });
-        });
-        await handleError(err, request, options);
-        await checkScopes(result, scopes, options);
+        const verifyResult = await verifyToken(accessToken);
+        const jwt = await handleErrorAndRefresh(verifyResult, request);
+        await checkScopes(jwt, scopes, options);
+        if (!jwt) {
+            throw new OauthError('INTERNAL_ERROR');
+        }
+        return {
+            securityName,
+            jwt
+        };
+    };
+}
+/**
+ * Takes an array of TsoaExpressAuthenticator's producing a new TsoaExpressAuthenticator that will try each authenticator in turn. If any authenticator
+ * succeeds authentication will pass with the reuslt of that authenticator . If all fail the first failure reason is thrown. At least one TsoaExpressAuthenticator must be provided
+ * @param authenticators The array of TsoaExpressAuthenticator to evaluate a request against
+ * @returns A TsoaExpressAuthenticator which aggregates the provided authenticators
+ */ export function mergeAcceptAny(authenticators) {
+    return async function expressAuthenticationMerged(request, securityName, scopes) {
+        let errors = [];
+        for (const authenticator of authenticators){
+            try {
+                const result = await authenticator(request, securityName, scopes);
+                return result;
+            } catch (err) {
+                if (err instanceof OauthError) {
+                    errors.push(err);
+                    continue;
+                }
+                throw err;
+            }
+        }
+        throw new AggregateOAuthError(errors);
     };
 }
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type express from 'express'\n\nimport jwt from 'jsonwebtoken'\nimport jwksClient, { type JwksClient } from 'jwks-rsa'\n\nexport type ErrorReason = 'INVALID_SECURITY_TYPE' | 'NO_TOKEN' | 'MISSING_SCOPES' | 'INVALID_TOKEN' | 'INTERNAL_ERROR'\n\n/**\n * Error which represents and authentication failure\n */\nexport class OauthError extends Error {\n  constructor(public reason: ErrorReason) {\n    super(`Auth failed for reason: ${reason}`)\n  }\n}\n\n/**\n * Error which represents multiple authentication failures when using `mergeAcceptAny`\n */\nexport class AggregateOAuthError extends Error {\n  constructor(public errors: OauthError[]) {\n    super(`Auth failed with multiple errors: [${errors.map((e) => e.reason).join(', ')}]`)\n  }\n}\n\n/**\n * Options to be used when creating an authenticator.\n */\nexport interface AuthOptions {\n  securityName?: string\n  verifyOptions?: jwt.VerifyOptions & { complete?: false }\n  jwksUri: () => Promise<string>\n  getAccessToken: (req: express.Request) => Promise<string | undefined>\n  getScopesFromToken: (decoded: string | jwt.JwtPayload) => Promise<string[]>\n  tryRefreshTokens?: (req: express.Request) => Promise<string | false>\n}\n\ntype VerifyResolve = { type: 'error'; err: jwt.VerifyErrors } | { type: 'success'; result: jwt.JwtPayload | string }\n\n/**\n * User type populated onto `express` when authentication is successful\n */\nexport type TsoaExpressUser = {\n  securityName: string\n  jwt: jwt.JwtPayload | string\n}\n\n/**\n * Tsoa authentication function\n */\nexport type TsoaExpressAuthenticator = (\n  request: express.Request,\n  securityName: string,\n  scopes?: string[]\n) => Promise<TsoaExpressUser>\n\nasync function checkScopes(\n  token: string | jwt.JwtPayload | undefined,\n  requiredScopes: string[] | undefined,\n  options: AuthOptions\n) {\n  if (!requiredScopes || requiredScopes.length === 0) {\n    return\n  }\n\n  if (!token) {\n    throw new OauthError('MISSING_SCOPES')\n  }\n\n  const tokenScopes = new Set(await options.getScopesFromToken(token))\n\n  for (const requiredScope of requiredScopes) {\n    if (!tokenScopes.has(requiredScope)) {\n      throw new OauthError('MISSING_SCOPES')\n    }\n  }\n}\n\n/**\n * Builds an authenticator for using with `tsoa`\n * @param options\n * @returns\n */\nexport default function mkExpressAuthentication(options: AuthOptions): TsoaExpressAuthenticator {\n  let client: JwksClient\n  let requiredSecurityName = options.securityName ?? 'oauth2'\n\n  const assertClient = async (): Promise<JwksClient> => {\n    if (!client) {\n      client = jwksClient({\n        jwksUri: await options.jwksUri(),\n        requestHeaders: {}, // Optional\n        timeout: 30000, // Defaults to 30s\n      })\n    }\n    return client\n  }\n\n  const getKey: jwt.GetPublicKeyOrSecret = (header, callback) => {\n    client.getSigningKey(header.kid, function (err, key) {\n      if (err || !key) {\n        callback(err || new Error('Error getting jwks key'))\n        return\n      }\n      callback(null, key.getPublicKey())\n    })\n  }\n\n  const verifyToken = async (accessToken: string): Promise<VerifyResolve> => {\n    return new Promise<VerifyResolve>((resolve, reject) => {\n      jwt.verify(accessToken, getKey, options.verifyOptions, function (err, decoded) {\n        if (err) {\n          resolve({\n            type: 'error',\n            err,\n          })\n          return\n        }\n\n        if (!decoded) {\n          reject(new OauthError('INTERNAL_ERROR'))\n          return\n        }\n\n        resolve({ type: 'success', result: decoded })\n      })\n    })\n  }\n\n  async function handleErrorAndRefresh(verifyResult: VerifyResolve, request: express.Request) {\n    if (verifyResult.type === 'success') {\n      return verifyResult.result\n    }\n\n    const err = verifyResult.err\n    if (!(err instanceof jwt.TokenExpiredError)) {\n      throw new OauthError('INVALID_TOKEN')\n    }\n\n    const refresh = options.tryRefreshTokens\n    if (!refresh) {\n      throw new OauthError('INVALID_TOKEN')\n    }\n\n    const accessToken = await refresh(request)\n\n    if (!accessToken) {\n      throw new OauthError('INVALID_TOKEN')\n    }\n\n    const refreshVerify = await verifyToken(accessToken)\n    if (refreshVerify.type === 'error') {\n      throw new OauthError('INVALID_TOKEN')\n    }\n\n    return refreshVerify.result\n  }\n\n  return async function expressAuthentication(request: express.Request, securityName: string, scopes?: string[]) {\n    await assertClient()\n\n    if (securityName !== requiredSecurityName) {\n      throw new OauthError('INVALID_SECURITY_TYPE')\n    }\n\n    const accessToken = await options.getAccessToken(request)\n\n    if (!accessToken) {\n      throw new OauthError('NO_TOKEN')\n    }\n\n    const verifyResult = await verifyToken(accessToken)\n    const jwt = await handleErrorAndRefresh(verifyResult, request)\n    await checkScopes(jwt, scopes, options)\n\n    if (!jwt) {\n      throw new OauthError('INTERNAL_ERROR')\n    }\n\n    return {\n      securityName,\n      jwt,\n    }\n  }\n}\n\n/**\n * Takes an array of TsoaExpressAuthenticator's producing a new TsoaExpressAuthenticator that will try each authenticator in turn. If any authenticator\n * succeeds authentication will pass with the reuslt of that authenticator . If all fail the first failure reason is thrown. At least one TsoaExpressAuthenticator must be provided\n * @param authenticators The array of TsoaExpressAuthenticator to evaluate a request against\n * @returns A TsoaExpressAuthenticator which aggregates the provided authenticators\n */\nexport function mergeAcceptAny(\n  authenticators: [TsoaExpressAuthenticator, ...TsoaExpressAuthenticator[]]\n): TsoaExpressAuthenticator {\n  return async function expressAuthenticationMerged(request: express.Request, securityName: string, scopes?: string[]) {\n    let errors: OauthError[] = []\n    for (const authenticator of authenticators) {\n      try {\n        const result = await authenticator(request, securityName, scopes)\n        return result\n      } catch (err) {\n        if (err instanceof OauthError) {\n          errors.push(err)\n          continue\n        }\n        throw err\n      }\n    }\n    throw new AggregateOAuthError(errors)\n  }\n}\n"],"names":["jwt","jwksClient","OauthError","Error","constructor","reason","AggregateOAuthError","errors","map","e","join","checkScopes","token","requiredScopes","options","length","tokenScopes","Set","getScopesFromToken","requiredScope","has","mkExpressAuthentication","client","requiredSecurityName","securityName","assertClient","jwksUri","requestHeaders","timeout","getKey","header","callback","getSigningKey","kid","err","key","getPublicKey","verifyToken","accessToken","Promise","resolve","reject","verify","verifyOptions","decoded","type","result","handleErrorAndRefresh","verifyResult","request","TokenExpiredError","refresh","tryRefreshTokens","refreshVerify","expressAuthentication","scopes","getAccessToken","mergeAcceptAny","authenticators","expressAuthenticationMerged","authenticator","push"],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,25 +1,22 @@
 {
   "name": "@digicatapult/tsoa-oauth-express",
-  "version": "0.1.109",
+  "version": "1.0.0",
   "description": "Authentication handler for TSOA using OAuth2 JWT tokens",
   "main": "build/index.js",
-  "type": "commonjs",
-  "exports": {
-    "import": "./build/index.mjs",
-    "require": "./build/index.js"
-  },
+  "type": "module",
+  "types": "build/index.d.ts",
   "files": [
     "build"
   ],
   "scripts": {
-    "build": "tsc",
-    "check": "npm run example:build && tsc -p ./tsconfig.check.json",
+    "build": "swc ./src -d ./build --strip-leading-paths --copy-files && tsc -p ./tsconfig.build.json",
+    "check": "npm run example:build && tsc",
     "test": "NODE_ENV=test ./node_modules/.bin/mocha --config ./mocharc.json ./src/**/*.test.ts",
     "depcheck": "depcheck",
     "lint": "prettier -c ./src",
     "lint:fix": "npm run lint -- -w",
     "example:build": "tsoa spec-and-routes -c ./example/tsoa.json",
-    "example": "npm run example:build && node --import=@digicatapult/tsimp/import ./example/index.ts"
+    "example": "SWCRC=true npm run example:build && SWCRC=true node --import @swc-node/register/esm-register ./example/index.ts"
   },
   "author": "Digital Catapult",
   "license": "Apache-2.0",
@@ -27,6 +24,8 @@
     "express": "^4.21.2"
   },
   "devDependencies": {
+    "@swc-node/register": "^1.10.9",
+    "@swc/cli": "^0.6.0",
     "@types/chai": "^5.2.0",
     "@types/express": "^4.17.21",
     "@types/mocha": "^10.0.10",
@@ -37,7 +36,6 @@
     "mock-jwks": "^3.3.4",
     "prettier": "^3.5.3",
     "prettier-plugin-organize-imports": "^4.1.0",
-    "@digicatapult/tsimp": "^2.0.12",
     "tsoa": "^6.6.0",
     "typescript": "^5.8.2"
   },

package/build/index.d.mts DELETED Viewed

@@ -1,5 +0,0 @@
-import mkExpressAuthentication from './index.js';
-export type { AuthOptions, ErrorReason, TsoaExpressAuthenticator } from './index.js';
-export { OauthError } from './index.js';
-declare const _default: typeof mkExpressAuthentication.default;
-export default _default;

package/build/index.js.map DELETED Viewed

@@ -1 +0,0 @@

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

package/build/index.mjs DELETED Viewed

@@ -1,4 +0,0 @@
-import mkExpressAuthentication from './index.js';
-export { OauthError } from './index.js';
-export default mkExpressAuthentication.default;
-//# sourceMappingURL=index.mjs.map

package/build/index.mjs.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,MAAM,YAAY,CAAA;AAIhD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,eAAe,uBAAuB,CAAC,OAAO,CAAA"}