updated dependencies, fixed linting issues (#25)

sf-kansara · web-flow · commit ba5a25ea824f · 2020-12-15T13:39:40.000+05:30
* updated dependencies

* lint fixes, lint config fixes
diff --git a/.eslintignore b/.eslintignore
@@ -2,3 +2,5 @@ node_modules/
 dist/
 coverage/
 api-docs/
+
+index.*
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,4 +4,8 @@ module.exports = {
     'no-extra-boolean-cast': 'off',
     '@typescript-eslint/interface-name-prefix': 'off',
   },
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,8 +50,8 @@
   },
   "dependencies": {
     "@exlinc/keycloak-passport": "^1.0.2",
-    "@loopback/context": "^3.9.2",
-    "@loopback/core": "^2.9.1",
+    "@loopback/context": "^3.13.0",
+    "@loopback/core": "^2.12.0",
     "passport": "^0.4.1",
     "passport-azure-ad": "^4.2.1",
     "passport-google-oauth20": "^2.0.0",
@@ -61,27 +61,27 @@
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@loopback/boot": "^2.3.1",
-    "@loopback/build": "^5.4.1",
-    "@loopback/metadata": "^2.1.5",
-    "@loopback/rest": "^5.0.1",
-    "@loopback/testlab": "^3.1.5",
+    "@loopback/boot": "^3.1.0",
+    "@loopback/build": "^6.2.6",
+    "@loopback/metadata": "^3.0.3",
+    "@loopback/rest": "^9.0.0",
+    "@loopback/testlab": "^3.2.8",
     "@loopback/tslint-config": "^2.1.0",
     "@types/express": "^4.17.6",
     "@types/lodash": "^4.14.150",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.44",
     "@types/passport": "^1.0.3",
     "@types/passport-azure-ad": "^4.0.5",
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-http-bearer": "^1.0.35",
     "@types/passport-local": "^1.0.33",
     "@types/passport-oauth2-client-password": "^0.1.2",
-    "lodash": "^4.17.19",
-    "nyc": "^15.0.1",
+    "lodash": "^4.17.20",
+    "nyc": "^15.1.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^8.10.1",
     "tslint": "^6.1.2",
-    "typescript": "~3.9.3"
+    "typescript": "~4.0.5"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
diff --git a/src/__tests__/integration/passport-client-password/client-password-verify.integration.ts b/src/__tests__/integration/passport-client-password/client-password-verify.integration.ts
@@ -1,3 +1,5 @@
+/* eslint-disable  @typescript-eslint/naming-convention */
+
 import {IAuthClient} from '../../../types';
 import {Client, createClientForHandler, expect} from '@loopback/testlab';
 import {RestServer} from '@loopback/rest';
@@ -36,7 +38,7 @@ describe('Client-password strategy', () => {
 
     const client = await whenIMakeRequestTo(server)
       .post('/test')
-      .send({client_id: 'some id', client_secret: 'some secret'}) // eslint-disable-line
+      .send({client_id: 'some id', client_secret: 'some secret'})
       .expect(200);
 
     expect(client.body).to.have.property('clientId');
@@ -63,7 +65,7 @@ describe('Client-password strategy', () => {
 
     const client = await whenIMakeRequestTo(server)
       .post('/test')
-      .send({client_id: 'some id', client_secret: 'some secret'}) // eslint-disable-line
+      .send({client_id: 'some id', client_secret: 'some secret'})
       .expect(200);
 
     expect(client.body).to.have.property('clientId');
@@ -96,7 +98,7 @@ describe('Client-password strategy', () => {
 
     await whenIMakeRequestTo(server)
       .post('/test')
-      .send({client_id: '', client_secret: 'some secret'}) // eslint-disable-line
+      .send({client_id: '', client_secret: 'some secret'})
       .expect(401);
   });
 
@@ -124,7 +126,7 @@ describe('Client-password strategy', () => {
 
     await whenIMakeRequestTo(server)
       .post('/test')
-      .send({client_id: '', client_secret: 'some secret'}) // eslint-disable-line
+      .send({client_id: '', client_secret: 'some secret'})
       .expect(401);
   });
 
@@ -179,7 +181,7 @@ describe('integration test for client-password and no verifier', () => {
 
     await whenIMakeRequestTo(server)
       .post('/test')
-      .send({client_id: 'some id', client_secret: 'some secret'}) // eslint-disable-line
+      .send({client_id: 'some id', client_secret: 'some secret'})
       .expect(401);
   });
 
diff --git a/src/__tests__/integration/passport-resource-owner-password/resource-owner-password.integration.ts b/src/__tests__/integration/passport-resource-owner-password/resource-owner-password.integration.ts
@@ -1,3 +1,5 @@
+/* eslint-disable  @typescript-eslint/naming-convention */
+
 import {Client, createClientForHandler, expect} from '@loopback/testlab';
 import {RestServer} from '@loopback/rest';
 import {Application, inject} from '@loopback/core';
@@ -64,8 +66,8 @@ describe('Resource-owner-password strategy', () => {
       .send({
         username: 'username',
         password: 'password',
-        client_id: 'client id', // eslint-disable-line
-        client_secret: 'client secret', // eslint-disable-line
+        client_id: 'client id',
+        client_secret: 'client secret',
       })
       .expect(200);
 
@@ -106,8 +108,8 @@ describe('Resource-owner-password strategy', () => {
       .send({
         username: 'user name',
         password: 'password',
-        client_id: 'client id', // eslint-disable-line
-        client_secret: 'client secret', // eslint-disable-line
+        client_id: 'client id',
+        client_secret: 'client secret',
       })
       .expect(200);
 
@@ -148,8 +150,8 @@ describe('Resource-owner-password strategy', () => {
       .send({
         username: 'name',
         password: 'password',
-        client_id: 'client id', // eslint-disable-line
-        client_secret: 'client secret', // eslint-disable-line
+        client_id: 'client id',
+        client_secret: 'client secret',
       })
       .expect(200);
 
@@ -183,8 +185,8 @@ describe('Resource-owner-password strategy', () => {
       .send({
         username: '',
         password: 'password',
-        client_id: '', // eslint-disable-line
-        client_secret: 'client secret', // eslint-disable-line
+        client_id: '',
+        client_secret: 'client secret',
       })
       .expect(401);
   });
@@ -244,8 +246,8 @@ describe('Resource-owner strategy with no verifier', () => {
       .send({
         username: 'username',
         password: 'password',
-        client_id: 'client id', // eslint-disable-line
-        client_secret: 'client secret', // eslint-disable-line
+        client_id: 'client id',
+        client_secret: 'client secret',
       })
       .expect(401);
   });
diff --git a/src/strategies/keys.ts b/src/strategies/keys.ts
@@ -11,58 +11,58 @@ import {VerifyFunction} from './types';
 export namespace Strategies {
   export namespace Passport {
     // Passport-local strategy
-    export const LOCAL_STRATEGY_FACTORY = BindingKey.create<
-      LocalPasswordStrategyFactory
-    >('sf.passport.strategyFactory.localPassword');
-    export const LOCAL_PASSWORD_VERIFIER = BindingKey.create<
-      VerifyFunction.LocalPasswordFn
-    >('sf.passport.verifier.localPassword');
+    export const LOCAL_STRATEGY_FACTORY = BindingKey.create<LocalPasswordStrategyFactory>(
+      'sf.passport.strategyFactory.localPassword',
+    );
+    export const LOCAL_PASSWORD_VERIFIER = BindingKey.create<VerifyFunction.LocalPasswordFn>(
+      'sf.passport.verifier.localPassword',
+    );
 
     // Passport-oauth2-client-password strategy
-    export const CLIENT_PASSWORD_STRATEGY_FACTORY = BindingKey.create<
-      ClientPasswordStrategyFactory
-    >('sf.passport.strategyFactory.clientPassword');
-    export const OAUTH2_CLIENT_PASSWORD_VERIFIER = BindingKey.create<
-      VerifyFunction.OauthClientPasswordFn
-    >('sf.passport.verifier.oauth2ClientPassword');
+    export const CLIENT_PASSWORD_STRATEGY_FACTORY = BindingKey.create<ClientPasswordStrategyFactory>(
+      'sf.passport.strategyFactory.clientPassword',
+    );
+    export const OAUTH2_CLIENT_PASSWORD_VERIFIER = BindingKey.create<VerifyFunction.OauthClientPasswordFn>(
+      'sf.passport.verifier.oauth2ClientPassword',
+    );
 
     // Passport-bearer strategy
-    export const BEARER_STRATEGY_FACTORY = BindingKey.create<
-      BearerStrategyFactory
-    >('sf.passport.strategyFactory.bearer');
-    export const BEARER_TOKEN_VERIFIER = BindingKey.create<
-      VerifyFunction.BearerFn
-    >('sf.passport.verifier.bearerToken');
+    export const BEARER_STRATEGY_FACTORY = BindingKey.create<BearerStrategyFactory>(
+      'sf.passport.strategyFactory.bearer',
+    );
+    export const BEARER_TOKEN_VERIFIER = BindingKey.create<VerifyFunction.BearerFn>(
+      'sf.passport.verifier.bearerToken',
+    );
 
     // Passport-oauth2-resource-owner-password strategy
-    export const RESOURCE_OWNER_STRATEGY_FACTORY = BindingKey.create<
-      ResourceOwnerPasswordStrategyFactory
-    >('sf.passport.strategyFactory.resourceOwnerPassword');
-    export const RESOURCE_OWNER_PASSWORD_VERIFIER = BindingKey.create<
-      VerifyFunction.ResourceOwnerPasswordFn
-    >('sf.passport.verifier.resourceOwnerPassword');
+    export const RESOURCE_OWNER_STRATEGY_FACTORY = BindingKey.create<ResourceOwnerPasswordStrategyFactory>(
+      'sf.passport.strategyFactory.resourceOwnerPassword',
+    );
+    export const RESOURCE_OWNER_PASSWORD_VERIFIER = BindingKey.create<VerifyFunction.ResourceOwnerPasswordFn>(
+      'sf.passport.verifier.resourceOwnerPassword',
+    );
 
     // Passport-google-oauth2 strategy
-    export const GOOGLE_OAUTH2_STRATEGY_FACTORY = BindingKey.create<
-      GoogleAuthStrategyFactoryProvider
-    >('sf.passport.strategyFactory.googleOauth2');
-    export const GOOGLE_OAUTH2_VERIFIER = BindingKey.create<
-      VerifyFunction.GoogleAuthFn
-    >('sf.passport.verifier.googleOauth2');
+    export const GOOGLE_OAUTH2_STRATEGY_FACTORY = BindingKey.create<GoogleAuthStrategyFactoryProvider>(
+      'sf.passport.strategyFactory.googleOauth2',
+    );
+    export const GOOGLE_OAUTH2_VERIFIER = BindingKey.create<VerifyFunction.GoogleAuthFn>(
+      'sf.passport.verifier.googleOauth2',
+    );
 
-    export const AZURE_AD_STRATEGY_FACTORY = BindingKey.create<
-      AzureADAuthStrategyFactoryProvider
-    >('sf.passport.strategyFactory.azureAd');
-    export const AZURE_AD_VERIFIER = BindingKey.create<
-      VerifyFunction.AzureADAuthFn
-    >('sf.passport.verifier.azureAd');
+    export const AZURE_AD_STRATEGY_FACTORY = BindingKey.create<AzureADAuthStrategyFactoryProvider>(
+      'sf.passport.strategyFactory.azureAd',
+    );
+    export const AZURE_AD_VERIFIER = BindingKey.create<VerifyFunction.AzureADAuthFn>(
+      'sf.passport.verifier.azureAd',
+    );
 
     // Passport-keycloak strategy
-    export const KEYCLOAK_STRATEGY_FACTORY = BindingKey.create<
-      KeycloakStrategyFactoryProvider
-    >('sf.passport.strategyFactory.keycloak');
-    export const KEYCLOAK_VERIFIER = BindingKey.create<
-      VerifyFunction.KeycloakAuthFn
-    >('sf.passport.verifier.keycloak');
+    export const KEYCLOAK_STRATEGY_FACTORY = BindingKey.create<KeycloakStrategyFactoryProvider>(
+      'sf.passport.strategyFactory.keycloak',
+    );
+    export const KEYCLOAK_VERIFIER = BindingKey.create<VerifyFunction.KeycloakAuthFn>(
+      'sf.passport.verifier.keycloak',
+    );
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,5 +5,5 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "include": ["src"]
+  "include": ["src", ".eslintrc.js"]
 }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`"rootDir": "src",`
`6`	`6`	`"outDir": "dist"`
`7`	`7`	`},`
`8`		`- "include": ["src"]`
	`8`	`+ "include": ["src", ".eslintrc.js"]`
`9`	`9`	`}`