alp-node-auth 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alp-node-auth",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "description": "authentication with alp",
   "keywords": [
     "alp"
@@ -13,10 +13,11 @@
     "directory": "packages/alp-node-auth"
   },
   "homepage": "https://github.com/christophehurpeau/alp",
+  "type": "module",
   "engines": {
-    "node": ">=12.10.0"
+    "node": "^14.13.1 || >=16.0.0"
   },
-  "main": "./index.js",
+  "main": "./dist/index-node14.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     ">=3.1": {
@@ -26,14 +27,10 @@
     }
   },
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "node": {
-        "development": {
-          "import": "./dist/index-node12-dev.mjs",
-          "require": "./dist/index-node12-dev.cjs.js"
-        },
-        "import": "./dist/index-node12.mjs",
-        "require": "./dist/index-node12.cjs.js"
+        "import": "./dist/index-node14.mjs"
       }
     },
     "./strategies/dropbox": {
@@ -61,15 +58,14 @@
       "require": "./strategies/slack.js"
     }
   },
-  "module:node": "./dist/index-node12.mjs",
-  "module:node-dev": "./dist/index-node12-dev.mjs",
+  "module:node": "./dist/index-node14.mjs",
   "sideEffects": false,
   "scripts": {
     "build": "pob-build && yarn run build:definitions",
     "build:definitions": "tsc -p tsconfig.build.json",
-    "clean": "rm -Rf docs dist",
+    "clean": "rm -Rf dist",
     "lint": "yarn run lint:eslint",
-    "lint:eslint": "yarn --cwd ../.. run eslint --ext .js,.mjs,.ts --report-unused-disable-directives --quiet packages/alp-node-auth",
+    "lint:eslint": "cd ../.. && yarn run eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet packages/alp-node-auth",
     "watch": "pob-watch"
   },
   "prettier": {
@@ -81,9 +77,8 @@
     "babelEnvs": [
       {
         "target": "node",
-        "version": "12",
+        "version": "14",
         "formats": [
-          "cjs",
           "es"
         ]
       }
@@ -111,17 +106,16 @@
     "alp-types": "^3.0.0",
     "cookies": "^0.8.0",
     "jsonwebtoken": "^8.5.1",
-    "nightingale-logger": "^11.0.5",
+    "nightingale-logger": "^12.1.2",
     "simple-oauth2": "^2.2.1"
   },
   "devDependencies": {
-    "@babel/core": "7.13.13",
-    "alp-node": "^3.2.0",
-    "alp-router": "^4.1.2",
-    "babel-preset-latest-node": "5.5.1",
-    "liwi-mongo": "8.0.4",
-    "pob-babel": "26.8.0",
-    "rollup": "2.43.1"
+    "@babel/core": "7.16.7",
+    "alp-node": "4.0.0",
+    "alp-router": "5.0.0",
+    "liwi-mongo": "8.3.1",
+    "pob-babel": "29.6.1",
+    "typescript": "4.5.4"
   },
-  "gitHead": "2f3c2a9cdeacf0c759f275e7e4ccbcb5d46db297"
+  "gitHead": "854189ce2307f42363e81bcf7862c5f1deced54a"
 }

package/rollup.config.mjs

@@ -0,0 +1,3 @@
+import createRollupConfig from 'pob-babel/createRollupConfig.js';
+
+export default createRollupConfig({});

package/src/.eslintrc.json

@@ -7,7 +7,7 @@
   "plugins": ["@typescript-eslint"],
   "extends": [
     "@pob/eslint-config-typescript",
-    "@pob/eslint-config-typescript-node"
+    "@pob/eslint-config-typescript/node"
   ],
   "ignorePatterns": ["*.d.ts"],
   "rules": {
@@ -15,5 +15,22 @@
     "@typescript-eslint/no-unsafe-assignment": "warn",
     "@typescript-eslint/no-unsafe-call": "warn",
     "@typescript-eslint/no-unsafe-member-access": "warn"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["**/*.test.ts", "__tests__/**/*.ts"],
+      "extends": ["@pob/eslint-config-typescript/test"],
+      "env": {
+        "jest": true
+      },
+      "rules": {
+        "import/no-extraneous-dependencies": [
+          "error",
+          {
+            "devDependencies": true
+          }
+        ]
+      }
+    }
+  ]
 }

package/src/MongoUsersManager.ts

@@ -3,7 +3,7 @@ import type { User, Account, UserSanitized } from '../types.d';
 
 export default class MongoUsersManager<
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 > {
   store: MongoStore<U>;
 
@@ -52,6 +52,7 @@ export default class MongoUsersManager<
       };
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     return this.store.findOne(query);
   }
 

package/src/authApolloContext.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage } from 'http';
 import type { NodeConfig } from 'alp-types';
-import Logger from 'nightingale-logger';
+import { Logger } from 'nightingale-logger';
 import type { User } from '../types.d';
 import type MongoUsersManager from './MongoUsersManager';
 import { getTokenFromRequest, COOKIE_NAME } from './utils/cookies';
@@ -24,9 +24,7 @@ export const createAuthApolloContext = <U extends User = User>(
   usersManager: MongoUsersManager<U>,
 ): any => {
   const findConnectedAndUser = createFindConnectedAndUser(
-    config
-      .get<Map<string, string>>('authentication')
-      .get('secretKey') as string,
+    config.get<Map<string, string>>('authentication').get('secretKey')!,
     usersManager,
     logger,
   );
@@ -38,11 +36,13 @@ export const createAuthApolloContext = <U extends User = User>(
 
     if (!req) return null;
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const token = getTokenFromReq(req);
 
     if (!token) return { user: undefined };
 
     const [, user] = await findConnectedAndUser(
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       req.headers['user-agent'],
       token,
     );

package/src/authSocketIO.ts

@@ -1,6 +1,6 @@
 import type { NodeApplication } from 'alp-types';
 import type { Option } from 'cookies';
-import Logger from 'nightingale-logger';
+import { Logger } from 'nightingale-logger';
 import type { User } from '../types.d';
 import type MongoUsersManager from './MongoUsersManager';
 import { getTokenFromRequest } from './utils/cookies';
@@ -11,13 +11,12 @@ const logger = new Logger('alp:auth');
 export const authSocketIO = <U extends User = User>(
   app: NodeApplication,
   usersManager: MongoUsersManager<U>,
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   io: any,
   options?: Pick<Option, Exclude<keyof Option, 'secure'>>,
 ): void => {
   const findConnectedAndUser = createFindConnectedAndUser(
-    app.config
-      .get<Map<string, string>>('authentication')
-      .get('secretKey') as string,
+    app.config.get<Map<string, string>>('authentication').get('secretKey')!,
     usersManager,
     logger,
   );
@@ -27,11 +26,13 @@ export const authSocketIO = <U extends User = User>(
 
   io.use(async (socket: any, next: any) => {
     const handshakeData = socket.request;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const token = getTokenFromRequest(handshakeData);
 
     if (!token) return next();
 
     const [connected, user] = await findConnectedAndUser(
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       handshakeData.headers['user-agent'],
       token,
     );

package/src/createAuthController.ts

@@ -14,7 +14,7 @@ import type {
 export interface CreateAuthControllerParams<
   StrategyKeys extends AllowedStrategyKeys,
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 > {
   authenticationService: AuthenticationService<StrategyKeys, U, UserSanitized>;
   homeRouterKey?: string;
@@ -47,7 +47,7 @@ export interface AuthHooks<StrategyKeys extends AllowedStrategyKeys>
 export function createAuthController<
   StrategyKeys extends AllowedStrategyKeys,
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 >({
   usersManager,
   authenticationService,

package/src/index.ts

@@ -3,7 +3,7 @@ import { promisify } from 'util';
 import type { Context } from 'alp-node';
 import type { ContextState, NodeApplication } from 'alp-types';
 import jsonwebtoken from 'jsonwebtoken';
-import Logger from 'nightingale-logger';
+import { Logger } from 'nightingale-logger';
 import type { User, UserSanitized } from '../types.d';
 import type MongoUsersManager from './MongoUsersManager';
 import type {
@@ -21,7 +21,6 @@ import type { AccountService } from './services/user/types';
 import { getTokenFromRequest, COOKIE_NAME } from './utils/cookies';
 import { createFindConnectedAndUser } from './utils/createFindConnectedAndUser';
 
-export { AuthenticationService };
 export { default as MongoUsersManager } from './MongoUsersManager';
 export { default as UserAccountGoogleService } from './services/user/UserAccountGoogleService';
 export { default as UserAccountSlackService } from './services/user/UserAccountSlackService';
@@ -30,6 +29,7 @@ export { createAuthApolloContext } from './authApolloContext';
 export { STATUSES } from './services/user/UserAccountsService';
 
 declare module 'alp-types' {
+  // eslint-disable-next-line @typescript-eslint/no-shadow
   interface ContextState {
     connected: NonNullable<ContextState['user']>['_id'] | null | undefined;
     user: User | null | undefined;
@@ -58,11 +58,12 @@ const signPromisified: any = promisify(jsonwebtoken.sign);
 
 export type AuthController = AuthControllerType;
 export type AuthRoutes = AuthRoutesType;
+export { AuthenticationService } from './services/authentification/AuthenticationService';
 
 export default function init<
   StrategyKeys extends AllowedStrategyKeys = 'google',
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 >({
   homeRouterKey,
   usersManager,
@@ -70,6 +71,7 @@ export default function init<
   defaultStrategy,
   strategyToService,
   authHooks,
+  jwtAudience,
 }: {
   homeRouterKey?: string;
   usersManager: MongoUsersManager<U, USanitized>;
@@ -77,7 +79,9 @@ export default function init<
   defaultStrategy?: StrategyKeys;
   strategyToService: Record<StrategyKeys, AccountService<any>>;
   authHooks?: AuthHooks<StrategyKeys>;
+  jwtAudience?: string;
 }) {
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   return (app: NodeApplication) => {
     const userAccountsService = new UserAccountsService(
       usersManager,
@@ -118,11 +122,12 @@ export default function init<
           .get('secretKey'),
         {
           algorithm: 'HS512',
-          audience: this.request.headers['user-agent'],
+          audience: jwtAudience || this.request.headers['user-agent'],
           expiresIn: '30 days',
         },
       );
 
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       this.cookies.set(COOKIE_NAME, token, {
         httpOnly: true,
         secure: this.config.get('allowHttps'),
@@ -150,7 +155,10 @@ export default function init<
         req: IncomingMessage,
       ): ReturnType<typeof getConnectedAndUser> => {
         const token = getTokenFromRequest(req);
-        return getConnectedAndUser(req.headers['user-agent'], token);
+        return getConnectedAndUser(
+          jwtAudience || req.headers['user-agent'],
+          token,
+        );
       },
       getConnectedAndUser,
 
@@ -172,7 +180,10 @@ export default function init<
           ctx.sanitizedState.user = user && usersManager.sanitize(user);
         };
 
-        const [connected, user] = await getConnectedAndUser(userAgent, token);
+        const [connected, user] = await getConnectedAndUser(
+          jwtAudience || userAgent,
+          token,
+        );
         logger.debug('middleware', { connected });
 
         if (connected == null || user == null) {

package/src/services/authentification/AuthenticationService.ts

@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable camelcase, max-lines */
 import { EventEmitter } from 'events';
 import 'alp-router';
 import type { Context, NodeConfig } from 'alp-types';
-import Logger from 'nightingale-logger';
+import { Logger } from 'nightingale-logger';
 import type { OAuthClient } from 'simple-oauth2';
 import type { AccountId, User, Account, UserSanitized } from '../../../types.d';
 import { randomHex } from '../../utils/generators';
@@ -58,7 +60,7 @@ export interface AccessResponseHooks<StrategyKeys, U extends User = User> {
 export class AuthenticationService<
   StrategyKeys extends AllowedStrategyKeys,
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 > extends EventEmitter {
   config: NodeConfig;
 
@@ -296,7 +298,7 @@ export class AuthenticationService<
     }
     return this.refreshToken(account.provider as StrategyKeys, {
       // accessToken: account.accessToken,
-      refreshToken: account.refreshToken as string,
+      refreshToken: account.refreshToken!,
     }).then((tokens: Tokens) => {
       if (!tokens) {
         // serviceGoogle.updateFields({ accessToken:null, refreshToken:null, status: .OUTDATED });

package/src/services/user/UserAccountGoogleService.ts

@@ -1,9 +1,12 @@
-/* global fetch */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { fetch } from 'alp-node';
 import type { Tokens } from '../authentification/types';
 import type { AccountService, FullName } from './types';
 
 export default class UserAccountGoogleService<ScopeKeys extends 'login'>
-  implements AccountService<ScopeKeys> {
+  implements AccountService<ScopeKeys>
+{
   scopeKeyToScope: Record<ScopeKeys, string>;
 
   constructor(scopeKeyToScope: Record<Exclude<'login', ScopeKeys>, string>) {
@@ -57,8 +60,8 @@ export default class UserAccountGoogleService<ScopeKeys extends 'login'>
   getScope(oldScope: string[] | undefined, newScope: string): string[] {
     return !oldScope
       ? newScope.split(' ')
-      : oldScope
-          .concat(newScope.split(' '))
-          .filter((item: any, i: any, ar: string[]) => ar.indexOf(item) === i);
+      : [...oldScope, ...newScope.split(' ')].filter(
+          (item, i, ar) => ar.indexOf(item) === i,
+        );
   }
 }

package/src/services/user/UserAccountSlackService.ts

@@ -1,11 +1,13 @@
-/* global fetch */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { fetch } from 'alp-node';
 import type { Tokens } from '../authentification/types';
 import type { AccountService, FullName } from './types';
 
 // https://api.slack.com/methods/users.identity
 
 export default class UserAccountSlackService<ScopeKeys extends 'login'>
-  implements AccountService<ScopeKeys> {
+  implements AccountService<ScopeKeys>
+{
   scopeKeyToScope: Record<ScopeKeys, string>;
 
   constructor(scopeKeyToScope: Record<Exclude<'login', ScopeKeys>, string>) {
@@ -61,8 +63,8 @@ export default class UserAccountSlackService<ScopeKeys extends 'login'>
   getScope(oldScope: string[] | undefined, newScope: string): string[] {
     return !oldScope
       ? newScope.split(' ')
-      : oldScope
-          .concat(newScope.split(' '))
-          .filter((item: any, i: any, ar: string[]) => ar.indexOf(item) === i);
+      : [...oldScope, ...newScope.split(' ')].filter(
+          (item, i, ar) => ar.indexOf(item) === i,
+        );
   }
 }

package/src/services/user/UserAccountsService.ts

@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-shadow */
 import { EventEmitter } from 'events';
-import Logger from 'nightingale-logger';
+import { Logger } from 'nightingale-logger';
 import type { AccountId, User, Account, UserSanitized } from '../../../types.d';
 import type MongoUsersManager from '../../MongoUsersManager';
 import type { AllowedStrategyKeys } from '../authentification/types';
@@ -15,7 +16,7 @@ export const STATUSES = {
 export default class UserAccountsService<
   StrategyKeys extends AllowedStrategyKeys,
   U extends User = User,
-  USanitized extends UserSanitized = UserSanitized
+  USanitized extends UserSanitized = UserSanitized,
 > extends EventEmitter {
   private readonly strategyToService: Record<StrategyKeys, AccountService<any>>;
 
@@ -109,13 +110,12 @@ export default class UserAccountsService<
 
     const emails = service.getEmails(profile);
 
-    let user:
-      | Partial<U>
-      | undefined = await this.usersManager.findOneByAccountOrEmails({
-      provider: service.providerKey,
-      accountId,
-      emails,
-    });
+    let user: Partial<U> | undefined =
+      await this.usersManager.findOneByAccountOrEmails({
+        provider: service.providerKey,
+        accountId,
+        emails,
+      });
 
     logger.info(!user ? 'create user' : 'existing user', { emails, user });
 
@@ -168,6 +168,7 @@ export default class UserAccountsService<
     });
 
     user.emailDomains = [
+      // eslint-disable-next-line unicorn/no-array-reduce
       ...user.emails.reduce(
         (domains: Set<string>, email: string) =>
           domains.add(email.split('@', 2)[1]),

package/src/utils/cookies.ts

@@ -8,7 +8,8 @@ export const getTokenFromRequest = (
   req: IncomingMessage,
   options?: Pick<Option, Exclude<keyof Option, 'secure'>>,
 ): string | undefined => {
-  const cookies = new Cookies(req, (null as unknown) as any, {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  const cookies = new Cookies(req, null as unknown as any, {
     ...options,
     secure: true,
   });

package/src/utils/createFindConnectedAndUser.ts

@@ -6,7 +6,7 @@ import type {
   VerifyOptions,
 } from 'jsonwebtoken';
 import jsonwebtoken from 'jsonwebtoken';
-import type Logger from 'nightingale-logger';
+import type { Logger } from 'nightingale-logger';
 import type { User, UserSanitized } from '../../types.d';
 import type MongoUsersManager from '../MongoUsersManager';
 
@@ -24,25 +24,24 @@ const verifyPromisified = promisify<
   Parameters<VerifyCallback>[1]
 >(jsonwebtoken.verify as Verify);
 
-const createDecodeJWT = (secretKey: string) => async (
-  token: string,
-  userAgent: string,
-): Promise<string | undefined> => {
-  const result = await verifyPromisified(token, secretKey, {
-    algorithms: ['HS512'],
-    audience: userAgent,
-  });
-  return (result as any)?.connected as string | undefined;
-};
+const createDecodeJWT =
+  (secretKey: string) =>
+  async (token: string, jwtAudience: string): Promise<string | undefined> => {
+    const result = await verifyPromisified(token, secretKey, {
+      algorithms: ['HS512'],
+      audience: jwtAudience,
+    });
+    return (result as any)?.connected as string | undefined;
+  };
 
 export type FindConnectedAndUser<U extends User> = (
-  userAgent?: string,
+  jwtAudience?: string,
   token?: string,
 ) => Promise<[null | undefined | U['_id'], null | undefined | U]>;
 
 export const createFindConnectedAndUser = <
   U extends User,
-  USanitized extends UserSanitized
+  USanitized extends UserSanitized,
 >(
   secretKey: string,
   usersManager: MongoUsersManager<U, USanitized>,
@@ -51,14 +50,14 @@ export const createFindConnectedAndUser = <
   const decodeJwt = createDecodeJWT(secretKey);
 
   const findConnectedAndUser: FindConnectedAndUser<U> = async (
-    userAgent,
+    jwtAudience,
     token,
   ) => {
-    if (!token || !userAgent) return [null, null];
+    if (!token || !jwtAudience) return [null, null];
 
     let connected;
     try {
-      connected = await decodeJwt(token, userAgent);
+      connected = await decodeJwt(token, jwtAudience);
     } catch (err: unknown) {
       logger.debug('failed to verify authentification', { err });
     }

package/strategies/dropbox.js

@@ -1,11 +1,9 @@
-'use strict';
+import { create } from 'simple-oauth2';
 
-const oauth2 = require('simple-oauth2').create;
-
-module.exports = function dropboxStrategy(config) {
+export default function dropboxStrategy(config) {
   return {
     type: 'oauth2',
-    oauth2: oauth2({
+    oauth2: create({
       client: {
         id: config.get('dropbox').get('clientId'),
         secret: config.get('dropbox').get('clientSecret'),
@@ -17,4 +15,4 @@ module.exports = function dropboxStrategy(config) {
       },
     }),
   };
-};
+}

package/strategies/facebook.js

@@ -1,11 +1,9 @@
-'use strict';
+import { create } from 'simple-oauth2';
 
-const oauth2 = require('simple-oauth2').create;
-
-module.exports = function facebookStrategy(config) {
+export default function facebookStrategy(config) {
   return {
     type: 'oauth2',
-    oauth2: oauth2({
+    oauth2: create({
       client: {
         id: config.get('facebook').get('clientId'),
         secret: config.get('facebook').get('clientSecret'),
@@ -17,4 +15,4 @@ module.exports = function facebookStrategy(config) {
       },
     }),
   };
-};
+}

package/strategies/foursquare.js

@@ -1,11 +1,9 @@
-'use strict';
+import { create } from 'simple-oauth2';
 
-const oauth2 = require('simple-oauth2').create;
-
-module.exports = function foursquareStrategy(config) {
+export default function foursquareStrategy(config) {
   return {
     type: 'oauth2',
-    oauth2: oauth2({
+    oauth2: create({
       client: {
         id: config.get('foursquare').get('clientId'),
         secret: config.get('foursquare').get('clientSecret'),
@@ -17,4 +15,4 @@ module.exports = function foursquareStrategy(config) {
       },
     }),
   };
-};
+}

package/strategies/github.js

@@ -1,11 +1,9 @@
-'use strict';
+import { create } from 'simple-oauth2';
 
-const oauth2 = require('simple-oauth2').create;
-
-module.exports = function githubStrategy(config) {
+export default function githubStrategy(config) {
   return {
     type: 'oauth2',
-    oauth2: oauth2({
+    oauth2: create({
       client: {
         id: config.get('github').get('clientId'),
         secret: config.get('github').get('clientSecret'),
@@ -17,4 +15,4 @@ module.exports = function githubStrategy(config) {
       },
     }),
   };
-};
+}

package/strategies/google.js

@@ -1,11 +1,9 @@
-'use strict';
+import { create } from 'simple-oauth2';
 
-const oauth2 = require('simple-oauth2').create;
-
-module.exports = function googleStrategy(config) {
+export default function googleStrategy(config) {
   return {
     type: 'oauth2',
-    oauth2: oauth2({
+    oauth2: create({
       client: {
         id: config.get('google').get('clientId'),
         secret: config.get('google').get('clientSecret'),
@@ -17,4 +15,4 @@ module.exports = function googleStrategy(config) {
       },
     }),
   };
-};
+}