From 23bf3fa8f107640cc44ff20c049bd6a8cd07d4a1 Mon Sep 17 00:00:00 2001 From: Chege Date: Sat, 15 Jun 2024 16:57:52 -0700 Subject: [PATCH] [Lint] Remove inconsequential violations of no-unused-vars (#175) Leaving behind instances that are due to unresolved questions. Fixes 58 ES lint errors. 38 to go till #162 is complete :-) [1]: https://github.com/dchege711/study_buddy/issues/162 --- src/controllers/AuthenticationController.ts | 2 +- src/controllers/ControllerUtilities.ts | 6 ------ src/controllers/InAppController.ts | 3 --- src/models/DailyTasks.ts | 2 -- src/models/EmailClient.ts | 3 +-- src/models/LogInUtilities.ts | 10 ++-------- .../components/public-private-toggle.ts | 2 +- .../src/components/search-bar/search-bar.ts | 4 ++-- src/public/src/pages/common/cards-viewing-page.ts | 13 ++++--------- src/routes/InAppRoutes.ts | 15 --------------- src/server.ts | 9 ++++----- src/tests/DummyAccountUtils.ts | 6 +++--- .../mocha_tests/functionality_tests/TestLogIn.ts | 8 ++++---- .../mocha_tests/unit_tests/TestCardsMongoDB.ts | 4 ++-- 14 files changed, 24 insertions(+), 63 deletions(-) diff --git a/src/controllers/AuthenticationController.ts b/src/controllers/AuthenticationController.ts index 04fb71a1..7c90550b 100644 --- a/src/controllers/AuthenticationController.ts +++ b/src/controllers/AuthenticationController.ts @@ -129,7 +129,7 @@ export function registerUser(req: Request, res: Response) { }); } -export function loginUser(req: Request, res: Response, next: NextFunction) { +export function loginUser(req: Request, res: Response) { LogInUtilities .authenticateUser(req.body) .then((user) => { diff --git a/src/controllers/ControllerUtilities.ts b/src/controllers/ControllerUtilities.ts index 4e5f0dc6..c1bab7d8 100644 --- a/src/controllers/ControllerUtilities.ts +++ b/src/controllers/ControllerUtilities.ts @@ -10,12 +10,6 @@ import { AuthenticateUser } from "../models/LogInUtilities"; import { ICard } from "../models/mongoose_models/CardSchema"; import * as allPaths from "../paths"; -const generic_500_msg = { - success: false, - status: 500, - message: "Internal Server Error", -}; - interface TemplateVariables { APP_NAME: string; BASE_URL: string; diff --git a/src/controllers/InAppController.ts b/src/controllers/InAppController.ts index 13a492fa..954029b4 100644 --- a/src/controllers/InAppController.ts +++ b/src/controllers/InAppController.ts @@ -1,10 +1,7 @@ "use strict"; import { Request, Response } from "express"; -import { StatusCodes } from "http-status-codes"; -import * as config from "../config"; -import * as CardsDB from "../models/CardsMongoDB"; import * as loginUtilities from "../models/LogInUtilities"; import * as MetadataDB from "../models/MetadataMongoDB"; import { MiniICard } from "../models/mongoose_models/CardSchema"; diff --git a/src/models/DailyTasks.ts b/src/models/DailyTasks.ts index c2d3f8f4..e6c99847 100644 --- a/src/models/DailyTasks.ts +++ b/src/models/DailyTasks.ts @@ -6,8 +6,6 @@ * @module */ -import * as mongoDB from "mongodb"; - import { IStreak, Metadata } from "./mongoose_models/MetadataCardSchema"; import { closeMongooseConnection } from "./MongooseClient"; diff --git a/src/models/EmailClient.ts b/src/models/EmailClient.ts index 05447f25..0affc6da 100644 --- a/src/models/EmailClient.ts +++ b/src/models/EmailClient.ts @@ -11,7 +11,6 @@ import { createTransport } from "nodemailer"; import Mail = require("nodemailer/lib/mailer"); -import SMTPPool = require("nodemailer/lib/smtp-pool"); import { APP_NAME, @@ -41,7 +40,7 @@ const transporter = createTransport({ */ export function sendEmail(mailOptions: Mail.Options): Promise { mailOptions.from = `${APP_NAME} <${EMAIL_ADDRESS}>`; - return transporter.sendMail(mailOptions).then((_) => {}); + return transporter.sendMail(mailOptions).then(() => {}); } /** diff --git a/src/models/LogInUtilities.ts b/src/models/LogInUtilities.ts index 06ee1df2..4eeeecfb 100644 --- a/src/models/LogInUtilities.ts +++ b/src/models/LogInUtilities.ts @@ -12,7 +12,6 @@ import * as stanfordCrypto from "sjcl"; import * as config from "../config"; import { APP_NAME } from "../config"; import { UserRecoverableError } from "../errors"; -import { BaseResponse } from "../types"; import { createMany } from "./CardsMongoDB"; import * as Email from "./EmailClient"; import { Card } from "./mongoose_models/CardSchema"; @@ -29,7 +28,7 @@ const UPPER_CASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; * @description Clean up resources before exiting the script. */ export function close() { - return new Promise(function(resolve, reject) { + return new Promise(function(resolve) { Email.close(); resolve(null); }); @@ -205,7 +204,7 @@ export async function sendAccountValidationLink( return `${payload.email} has already validated their account.`; } - const { userIDInApp, validationURI } = await getIdInAppAndValidationURI(); + const { validationURI } = await getIdInAppAndValidationURI(); user.account_validation_uri = validationURI; await user.save(); @@ -513,11 +512,6 @@ export async function sendResetLink( return `We've sent a reset link to ${userIdentifier.email} that is valid for 2 hours.`; } -type PasswordResetLinkResponse = BaseResponse & { - message: string; - redirect_url?: string; -}; - /** * Resolves the promise if `resetPasswordURI` is valid and hasn't expired. */ diff --git a/src/public/src/components/card-viewer/components/public-private-toggle.ts b/src/public/src/components/card-viewer/components/public-private-toggle.ts index 63ef9615..816dfae1 100644 --- a/src/public/src/components/card-viewer/components/public-private-toggle.ts +++ b/src/public/src/components/card-viewer/components/public-private-toggle.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property, query } from "lit/decorators.js"; +import { customElement, property } from "lit/decorators.js"; import { CardChangedEvent } from "./card-changed-event.js"; @customElement("cg-card-privacy-toggle") diff --git a/src/public/src/components/search-bar/search-bar.ts b/src/public/src/components/search-bar/search-bar.ts index 063ec1a1..c1c6fcd7 100644 --- a/src/public/src/components/search-bar/search-bar.ts +++ b/src/public/src/components/search-bar/search-bar.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, nothing } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { createRef, Ref, ref } from "lit/directives/ref.js"; +import { customElement, state } from "lit/decorators.js"; +import { createRef, Ref } from "lit/directives/ref.js"; import { SearchResultsChangedEvent } from "../../context/search-results-context.js"; import { diff --git a/src/public/src/pages/common/cards-viewing-page.ts b/src/public/src/pages/common/cards-viewing-page.ts index a5553e28..c07504f1 100644 --- a/src/public/src/pages/common/cards-viewing-page.ts +++ b/src/public/src/pages/common/cards-viewing-page.ts @@ -1,6 +1,6 @@ import { provide } from "@lit/context"; -import { css, html, LitElement } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { css, LitElement } from "lit"; +import { state } from "lit/decorators.js"; import { cardsCarouselContext, @@ -10,17 +10,12 @@ import { import { kSearchResultsChangedEventName, kSearchResultSelectedEventName, - SearchResultsChangedEvent, searchResultsContext, - SearchResultSelectedEvent, } from "../../context/search-results-context.js"; import { tagsAutoCompleteContext } from "../../context/tags-auto-complete-context.js"; import { AutoComplete } from "../../models/auto-complete.js"; -import { - CardsCarousel, - CardsCarouselBSTKey, -} from "../../models/cards-carousel.js"; -import { Card, CardFetchEndpoint, CardSearchResult, trpc } from "../../trpc.js"; +import { CardsCarousel } from "../../models/cards-carousel.js"; +import { Card, CardFetchEndpoint, CardSearchResult } from "../../trpc.js"; import "../../components/search-bar/search-bar.js"; import "../../components/search-results/search-results.js"; diff --git a/src/routes/InAppRoutes.ts b/src/routes/InAppRoutes.ts index b7f03d39..85d4059f 100644 --- a/src/routes/InAppRoutes.ts +++ b/src/routes/InAppRoutes.ts @@ -13,25 +13,10 @@ import { } from "../controllers/InAppController"; import { ACCOUNT, - ADD_CARD, BROWSE, DELETE_ACCOUNT, - DELETE_CARD, DOWNLOAD_USER_DATA, - DUPLICATE_CARD, - FLAG_CARD, HOME, - READ_CARD, - READ_METADATA, - READ_PUBLIC_CARD, - READ_PUBLIC_METADATA, - READ_TAG_GROUPS, - RESTORE_CARD_FROM_TRASH, - SEARCH_CARDS, - TRASH_CARD, - UPDATE_CARD, - UPDATE_STREAK, - UPDATE_USER_SETTINGS, WIKI, } from "../paths"; diff --git a/src/server.ts b/src/server.ts index e5d7c8da..82dcd171 100644 --- a/src/server.ts +++ b/src/server.ts @@ -7,15 +7,14 @@ */ import * as trpcExpress from "@trpc/server/adapters/express"; -import { NextFunction, Request, Response } from "express"; +import { Request, Response } from "express"; import { IS_DEV } from "./config"; import { createContext } from "./context"; import { getDefaultTemplateVars } from "./controllers/ControllerUtilities"; -import * as allPaths from "./paths"; import { inAppRouter } from "./routes/InAppRouter"; import { populateDummyAccountWithCards } from "./tests/DummyAccountUtils"; -import { mergeRouters, publicProcedure, router } from "./trpc"; +import { mergeRouters } from "./trpc"; const express = require("express"); const session = require("express-session"); @@ -107,7 +106,7 @@ if (config.IS_TS_NODE) { app.use(express.static(newStaticsPath)); } -app.use(function(err: any, req: Request, res: Response, next: NextFunction) { +app.use(function(err: any, req: Request, res: Response) { console.error(err.stack); res.status(500).render( "pages/5xx_error_page.ejs", @@ -119,7 +118,7 @@ app.use(function(err: any, req: Request, res: Response, next: NextFunction) { }); // Handling 404: https://expressjs.com/en/starter/faq.html -app.use(function(req: Request, res: Response, next: NextFunction) { +app.use(function(req: Request, res: Response) { res.status(404).render( "pages/4xx_error_page.ejs", { diff --git a/src/tests/DummyAccountUtils.ts b/src/tests/DummyAccountUtils.ts index cbaf88ff..66286766 100644 --- a/src/tests/DummyAccountUtils.ts +++ b/src/tests/DummyAccountUtils.ts @@ -21,13 +21,13 @@ export async function getDummyAccount(): Promise< return LogInUtilities .deleteAllAccounts([]) - .then((_) => { + .then(() => { return addPublicUser(); }) - .then((_) => { + .then(() => { return LogInUtilities.registerUserAndPassword(dummyAccountDetails); }) - .then((_) => { + .then(() => { return LogInUtilities.authenticateUser({ username_or_email: dummyAccountDetails.username, password: dummyAccountDetails.password, diff --git a/src/tests/mocha_tests/functionality_tests/TestLogIn.ts b/src/tests/mocha_tests/functionality_tests/TestLogIn.ts index 816af8d6..421ffb48 100644 --- a/src/tests/mocha_tests/functionality_tests/TestLogIn.ts +++ b/src/tests/mocha_tests/functionality_tests/TestLogIn.ts @@ -28,7 +28,7 @@ describe("Test LoginUtilities\n", function() { .then(function(signupResult) { done(new Error(signupResult)); }) - .catch(function(_: Error) { + .catch(function() { done(); }); }); @@ -43,7 +43,7 @@ describe("Test LoginUtilities\n", function() { .then(function(signupResult) { done(new Error(signupResult)); }) - .catch(function(_: Error) { + .catch(function() { done(); }); }); @@ -71,7 +71,7 @@ describe("Test LoginUtilities\n", function() { .then(function(signupResult) { done(new Error(signupResult)); }) - .catch(function(_: Error) { + .catch(function() { done(); }); }, @@ -89,7 +89,7 @@ describe("Test LoginUtilities\n", function() { .then(function(signupResult) { done(new Error(signupResult)); }) - .catch(function(_: Error) { + .catch(function() { done(); }); }, diff --git a/src/tests/mocha_tests/unit_tests/TestCardsMongoDB.ts b/src/tests/mocha_tests/unit_tests/TestCardsMongoDB.ts index 440dd013..8f734a6b 100644 --- a/src/tests/mocha_tests/unit_tests/TestCardsMongoDB.ts +++ b/src/tests/mocha_tests/unit_tests/TestCardsMongoDB.ts @@ -19,7 +19,7 @@ describe("Test CardsMongoDB\n", function() { beforeEach(function(done) { LogInUtilities .deleteAllAccounts([config.PUBLIC_USER_USERNAME]) - .then(function(_) { + .then(function() { return getDummyAccount(); }) .then(function(accountInfo) { @@ -83,7 +83,7 @@ describe("Test CardsMongoDB\n", function() { .then(function(updatedCard) { done(updatedCard); }) - .catch(function(_) { + .catch(function() { done(); }); });