Fix esModuleInterop + update eslint rules.

Rmannn · Rmannn · commit 32626f8c00cf · 2020-06-04T02:22:44.000+02:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,3 @@
+**/node_modules/**
+**/dist/**
+**/docs/**
diff --git a/.eslintrc b/.eslintrc
@@ -2,22 +2,13 @@
     "env": {
         "node": true
     },
-    "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "project": "./tsconfig.json",
-        "sourceType": "module"
+        "project": "./tsconfig.json"
     },
     "ignorePatterns": ["dist/test/*", "typedoc.js"],
-    "plugins": ["@typescript-eslint", "prefer-arrow", "import"],
-    "extends": [
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended",
-        "prettier",
-        "prettier/@typescript-eslint"
-    ],
+    "extends": ["standard-with-typescript", "prettier", "prettier/@typescript-eslint"],
     "root": true,
     "rules": {
-        "indent": ["error", 4],
         "@typescript-eslint/interface-name-prefix": "off",
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-explicit-any": "off",
diff --git a/.npmignore b/.npmignore
@@ -13,5 +13,6 @@ yarn.lock
 .vscode
 renovate.json
 .eslintrc
+.eslintignore
 .github
 *.tgz
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nestjs-authentication",
-    "version": "0.1.1",
+    "version": "0.1.3",
     "description": "A nestjs module that support multiple authentications provider",
     "author": "Alex Hermann <contact@pop-code.com>",
     "repository": "https://github.com/Pop-Code/nestjs-authentication.git",
@@ -14,7 +14,7 @@
         "test:watch": "jest --watch",
         "test:cov": "jest --coverage",
         "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest",
-        "lint": "eslint ./src/**/*.ts",
+        "lint": "eslint --ext .js,.ts,.jsx,.tsx .",
         "format": "prettier \"**/*.ts\" --ignore-path .prettierignore --write && git status"
     },
     "peerDependencies": {
@@ -28,31 +28,35 @@
         "passport-local": "~1.0.0"
     },
     "devDependencies": {
-        "@nestjs/common": "7.0.9",
-        "@nestjs/core": "7.0.9",
-        "@nestjs/testing": "7.0.9",
+        "@nestjs/common": "7.1.3",
+        "@nestjs/core": "7.1.3",
+        "@nestjs/testing": "7.1.3",
         "@nestjs/passport": "7.0.0",
-        "@types/jest": "25.2.1",
-        "@types/node": "13.13.4",
+        "@types/jest": "25.2.3",
+        "@types/node": "14.0.9",
         "@types/passport": "1.0.3",
-        "@typescript-eslint/eslint-plugin": "2.31.0",
-        "@typescript-eslint/parser": "2.31.0",
         "commander": "5.1.0",
+        "@typescript-eslint/eslint-plugin": "3.1.0",
+        "@typescript-eslint/parser": "3.1.0",
         "eslint": "6.8.0",
         "eslint-config-prettier": "6.11.0",
+        "eslint-config-standard-with-typescript": "18.0.2",
         "eslint-plugin-import": "2.20.2",
+        "eslint-plugin-node": "11.1.0",
         "eslint-plugin-prefer-arrow": "1.2.1",
-        "jest": "25.5.4",
-        "nestjs-console": "3.0.4",
+        "eslint-plugin-promise": "4.2.1",
+        "eslint-plugin-standard": "4.0.1",
+        "jest": "26.0.1",
+        "nestjs-console": "3.0.5",
         "passport": "0.4.1",
         "prettier": "2.0.5",
         "reflect-metadata": "0.1.13",
         "rxjs": "6.5.5",
-        "ts-jest": "25.4.0",
-        "ts-node": "8.10.1",
+        "ts-jest": "26.1.0",
+        "ts-node": "8.10.2",
         "tsconfig-paths": "3.9.0",
-        "typedoc": "0.17.6",
-        "typescript": "3.8.3"
+        "typedoc": "0.17.7",
+        "typescript": "3.9.3"
     },
     "jest": {
         "moduleFileExtensions": [
diff --git a/src/controller.ts b/src/controller.ts
@@ -17,7 +17,7 @@ export abstract class AuthController<LoginRequest extends ILoginRequest> {
      */
     loginAction(req: any, namespace = 'user.ops', redirect?: string): any {
         const user: any = req.user;
-        if (user && user.namespace !== namespace) {
+        if (typeof user === 'object' && user.namespace !== namespace) {
             req.logout();
         }
         return { data: { namespace, user: req.user, redirect } };
@@ -30,7 +30,7 @@ export abstract class AuthController<LoginRequest extends ILoginRequest> {
      */
     loginCheckAction(data: LoginRequest, request: any): any {
         const response = { success: true };
-        if (!request.user) {
+        if (typeof request.user !== 'object') {
             response.success = false;
         }
         if (request.get('accept') === 'application/json') {
@@ -45,7 +45,7 @@ export abstract class AuthController<LoginRequest extends ILoginRequest> {
      * @param req The http request (@Req|@Request)
      */
     logoutAction(req: any): any {
-        if (req.isAuthenticated()) {
+        if (req.isAuthenticated() !== true) {
             req.logOut();
         }
         if (req.get('accept') === 'application/json') {
diff --git a/src/guard.ts b/src/guard.ts
@@ -1,9 +1,9 @@
 import { CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
-import passport, { AuthenticateOptions } from 'passport';
+import * as passport from 'passport';
 
 export const scopes = new Map();
 
-export interface IAuthGuardOptions extends AuthenticateOptions {
+export interface IAuthGuardOptions extends passport.AuthenticateOptions {
     isAuth?: boolean;
     strategy: string | string[];
 }
@@ -17,7 +17,7 @@ export class AuthGuard implements CanActivate {
         if (typeof this.options.scope === 'string') {
             this.options.scope = [this.options.scope];
         }
-        if (this.options.scope) {
+        if (Array.isArray(this.options.scope)) {
             for (const scope of this.options.scope) {
                 scopes.set(scope, scope);
             }
@@ -32,7 +32,7 @@ export class AuthGuard implements CanActivate {
         let [request, response, next] = [httpCtx.getRequest(), httpCtx.getResponse(), httpCtx.getNext()];
 
         // support graphql context
-        if (!request) {
+        if (typeof request !== 'object') {
             request = context.getArgByIndex(2).request;
             response = request.res;
             next = (err) => {
@@ -41,27 +41,27 @@ export class AuthGuard implements CanActivate {
         }
 
         for (const strategy of this.options.strategy) {
-            if (strategy === 'local' && request.isAuthenticated()) {
+            if (strategy === 'local' && request.isAuthenticated() === true) {
                 return true;
             } else {
-                await new Promise((ok, fail) =>
+                await new Promise((resolve, reject) =>
                     passport.authenticate(strategy, this.options, async (err, user, info) => {
                         request.authInfo = info;
                         try {
-                            if (!user && this.options.isAuth) {
+                            if (typeof user !== 'object' && this.options.isAuth) {
                                 throw new Error('User not found');
                             }
-                            if (err) {
+                            if (err !== undefined || err !== null) {
                                 throw err;
                             }
-                            if (user) {
+                            if (typeof user === 'object') {
                                 await this.login(user, request);
                             }
-                            ok();
+                            resolve();
                         } catch (e) {
                             // TO DO we could simply return false here to let the canActivate do the job
                             // And just Log the error
-                            fail(new UnauthorizedException(e.message.message || e.message || 'Uncaught error'));
+                            reject(new UnauthorizedException(typeof e.message === 'string' ? e.message : 'Uncaught error'));
                         }
                     })(request, response, next)
                 );
@@ -73,12 +73,12 @@ export class AuthGuard implements CanActivate {
 
     async login<User>(user: any, request: any): Promise<User> {
         request.oauth2Scope = this.options.scope;
-        await new Promise((ok, fail) => {
+        await new Promise((resolve, reject) => {
             request.logIn(user, (loginErr: Error) => {
-                if (loginErr) {
-                    return fail(loginErr);
+                if (loginErr instanceof Error) {
+                    return reject(loginErr);
                 }
-                ok();
+                resolve();
             });
         });
         return user;
diff --git a/src/interfaces/encrypt.ts b/src/interfaces/encrypt.ts
@@ -1,5 +1,5 @@
 export interface IEncrypt {
-    encrypt(value: string): string;
+    encrypt: (value: string) => string;
 }
 export interface IEncryptOptions {
     iv: string;
diff --git a/src/interfaces/provider.ts b/src/interfaces/provider.ts
@@ -1,8 +1,8 @@
 export interface IUserProvider<U = any> {
-    findOne(data: any): Promise<U>;
+    findOne: (data: any) => Promise<U>;
 }
 
 export interface IAuthProvider<U = any> {
-    loadUser(data: any): U | Promise<U>;
-    getName(): string;
+    loadUser: (data: any) => U | Promise<U>;
+    getName: () => string;
 }
diff --git a/src/module.ts b/src/module.ts
@@ -1,11 +1,11 @@
-import { Global, Module, NestModule, MiddlewareConsumer, DynamicModule } from '@nestjs/common';
+import { DynamicModule, Global, MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { ConsoleModule } from 'nestjs-console';
+import * as passport from 'passport';
+
+import { IAuthModuleAsyncOptions, IAuthModuleOptions } from './interfaces/options';
 import { AuthService } from './service';
 import { LocalStrategy } from './strategies/local';
 import { UserSerializer } from './user.serializer';
-import passport from 'passport';
-import { IEncryptOptions } from './interfaces/encrypt';
-import { IAuthModuleOptions, IAuthModuleAsyncOptions } from './interfaces/options';
 
 @Global()
 @Module({})
diff --git a/src/providers/auth.provider.ts b/src/providers/auth.provider.ts
@@ -10,22 +10,23 @@ export class AuthUserProvider<T extends IEmailPassword> implements IAuthProvider
         private readonly providerName: string,
         private readonly userProvider: IUserProvider<T>,
         private readonly encryptor: IEncrypt
-    ) {}
+    ) { }
 
-    async loadUser(data: { password: string; [key: string]: any }): Promise<T> {
+    async loadUser(data: { password: string;[key: string]: any }): Promise<T> {
         const query = { ...data };
         delete query.password;
-        const entity = await this.userProvider.findOne(query);
-        if (!entity) {
-            return;
-        }
-        if (entity && data.password) {
-            const encrypted = this.encryptor.encrypt(data.password);
-            if (encrypted !== entity.passwordEncrypted) {
+        if (typeof data.password === 'string') {
+            const entity = await this.userProvider.findOne(query);
+            if (entity === undefined) {
                 return;
+            } else if (typeof data.password === 'string') {
+                const encrypted = this.encryptor.encrypt(data.password);
+                if (encrypted !== entity.passwordEncrypted) {
+                    return;
+                }
             }
+            return entity;
         }
-        return entity;
     }
 
     getName(): string {
diff --git a/src/providers/memory.provider.ts b/src/providers/memory.provider.ts
@@ -7,15 +7,15 @@ import { IUserProvider } from '../interfaces/provider';
 export class MemoryUserProvider<U extends MemoryUser> implements IUserProvider<U> {
     private readonly users: Map<string, U> = new Map();
 
-    findOne<S extends { [key in keyof U]: any }>(data: S): Promise<U> {
-        if (data._id) {
-            return Promise.resolve(this.users.get(data._id.toString()));
+    async findOne<S extends { [key in keyof U]: any }>(data: S): Promise<U> {
+        if (data._id !== undefined && data._id !== null) {
+            return await Promise.resolve(this.users.get(data._id.toString()));
         } else {
-            if (!data.email) {
+            if (typeof data.email !== 'string') {
                 return;
             }
             const users = Array.from(this.users.values());
-            return Promise.resolve(users.find((u) => u.email === data.email));
+            return await Promise.resolve(users.find((u) => u.email === data.email));
         }
     }
 
diff --git a/src/service.ts b/src/service.ts
@@ -10,7 +10,7 @@ import { IAuthProvider } from './interfaces/provider';
 @Console()
 export class AuthService implements IEncrypt {
     protected readonly authProviders = new Map<string, IAuthProvider<any>>();
-    constructor(protected options: IEncryptOptions) {}
+    constructor(protected options: IEncryptOptions) { }
 
     @Command({
         command: 'password <password>',
@@ -44,15 +44,16 @@ export class AuthService implements IEncrypt {
     }
 
     async loadUser<U = any>(data: any): Promise<U> {
-        const provider = this.getAuthProvider(data.namespace);
-        if (!provider) {
-            throw new NotFoundException(`Invalid namespace: Provider "${data.namespace}" not found`);
+        const namespace: string = typeof data.namespace === 'string' ? data.namespace : 'default';
+        const provider = this.getAuthProvider(namespace);
+        if (provider === undefined) {
+            throw new NotFoundException(`Invalid namespace: Provider ${namespace} not found`);
         }
         const user = await provider.loadUser(data);
         return user;
     }
 
-    validateUser<U = any>(payload: IJwtPayload): Promise<U> {
-        return this.loadUser({ _id: payload._id, namespace: payload.namespace });
+    async validateUser<U = any>(payload: IJwtPayload): Promise<U> {
+        return await this.loadUser({ _id: payload._id, namespace: payload.namespace });
     }
 }
diff --git a/src/strategies/local.ts b/src/strategies/local.ts
@@ -16,7 +16,12 @@ export class LocalStrategy extends PassportStrategy(Strategy, 'local') {
     }
 
     async validate(req: any, email: string, password: string): Promise<any> {
-        const namespace = req.body.namespace || req.query.namespace;
+        let namespace: string;
+        if (typeof req.query.namespace === 'string') {
+            namespace = req.query.namespace;
+        } else if (typeof req.body.namespace === 'string') {
+            namespace = req.body.namespace
+        }
         const user = await this.authService.loadUser({ email, password, namespace });
         return user;
     }
diff --git a/src/user.serializer.ts b/src/user.serializer.ts
@@ -1,5 +1,6 @@
+import { Inject, Injectable } from '@nestjs/common';
 import { PassportSerializer } from '@nestjs/passport';
-import { Injectable, Inject } from '@nestjs/common';
+
 import { AuthService } from './service';
 
 /**
@@ -10,8 +11,9 @@ export class UserSerializer extends PassportSerializer {
     constructor(protected readonly authService: AuthService) {
         super();
     }
+
     serializeUser(user: any, done: (e?: Error, payload?: any) => void) {
-        if (!user) {
+        if (user === undefined || user === null) {
             return done();
         }
         done(null, {
@@ -20,8 +22,9 @@ export class UserSerializer extends PassportSerializer {
             namespace: user.namespace
         });
     }
+
     async deserializeUser(payload: { _id: string; namespace: string }, done: (e?: Error, user?: any) => void) {
-        if (!payload._id || !payload.namespace) {
+        if (payload._id === undefined || payload.namespace === undefined) {
             done();
         }
         try {
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "allowSyntheticDefaultImports": true,
         "declaration": true,
         "declarationMap": true,
         "noImplicitAny": false,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/node_modules/`
	`2`	`+/dist/`
	`3`	`+/docs/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`export interface IEncrypt {`
`2`		`- encrypt(value: string): string;`
	`2`	`+ encrypt: (value: string) => string;`
`3`	`3`	`}`
`4`	`4`	`export interface IEncryptOptions {`
`5`	`5`	`iv: string;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`export interface IUserProvider<U = any> {`
`2`		`- findOne(data: any): Promise<U>;`
	`2`	`+ findOne: (data: any) => Promise<U>;`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`export interface IAuthProvider<U = any> {`
`6`		`- loadUser(data: any): U \| Promise<U>;`
`7`		`- getName(): string;`
	`6`	`+ loadUser: (data: any) => U \| Promise<U>;`
	`7`	`+ getName: () => string;`
`8`	`8`	`}`