Fix linting errors

junekimdev · junekimdev · commit aa699f92c31b · 2024-11-21T16:46:36.000+09:00
diff --git a/src/api/v1.ts b/src/api/v1.ts
@@ -29,7 +29,7 @@ import basicAuth from '../middleware/basicAuth';
 import bearerAuth from '../middleware/bearerAuth';
 import refreshToken from '../middleware/refreshToken';
 import uploadImageProfile from '../middleware/uploadImageProfile';
-import uploadImagesMax from '../middleware/uploadImagesMax';
+// import uploadImagesMax from '../middleware/uploadImagesMax';
 import validRole from '../middleware/validateRole';
 import validTopic from '../middleware/validateTopic';
 import validateUserIdAdmin from '../middleware/validateUserIdAdmin';
diff --git a/src/middleware/allowAll.ts b/src/middleware/allowAll.ts
@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import { AccessControlRow, requestAccess } from '../utils/access';
+import { requestAccess } from '../utils/access';
 
 const access = async (req: Request, res: Response, next: NextFunction) => {
   res.locals.accessRegex = requestAccess();
diff --git a/src/middleware/basicAuth.ts b/src/middleware/basicAuth.ts
@@ -37,7 +37,7 @@ const auth = async (req: Request, res: Response, next: NextFunction) => {
     if (!authorization) throw new AppError(errDef[401].AuthorizationNotFound);
 
     const [scheme, cred] = authorization.split(' ');
-    if (scheme != 'Basic') throw new AppError(errDef[401].InvalidAuthScheme);
+    if (scheme !== 'Basic') throw new AppError(errDef[401].InvalidAuthScheme);
     if (!cred) throw new AppError(errDef[401].UserCredentialNotFound);
 
     const { username, password } = decodeCredential(cred);
diff --git a/src/middleware/bearerAuth.ts b/src/middleware/bearerAuth.ts
@@ -15,7 +15,7 @@ const auth = async (req: Request, res: Response, next: NextFunction) => {
     if (!authorization) throw new AppError(errDef[401].AuthorizationNotFound);
 
     const [scheme, accessToken] = authorization.split(' ');
-    if (scheme != 'Bearer') throw new AppError(errDef[401].InvalidAuthScheme);
+    if (scheme !== 'Bearer') throw new AppError(errDef[401].InvalidAuthScheme);
     if (!accessToken) throw new AppError(errDef[401].AccessTokenNotFound);
 
     // Get regex from access control
diff --git a/src/middleware/uploadImageProfile.ts b/src/middleware/uploadImageProfile.ts
@@ -25,7 +25,7 @@ const uploader = async (req: Request, res: Response, next: NextFunction) => {
   // create a dir
   try {
     await fs.promises.access(fileDir);
-  } catch (error) {
+  } catch (_error: any) {
     await fs.promises.mkdir(fileDir, { recursive: true });
   }
 
@@ -63,7 +63,7 @@ const uploader = async (req: Request, res: Response, next: NextFunction) => {
     }
   });
 
-  bb.on('field', (fieldname: string, value: string, info: FieldInfo) => {
+  bb.on('field', (fieldname: string, value: string, _info: FieldInfo) => {
     req.body[fieldname] = value;
   });
 
@@ -87,6 +87,7 @@ const uploader = async (req: Request, res: Response, next: NextFunction) => {
   });
 
   bb.on('close', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     resultError ? next(resultError) : next();
   });
 
diff --git a/src/middleware/uploadImagesMax.ts b/src/middleware/uploadImagesMax.ts
@@ -28,7 +28,7 @@ const uploader =
     // create a dir
     try {
       await fs.promises.access(fileDir);
-    } catch (error) {
+    } catch (_error: any) {
       await fs.promises.mkdir(fileDir, { recursive: true });
     }
 
@@ -66,7 +66,7 @@ const uploader =
       }
     });
 
-    bb.on('field', (fieldname: string, value: string, info: FieldInfo) => {
+    bb.on('field', (fieldname: string, value: string, _info: FieldInfo) => {
       req.body[fieldname] = value;
     });
 
@@ -89,6 +89,7 @@ const uploader =
     });
 
     bb.on('close', () => {
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       resultError ? next(resultError) : next();
     });
 
diff --git a/src/middleware/validateUserIdAdmin.ts b/src/middleware/validateUserIdAdmin.ts
@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import { JwtPayload } from 'jsonwebtoken';
+// import { JwtPayload } from 'jsonwebtoken';
 import { AppError, errDef } from '../utils/errors';
 import { IBearerAuthResLocals } from './bearerAuth';
 
diff --git a/src/middleware/validateUserIdUser.ts b/src/middleware/validateUserIdUser.ts
@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import { JwtPayload } from 'jsonwebtoken';
+// import { JwtPayload } from 'jsonwebtoken';
 import { AppError, errDef } from '../utils/errors';
 import { IBearerAuthResLocals } from './bearerAuth';
 
diff --git a/src/server.ts b/src/server.ts
@@ -2,15 +2,16 @@ import config from './utils/config';
 config();
 
 import cors from 'cors';
-import express, { NextFunction, Request, Response } from 'express';
+import express from 'express';
 import helmet from 'helmet';
 import pinoHttp from 'pino-http';
 import apiRouter from './api';
 import errorHandler from './errorHandler';
 import { corsOption } from './utils/cors';
 import { logger, pinoExpOpt } from './utils/logger';
 
-const { TRUST_PROXY = '', PORT = '3000' } = process.env;
+// const { TRUST_PROXY = '' } = process.env;
+const { PORT = '3000' } = process.env;
 const app = express();
 
 // Tell Express if this app is behind a proxy
diff --git a/src/services/createRole/provider.ts b/src/services/createRole/provider.ts
@@ -1,7 +1,5 @@
-import { QueryResult } from 'pg';
 import { IPermission } from '../../utils/access';
 import db from '../../utils/db';
-import { UK_ERR_CODE } from '../../utils/errors';
 
 export const SQL_INSERT_ROLE = `INSERT INTO user_role(name)
 VALUES ($1::VARCHAR(50))
diff --git a/src/services/deletePushTopic/apiHandler.ts b/src/services/deletePushTopic/apiHandler.ts
@@ -1,7 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 import { AppError, errDef } from '../../utils/errors';
 import provider from './provider';
-import { IResBody, IResLocals } from './types';
+import { IResLocals } from './types';
 
 const handler = async (req: Request, res: Response, next: NextFunction) => {
   try {
diff --git a/src/services/deletePushTopic/types.ts b/src/services/deletePushTopic/types.ts
@@ -1,5 +1,3 @@
-//export interface IReqBody {}
-export interface IResBody {}
 export interface IResLocals {
   topicName: string;
 }
diff --git a/src/services/readPushTopic/apiHandler.ts b/src/services/readPushTopic/apiHandler.ts
@@ -1,7 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 import { AppError, errDef } from '../../utils/errors';
 import provider from './provider';
-import { IResBody, IResLocals } from './types';
+import { IResLocals } from './types';
 
 const handler = async (req: Request, res: Response, next: NextFunction) => {
   try {
diff --git a/src/services/readPushTopic/types.ts b/src/services/readPushTopic/types.ts
@@ -1,5 +1,3 @@
-//export interface IReqBody {}
-export interface IResBody {}
 export interface IResLocals {
   topicName: string;
 }
diff --git a/src/services/readResource/apiHandler.ts b/src/services/readResource/apiHandler.ts
@@ -1,5 +1,4 @@
 import { NextFunction, Request, Response } from 'express';
-import { AppError, errDef } from '../../utils/errors';
 import provider from './provider';
 
 const handler = async (req: Request, res: Response, next: NextFunction) => {
diff --git a/src/services/readResource/types.ts b/src/services/readResource/types.ts
@@ -1,5 +1,3 @@
-//export interface IReqBody {}
-export interface IResBody {}
 export interface IResLocals {
   userId: number;
 }
diff --git a/src/services/sendNoti/types.ts b/src/services/sendNoti/types.ts
@@ -2,4 +2,3 @@ export interface IReqBody {
   topic: any;
   payload: any;
 }
-export interface IResBody {}
diff --git a/src/utils/access.ts b/src/utils/access.ts
@@ -21,7 +21,7 @@ export const isValidPermit = (permit: any) => {
 export const convertToString = (row: AccessControlRow) => {
   if (!row.readable && !row.writable) return;
 
-  let access: string[] = [];
+  const access: string[] = [];
   if (row.readable) access.push(`${row.name}:read`);
   if (row.writable) access.push(`${row.name}:write`);
   return access.join(' ');
@@ -39,7 +39,7 @@ export const requestAccess = (rows: AccessControlRow[] = []) => {
     throw new Error('duplicated resource name detected in access request'); // names should be unique
   });
 
-  let access: string[] = [];
+  const access: string[] = [];
   rows.forEach((req) => {
     if (req.readable) access.push(`${req.name}:read`);
     if (req.writable) access.push(`${req.name}:write`);
diff --git a/src/utils/db.ts b/src/utils/db.ts
@@ -9,11 +9,11 @@ export const pool = new Pool({
   connectionTimeoutMillis: parseInt(DB_CONN_TIMEOUT),
 });
 
-pool.on('connect', (client) => {
+pool.on('connect', (_client) => {
   logger.info(`[DB Info] total connection count: ${pool.totalCount}`);
 });
 
-pool.on('error', (err, client) => {
+pool.on('error', (err, _client) => {
   logger.error(`[DB Error] ${err.message}`);
 });
 
diff --git a/src/utils/email.ts b/src/utils/email.ts
@@ -1,5 +1,6 @@
 const emailRegExp =
-  /(?!.*\.{2})^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i;
+  // eslint-disable-next-line no-control-regex
+  /(?!.*\.{2})^([a-z\d!#$%&'*+\-/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i;
 
 export const isEmailValid = (email: string | undefined) => {
   if (!email || email.length > 50) return false;
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -15,7 +15,7 @@ export const logger = pino({
 
 export const pinoExpOpt: Options = {
   logger,
-  customReceivedMessage: (req, res) => `${req.method} ${req.url}`,
+  customReceivedMessage: (req, _res) => `${req.method} ${req.url}`,
   customSuccessMessage: (req, res, resTime) =>
     `Responded with status [${res.statusCode}] in ${resTime}s`,
 };
diff --git a/src/utils/webpush.ts b/src/utils/webpush.ts
@@ -1,4 +1,4 @@
-import webpush, { PushSubscription, RequestOptions, WebPushError } from 'web-push';
+import webpush, { PushSubscription, RequestOptions } from 'web-push';
 import db from './db';
 import { logger } from './logger';
 
@@ -19,7 +19,7 @@ const SQL_DELETE = `DELETE FROM subscription WHERE id IN ($1::INT[])`;
 export async function* getSubsByTopicFromDB(topic: string) {
   const result =
     topic === ALL ? await db.query(SQL_GET_ALL) : await db.query(SQL_GET_BY_TOPIC, [topic]);
-  for (let row of result.rows) yield row as SubscriptionRow;
+  for (const row of result.rows) yield row as SubscriptionRow;
 }
 
 export const sendNotiByTopic = async (
@@ -32,7 +32,7 @@ export const sendNotiByTopic = async (
   const errors = []; // This collects errors during sending process and rethrows at the end
 
   // Send noti
-  for await (let row of getSubsByTopicFromDB(topic)) {
+  for await (const row of getSubsByTopicFromDB(topic)) {
     const { id, sub } = row;
     try {
       const subObj: PushSubscription = JSON.parse(sub);
@@ -74,7 +74,7 @@ export const isValidSub = (subscription: any) => {
       subscription.keys.auth.length &&
       subscription.keys.p256dh.length;
     return n !== 0;
-  } catch (error) {
+  } catch (_error: any) {
     return false;
   }
 };
diff --git a/test/integration/apiAuthAdmin.test.ts b/test/integration/apiAuthAdmin.test.ts
@@ -2,7 +2,6 @@ import { Express } from 'express';
 import { Server } from 'http';
 import { QueryResult } from 'pg';
 import supertest from 'supertest';
-import { SQL_INSERT_PERMIT, SQL_INSERT_ROLE } from '../../src/services/createRole/provider';
 import hash from '../../src/utils/hash';
 import initTest from '../initTest';
 import {
@@ -130,12 +129,6 @@ describe('Test /admin/auth', () => {
     LEFT JOIN resource as T3 ON T1.resource_id=T3.id
     WHERE T2.name=$1::VARCHAR(50);`;
 
-    const permissions = [
-      { res_name: 'userpool', readable: true, writable: false },
-      { res_name: 'topic', readable: true, writable: false },
-      { res_name: 'subscription', readable: true, writable: false },
-    ];
-
     it('should read a role', async () => {
       const testRole = await createRandomRole(db);
       const accessToken = await getToken(app, testObj.admin);
@@ -275,7 +268,6 @@ describe('Test /admin/auth', () => {
         .send(data);
       expect(res.status).toBe(200);
       expect(res.body).toHaveProperty('role_id');
-      const roleId = res.body.role_id;
 
       const check = await db.query(sqlRoleByName, [testRole]);
       expect(check.rowCount).toBe(0);
diff --git a/test/integration/apiAuthUser.test.ts b/test/integration/apiAuthUser.test.ts
@@ -333,7 +333,7 @@ describe('Test /auth', () => {
       const accessToken = await getToken(app, testUser);
       const fstream = fs.createReadStream(getUploadFilePath.img());
 
-      const res = await supertest(app)
+      await supertest(app)
         .put(endPoint)
         .auth(accessToken, { type: 'bearer' })
         .set('Accept', 'application/json')
@@ -355,7 +355,7 @@ describe('Test /auth', () => {
     it('should return 204 when a user have never uploaded a profile picture', async () => {
       const accessToken = await getToken(app, testObj.user);
 
-      const res = await supertest(app)
+      await supertest(app)
         .get(endPoint)
         .auth(accessToken, { type: 'bearer' })
         .set('Accept', 'application/json')
diff --git a/test/integration/apiPush.test.ts b/test/integration/apiPush.test.ts
@@ -9,7 +9,7 @@ import { apiPrefix, getRandomPort, getTester, getToken, testObj } from '../testU
 
 const createRandomTopic = async (db: any) => {
   const name = hash.createUUID();
-  const result = await db.query(SQL_INSERT_TOPIC, [name]);
+  await db.query(SQL_INSERT_TOPIC, [name]);
   return name;
 };
 
diff --git a/test/testUtil.ts b/test/testUtil.ts
@@ -56,7 +56,7 @@ export const createRandomRole = async (db: any) => {
 
     for (let i = 0; i < testObj.permissions.length; i++) {
       const { res_name, readable, writable } = testObj.permissions[i];
-      const r = await client.query(SQL_INSERT_PERMIT, [roleId, res_name, readable, writable]);
+      await client.query(SQL_INSERT_PERMIT, [roleId, res_name, readable, writable]);
     }
   });
 
@@ -103,7 +103,6 @@ export const getTester = (app: Express, method: string, url: string) => {
       break;
     default:
       throw new Error('invalid method');
-      break;
   }
 
   return tester;
diff --git a/test/unit/middleware/allow.test.ts b/test/unit/middleware/allow.test.ts
@@ -44,7 +44,7 @@ describe('Test /src/middleware/allow', () => {
 
     it.each(controllers)(
       '$name should set the accessRegex in res.locals and call next',
-      async ({ name, controller }) => {
+      async ({ controller }) => {
         await controller(req, res, next);
 
         expect(getRow).toBeCalled();
diff --git a/test/unit/middleware/basicAuth.test.ts b/test/unit/middleware/basicAuth.test.ts
@@ -10,7 +10,7 @@ jest.mock('../../../src/utils/hash', () => ({
 
 import { NextFunction, Request, Response } from 'express';
 import { QueryResult } from 'pg';
-import auth, { decodeCredential } from '../../../src/middleware/basicAuth';
+import auth from '../../../src/middleware/basicAuth';
 import db from '../../../src/utils/db';
 import { isEmailValid } from '../../../src/utils/email';
 import { AppError, errDef } from '../../../src/utils/errors';
diff --git a/test/unit/services/createRole/provider.test.ts b/test/unit/services/createRole/provider.test.ts
@@ -6,7 +6,6 @@ jest.mock('../../../../src/utils/db', () => ({ transaction: jest.fn((f) => f(cli
 import provider from '../../../../src/services/createRole/provider';
 import { IPermission } from '../../../../src/utils/access';
 import db from '../../../../src/utils/db';
-import { UK_ERR_CODE } from '../../../../src/utils/errors';
 
 // Tests
 describe('Test /src/services/createRole/provider', () => {
diff --git a/test/unit/services/createToken/provider.test.ts b/test/unit/services/createToken/provider.test.ts
@@ -9,9 +9,8 @@ jest.mock('../../../../src/utils/jwt', () => ({ sign: jest.fn() }));
 jest.mock('../../../../src/utils/access', () => ({ convertToString: jest.fn() }));
 
 // Imports
-import { QueryResult } from 'pg';
 import provider from '../../../../src/services/createToken/provider';
-import { AccessControlRow, convertToString } from '../../../../src/utils/access';
+import { convertToString } from '../../../../src/utils/access';
 import db from '../../../../src/utils/db';
 import hash from '../../../../src/utils/hash';
 import jwt from '../../../../src/utils/jwt';
@@ -46,7 +45,6 @@ describe('Test /src/services/createToken/provider', () => {
       [{ user_id: userId, device }, email, 'refresh', '30d'],
     ];
     const expectedResult = { access_token: token, refresh_token: token };
-    const expectedClientQuery = jest.fn();
 
     mockedDbQuery.mockResolvedValue(queryResult);
     mockedConvertToString.mockImplementation((row) => `${row.name}:read`);
diff --git a/test/unit/services/sendNoti/handler.test.ts b/test/unit/services/sendNoti/handler.test.ts
@@ -11,7 +11,6 @@ import db from '../../../../src/utils/db';
 import { AppError, errDef } from '../../../../src/utils/errors';
 import { isValidTopic } from '../../../../src/utils/webpush';
 
-const mockedProvider = provider as jest.Mock;
 const mockedTopicValidator = isValidTopic as jest.Mock;
 const mockedQuery = db.query as jest.Mock;
 
diff --git a/test/unit/services/updateRole/provider.test.ts b/test/unit/services/updateRole/provider.test.ts
@@ -5,7 +5,6 @@ jest.mock('../../../../src/utils/db', () => ({ transaction: jest.fn((f) => f(cli
 // Imports
 import provider from '../../../../src/services/updateRole/provider';
 import { IPermission } from '../../../../src/utils/access';
-import db from '../../../../src/utils/db';
 import { UK_ERR_CODE } from '../../../../src/utils/errors';
 import { getDbErrorMock } from '../../../testUtil';
 
diff --git a/test/unit/services/updateUserRole/handler.test.ts b/test/unit/services/updateUserRole/handler.test.ts
@@ -5,7 +5,6 @@ jest.mock('../../../../src/services/updateUserRole/provider', () => jest.fn());
 import { NextFunction, Request, Response } from 'express';
 import handler from '../../../../src/services/updateUserRole/apiHandler';
 import provider from '../../../../src/services/updateUserRole/provider';
-import { AppError, errDef } from '../../../../src/utils/errors';
 
 const mockedProvider = provider as jest.Mock;
 
diff --git a/test/unit/utils/config.test.ts b/test/unit/utils/config.test.ts
diff --git a/test/unit/utils/jwt.test.ts b/test/unit/utils/jwt.test.ts
