From 36922d156da1001ed985ed3cd6bd06c868b3e48e Mon Sep 17 00:00:00 2001 From: olav Date: Thu, 28 Apr 2022 12:40:38 +0200 Subject: [PATCH] refactor: fix a few eslint module boundary type overrides (#1542) --- src/lib/routes/admin-api/archive.ts | 2 -- src/lib/routes/admin-api/email.ts | 7 +++---- src/lib/routes/admin-api/strategy.ts | 23 +++++++++-------------- src/lib/server-impl.ts | 2 -- src/lib/services/state-service.ts | 1 - 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/lib/routes/admin-api/archive.ts b/src/lib/routes/admin-api/archive.ts index ef929a7cb0..056bb18d4e 100644 --- a/src/lib/routes/admin-api/archive.ts +++ b/src/lib/routes/admin-api/archive.ts @@ -50,7 +50,6 @@ export default class ArchiveController extends Controller { ); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types async getArchivedFeatures( req: Request, res: Response, @@ -71,7 +70,6 @@ export default class ArchiveController extends Controller { res.status(200).end(); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types async reviveFeatureToggle(req: IAuthRequest, res: Response): Promise { const userName = extractUsername(req); const { featureName } = req.params; diff --git a/src/lib/routes/admin-api/email.ts b/src/lib/routes/admin-api/email.ts index 9f8dae44bf..8fb851ea05 100644 --- a/src/lib/routes/admin-api/email.ts +++ b/src/lib/routes/admin-api/email.ts @@ -2,6 +2,7 @@ import { ADMIN } from '../../types/permissions'; import { TemplateFormat } from '../../services/email-service'; import { IUnleashConfig } from '../../types/option'; import { IUnleashServices } from '../../types/services'; +import { Request, Response } from 'express'; const Controller = require('../controller'); @@ -17,8 +18,7 @@ export default class EmailController extends Controller { this.get('/preview/text/:template', this.getTextPreview, ADMIN); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async getHtmlPreview(req, res): Promise { + async getHtmlPreview(req: Request, res: Response): Promise { const { template } = req.params; const ctx = req.query; const data = await this.emailService.compileTemplate( @@ -32,8 +32,7 @@ export default class EmailController extends Controller { res.end(); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async getTextPreview(req, res) { + async getTextPreview(req: Request, res: Response): Promise { const { template } = req.params; const ctx = req.query; const data = await this.emailService.compileTemplate( diff --git a/src/lib/routes/admin-api/strategy.ts b/src/lib/routes/admin-api/strategy.ts index d0a2e1a3e6..96d197164b 100644 --- a/src/lib/routes/admin-api/strategy.ts +++ b/src/lib/routes/admin-api/strategy.ts @@ -12,6 +12,8 @@ import { CREATE_STRATEGY, UPDATE_STRATEGY, } from '../../types/permissions'; +import { Request, Response } from 'express'; +import { IAuthRequest } from '../unleash-types'; const version = 1; @@ -45,8 +47,7 @@ class StrategyController extends Controller { ); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async getAllStrategies(req, res): Promise { + async getAllStrategies(req: Request, res: Response): Promise { try { const strategies = await this.strategyService.getStrategies(); res.json({ version, strategies }); @@ -55,8 +56,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async getStrategy(req, res): Promise { + async getStrategy(req: Request, res: Response): Promise { try { const { name } = req.params; const strategy = await this.strategyService.getStrategy(name); @@ -66,8 +66,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async removeStrategy(req, res): Promise { + async removeStrategy(req: IAuthRequest, res: Response): Promise { const strategyName = req.params.name; const userName = extractUsername(req); @@ -79,8 +78,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async createStrategy(req, res): Promise { + async createStrategy(req: IAuthRequest, res: Response): Promise { const userName = extractUsername(req); try { await this.strategyService.createStrategy(req.body, userName); @@ -90,8 +88,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async updateStrategy(req, res): Promise { + async updateStrategy(req: IAuthRequest, res: Response): Promise { const userName = extractUsername(req); try { await this.strategyService.updateStrategy(req.body, userName); @@ -101,8 +98,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async deprecateStrategy(req, res): Promise { + async deprecateStrategy(req: IAuthRequest, res: Response): Promise { const userName = extractUsername(req); const { strategyName } = req.params; if (strategyName === 'default') { @@ -120,8 +116,7 @@ class StrategyController extends Controller { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - async reactivateStrategy(req, res): Promise { + async reactivateStrategy(req: IAuthRequest, res: Response): Promise { const userName = extractUsername(req); const { strategyName } = req.params; try { diff --git a/src/lib/server-impl.ts b/src/lib/server-impl.ts index 1c2904588f..02e7ad4f25 100644 --- a/src/lib/server-impl.ts +++ b/src/lib/server-impl.ts @@ -118,7 +118,6 @@ async function createApp( }); } -// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types async function start(opts: IUnleashOptions = {}): Promise { const config = createConfig(opts); const logger = config.getLogger('server-impl.js'); @@ -143,7 +142,6 @@ async function start(opts: IUnleashOptions = {}): Promise { return unleash; } -// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types async function create(opts: IUnleashOptions): Promise { const config = createConfig(opts); const logger = config.getLogger('server-impl.js'); diff --git a/src/lib/services/state-service.ts b/src/lib/services/state-service.ts index ef539bb938..89694331b6 100644 --- a/src/lib/services/state-service.ts +++ b/src/lib/services/state-service.ts @@ -646,7 +646,6 @@ export default class StateService { ); } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types async export({ includeFeatureToggles = true, includeStrategies = true,