passport-entra 0.0.3 → 0.0.4

package/README.md

@@ -0,0 +1,29 @@
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
+* Other community or team contact

package/dist/passport-entra.d.ts

@@ -1,36 +1,31 @@
 import { Strategy } from 'passport';
+import type { AuthenticateCallback } from 'passport';
 import { createRemoteJWKSet } from 'jose';
 import type { Request } from 'express';
 /**
  * Bearerstrategy options
  */
 export interface BearerOptions {
-    /** If set, check aud claim against this audience */
+    /** If provided, check aud claim against this audience, otherwise use clientID. */
     audience?: string | string[];
-    /** ClientID of app in Entra, check aud claim against clientID if audience options is not set */
+    /** ClientID of app in Entra, check aud claim against clientID if audience is not provided. */
     clientID: string;
-    /** clockSkew allowed when checking nbf and exp claims */
+    /** Clock skew allowed when checking nbf and exp claims. */
     clockSkew?: string | number;
-    /** well known oid-configuration endpoint, ie <issuer>/.well-known/openid-configuration */
+    /** Well known oid-configuration endpoint, i.e. _issuer_/.well-known/openid-configuration. */
     identityMetadata: string;
-    /** iss claim check, ie https://login.microsoftonline.com/<tenantID>/v2.0 - tenantID of app in Entra */
+    /** Check iss claim, i.e. https://login.microsoftonline.com/_tenantID_/v2.0 - tenantID of app in Entra */
     issuer: string | string[];
-    /** scp claim check */
+    /** Check scp claim. */
     scope?: string[];
 }
 /**
  * Called by this BearerStrategy when the token has been validated.
  * Use the token (the bearer JWT payload) to find the user. Then call done.
  */
-export type VerifyCallback = (token: object, done: VerifyCompleteCallback) => void;
+export type VerifyCallback = (token: object, done: AuthenticateCallback) => void;
 /**
- * Call this in the VerifyCallback with either the found user or an error.
- * The user ends up in req.user, the info in req.authInfo.
- * An error results in an authentication failure. Status is ignored.
- */
-export type VerifyCompleteCallback = (err: unknown, user?: Express.User | false | null, info?: object, status?: number | number[]) => void;
-/**
- * Bearerstrategy for password.js, used with Microsoft Entra as identity provider
+ * Bearerstrategy for password.js, used with Microsoft Entra as identity provider.
  */
 export default class BearerStrategy extends Strategy {
     audience: string[];

package/dist/passport-entra.js

@@ -1,91 +1,86 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const passport_1 = require("passport");
 const jose_1 = require("jose");
 /**
- * Bearerstrategy for password.js, used with Microsoft Entra as identity provider
+ * Bearerstrategy for password.js, used with Microsoft Entra as identity provider.
  */
 class BearerStrategy extends passport_1.Strategy {
+    audience;
+    clientID;
+    clockSkew;
+    identityMetadata;
+    issuer;
+    name = 'oauth-bearer';
+    scope;
+    verifyFn;
+    jwks;
     /**
      * Creates a new BearerStrategy instance.
      * @param options The validation options.
      * @param verifyFn Called when a token is validated, needs to provide the User object.
      */
     constructor(options, verifyFn) {
-        var _a, _b, _c;
         super();
-        this.name = 'oauth-bearer';
         this.verifyFn = verifyFn;
-        let audience = (_a = options.audience) !== null && _a !== void 0 ? _a : options.clientID;
+        let audience = options.audience ?? options.clientID;
         if (typeof audience === 'string') {
             audience = [audience, `spn:${audience}`];
         }
         this.audience = audience;
         this.clientID = options.clientID;
-        this.clockSkew = (_b = options.clockSkew) !== null && _b !== void 0 ? _b : 300;
+        this.clockSkew = options.clockSkew ?? 300;
         this.identityMetadata = options.identityMetadata;
         this.issuer = options.issuer;
-        this.scope = (_c = options.scope) !== null && _c !== void 0 ? _c : [];
+        this.scope = options.scope ?? [];
     }
     /**
      * Validates the Bearer token in a request.
      * When validated, calls VerifyFn to retrieve the User belonging to the token.
      * @param req The Express request
      */
-    authenticate(req) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                if (!this.jwks) {
-                    const res = yield fetch(this.identityMetadata);
-                    if (!res.ok) {
-                        throw new Error(`Error ${String(res.status)} when querying identity metadata`);
-                    }
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    const { jwks_uri } = yield res.json();
-                    this.jwks = (0, jose_1.createRemoteJWKSet)(new URL(jwks_uri));
+    async authenticate(req) {
+        try {
+            if (!this.jwks) {
+                const res = await fetch(this.identityMetadata);
+                if (!res.ok) {
+                    throw new Error(`Error ${String(res.status)} when querying identity metadata`);
                 }
-                const header = req.get('authorization');
-                const headerParts = header === null || header === void 0 ? void 0 : header.split(' ');
-                const jwt = (headerParts === null || headerParts === void 0 ? void 0 : headerParts.length) === 2 && headerParts[0].toLowerCase() === 'bearer' && headerParts[1];
-                if (!jwt) {
-                    throw new Error('Unable to extract Bearer token from Authorization header');
-                }
-                const { payload } = yield (0, jose_1.jwtVerify)(jwt, this.jwks, {
-                    audience: this.audience, // aud
-                    clockTolerance: this.clockSkew, // exp, nbf
-                    issuer: this.issuer, // iss
-                });
-                // console.log(JSON.stringify(payload, null, 2));
-                const scp = String((_a = payload.scp) !== null && _a !== void 0 ? _a : ''); // scp
-                if (this.scope.length > 0
-                    && !this.scope.some((scope) => scp.includes(scope))) {
-                    throw new Error('Scope does not match scp claim');
-                }
-                this.verifyFn(payload, (err, user, info) => {
-                    if (err) {
-                        throw err;
-                    }
-                    if (!user) {
-                        throw new Error('No user found');
-                    }
-                    this.success(user, info);
-                });
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                const { jwks_uri } = await res.json();
+                this.jwks = (0, jose_1.createRemoteJWKSet)(new URL(jwks_uri));
             }
-            catch (error) {
-                const message = JSON.stringify(error);
-                this.fail(message);
+            const header = req.get('authorization');
+            const headerParts = header?.split(' ');
+            const jwt = headerParts?.length === 2 && headerParts[0]?.toLowerCase() === 'bearer' && headerParts[1];
+            if (!jwt) {
+                throw new Error('Unable to extract Bearer token from Authorization header');
             }
-        });
+            const { payload } = await (0, jose_1.jwtVerify)(jwt, this.jwks, {
+                audience: this.audience, // aud
+                clockTolerance: this.clockSkew, // exp, nbf
+                issuer: this.issuer, // iss
+            });
+            // console.log(JSON.stringify(payload, null, 2));
+            const scp = String(payload['scp'] ?? ''); // scp
+            if (this.scope.length > 0
+                && !this.scope.some((scope) => scp.includes(scope))) {
+                throw new Error('Scope does not match scp claim');
+            }
+            this.verifyFn(payload, (err, user, info) => {
+                if (err) {
+                    throw err;
+                }
+                if (!user) {
+                    throw new Error('No user found');
+                }
+                this.success(user, info);
+            });
+        }
+        catch (error) {
+            const message = JSON.stringify(error);
+            this.fail(message);
+        }
     }
 }
 exports.default = BearerStrategy;

package/package.json

@@ -1,21 +1,25 @@
-{
-  "name": "passport-entra",
-  "version": "0.0.3",
-  "description": "Microft Entra authentication strategy for passport",
-  "main": "dist/passport-entra.js",
-  "types": "dist/passport-entra.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Jan Bakker",
-  "license": "ISC",
-  "dependencies": {
-    "jose": "^6.0.11",
-    "passport": "^0.7.0",
-    "typescript": "^5.8.3"
-  },
-  "devDependencies": {
-    "@types/passport": "^1.0.17"
-  }
-}
+{
+  "name": "passport-entra",
+  "version": "0.0.4",
+  "description": "Microsoft Entra authentication strategy for passport",
+  "main": "dist/passport-entra.js",
+  "types": "dist/passport-entra.d.ts",
+  "homepage": "https://bitbucket.org/janbakker/passport-entra",
+  "repository": "git+https://bitbucket.org/janbakker/passport-entra.git",
+  "scripts": {
+    "build": "tsc",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Jan Bakker",
+  "license": "ISC",
+  "dependencies": {
+    "jose": "^6.0.11",
+    "passport": "^0.7.0"
+  },
+  "devDependencies": {
+    "@tsconfig/node20": "^20.1.6",
+    "@tsconfig/strictest": "^2.0.5",
+    "@types/passport": "^1.0.17",
+    "typescript": "^5.8.3"
+  }
+}

package/passport-entra.ts

@@ -1,130 +1,120 @@
-import { Strategy } from 'passport';
-import { createRemoteJWKSet, jwtVerify } from 'jose';
-
-import type { Request } from 'express';
-
-/**
- * Bearerstrategy options
- */
-export interface BearerOptions {
-  /** If set, check aud claim against this audience */
-  audience?: string | string[];
-  /** ClientID of app in Entra, check aud claim against clientID if audience options is not set */
-  clientID: string;
-  /** clockSkew allowed when checking nbf and exp claims */
-  clockSkew?: string | number;
-  /** well known oid-configuration endpoint, ie <issuer>/.well-known/openid-configuration */
-  identityMetadata: string;
-  /** iss claim check, ie https://login.microsoftonline.com/<tenantID>/v2.0 - tenantID of app in Entra */
-  issuer: string | string[];
-  /** scp claim check */
-  scope?: string[];
-}
-
-/** 
- * Called by this BearerStrategy when the token has been validated. 
- * Use the token (the bearer JWT payload) to find the user. Then call done.
- */
-export type VerifyCallback = (token: object, done: VerifyCompleteCallback) => void;
-
-/** 
- * Call this in the VerifyCallback with either the found user or an error.
- * The user ends up in req.user, the info in req.authInfo.
- * An error results in an authentication failure. Status is ignored.
- */
-export type VerifyCompleteCallback = (
-  err: unknown,
-  user?: Express.User | false | null,
-  info?: object,
-  status?: number | number[]
-) => void;
-
-/**
- * Bearerstrategy for password.js, used with Microsoft Entra as identity provider
- */
-export default class BearerStrategy extends Strategy {
-  audience;
-  clientID;
-  clockSkew;
-  identityMetadata;
-  issuer;
-  name = 'oauth-bearer';
-  scope;
-  verifyFn;
-  jwks: ReturnType<typeof createRemoteJWKSet> | undefined;
-
-  /**
-   * Creates a new BearerStrategy instance.
-   * @param options The validation options.
-   * @param verifyFn Called when a token is validated, needs to provide the User object.
-   */
-  constructor(options: BearerOptions, verifyFn: VerifyCallback) {
-    super();
-
-    this.verifyFn = verifyFn;
-
-    let audience = options.audience ?? options.clientID;
-    if (typeof audience === 'string') {
-      audience = [audience, `spn:${audience}`];
-    }
-    this.audience = audience;
-
-    this.clientID = options.clientID;
-    this.clockSkew = options.clockSkew ?? 300;
-    this.identityMetadata = options.identityMetadata;
-    this.issuer = options.issuer;
-    this.scope = options.scope ?? [];
-  }
-
-  /**
-   * Validates the Bearer token in a request.
-   * When validated, calls VerifyFn to retrieve the User belonging to the token.
-   * @param req The Express request
-   */
-  async authenticate(req: Request) {
-    try {
-      if (!this.jwks) {
-        const res = await fetch(this.identityMetadata);
-        if (!res.ok) {
-          throw new Error(`Error ${String(res.status)} when querying identity metadata`);
-        }
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { jwks_uri } = await res.json() as { jwks_uri: string };
-        this.jwks = createRemoteJWKSet(new URL(jwks_uri));
-      }
-
-      const header = req.get('authorization');
-      const headerParts = header?.split(' ');
-      const jwt = headerParts?.length === 2 && headerParts[0].toLowerCase() === 'bearer' && headerParts[1];
-      if (!jwt) {
-        throw new Error('Unable to extract Bearer token from Authorization header');
-      }
-
-      const { payload } = await jwtVerify(jwt, this.jwks, {
-        audience: this.audience, // aud
-        clockTolerance: this.clockSkew, // exp, nbf
-        issuer: this.issuer, // iss
-      });
-      // console.log(JSON.stringify(payload, null, 2));
-
-      const scp = String(payload.scp ?? ''); // scp
-      if (this.scope.length > 0
-        && !this.scope.some((scope) => scp.includes(scope))) {
-        throw new Error('Scope does not match scp claim');
-      }
-
-      this.verifyFn(payload, (err: unknown, user: unknown, info?: object) => {
-        if (err) {
-          throw err as Error;
-        }
-        if (!user) {
-          throw new Error('No user found');
-        }
-        this.success(user, info);
-      });
-    } catch (error) {
-      const message = JSON.stringify(error);
-      this.fail(message);
-    }
-  }
-}
+import { Strategy } from 'passport';
+import type { AuthenticateCallback } from 'passport';
+
+import { createRemoteJWKSet, jwtVerify } from 'jose';
+
+import type { Request } from 'express';
+
+/**
+ * Bearerstrategy options
+ */
+export interface BearerOptions {
+  /** If provided, check aud claim against this audience, otherwise use clientID. */
+  audience?: string | string[];
+  /** ClientID of app in Entra, check aud claim against clientID if audience is not provided. */
+  clientID: string;
+  /** Clock skew allowed when checking nbf and exp claims. */
+  clockSkew?: string | number;
+  /** Well known oid-configuration endpoint, i.e. _issuer_/.well-known/openid-configuration. */
+  identityMetadata: string;
+  /** Check iss claim, i.e. https://login.microsoftonline.com/_tenantID_/v2.0 - tenantID of app in Entra */
+  issuer: string | string[];
+  /** Check scp claim. */
+  scope?: string[];
+}
+
+/** 
+ * Called by this BearerStrategy when the token has been validated. 
+ * Use the token (the bearer JWT payload) to find the user. Then call done.
+ */
+export type VerifyCallback = (token: object, done: AuthenticateCallback) => void;
+
+/**
+ * Bearerstrategy for password.js, used with Microsoft Entra as identity provider.
+ */
+export default class BearerStrategy extends Strategy {
+  audience;
+  clientID;
+  clockSkew;
+  identityMetadata;
+  issuer;
+  override name = 'oauth-bearer';
+  scope;
+  verifyFn;
+  jwks: ReturnType<typeof createRemoteJWKSet> | undefined;
+
+  /**
+   * Creates a new BearerStrategy instance.
+   * @param options The validation options.
+   * @param verifyFn Called when a token is validated, needs to provide the User object.
+   */
+  constructor(options: BearerOptions, verifyFn: VerifyCallback) {
+    super();
+
+    this.verifyFn = verifyFn;
+
+    let audience = options.audience ?? options.clientID;
+    if (typeof audience === 'string') {
+      audience = [audience, `spn:${audience}`];
+    }
+    this.audience = audience;
+
+    this.clientID = options.clientID;
+    this.clockSkew = options.clockSkew ?? 300;
+    this.identityMetadata = options.identityMetadata;
+    this.issuer = options.issuer;
+    this.scope = options.scope ?? [];
+  }
+
+  /**
+   * Validates the Bearer token in a request.
+   * When validated, calls VerifyFn to retrieve the User belonging to the token.
+   * @param req The Express request
+   */
+  override async authenticate(req: Request) {
+    try {
+      if (!this.jwks) {
+        const res = await fetch(this.identityMetadata);
+        if (!res.ok) {
+          throw new Error(`Error ${String(res.status)} when querying identity metadata`);
+        }
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        const { jwks_uri } = await res.json() as { jwks_uri: string };
+        this.jwks = createRemoteJWKSet(new URL(jwks_uri));
+      }
+
+      const header = req.get('authorization');
+      const headerParts = header?.split(' ');
+      const jwt = headerParts?.length === 2 && headerParts[0]?.toLowerCase() === 'bearer' && headerParts[1];
+      if (!jwt) {
+        throw new Error('Unable to extract Bearer token from Authorization header');
+      }
+
+      const { payload } = await jwtVerify(jwt, this.jwks, {
+        audience: this.audience, // aud
+        clockTolerance: this.clockSkew, // exp, nbf
+        issuer: this.issuer, // iss
+      });
+      // console.log(JSON.stringify(payload, null, 2));
+
+      const scp = String(payload['scp'] ?? ''); // scp
+      if (this.scope.length > 0
+        && !this.scope.some((scope) => scp.includes(scope))) {
+        throw new Error('Scope does not match scp claim');
+      }
+
+      this.verifyFn(payload, (err: unknown, user: unknown, info?: string | object) => {
+        if (err) {
+          throw err as Error;
+        }
+        if (!user) {
+          throw new Error('No user found');
+        }
+        this.success(user, info as object);
+      });
+    } catch (error) {
+      const message = JSON.stringify(error);
+      this.fail(message);
+    }
+  }
+}

package/tsconfig.json

@@ -2,17 +2,14 @@
   "compilerOptions": {
     "declaration": true,
     "outDir": "dist",
-
-    "target": "es2016",
-    "module": "commonjs",
-    "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
-
-    "strict": true,
-    "skipLibCheck": true
   },
   "exclude": [
     "node_modules",
     "dist"
+  ],
+  "extends": [
+    "@tsconfig/strictest/tsconfig.json",
+    "@tsconfig/node20/tsconfig.json"
   ]
 }