eslint

Author: quentintaranpino

src/lib/authorization.ts

@@ -1,4 +1,4 @@
-import { connect, dbSelect, dbUpdate } from "../lib/database.js";
+import { dbSelect, dbUpdate } from "../lib/database.js";
 import { logger } from "./logger.js";
 import { credentialTypes } from "../interfaces/admin.js";
 import { registeredTableFields } from "../interfaces/database.js";
@@ -23,23 +23,18 @@ const isPubkeyValid = async (req: Request, checkAdminPrivileges :boolean = false
 		return false;
 	}
 
-	let pubkey = req.body.pubkey || req.session.identifier;
-
+	const pubkey = req.body.pubkey || req.session.identifier;
 	logger.info("Checking if pubkey is allowed ->", pubkey)
 
-    const conn = await connect("IsAuthorizedPubkey");
-
 	let queryString : string = "SELECT hex FROM registered WHERE hex = ?";
 	if (checkAdminPrivileges) queryString = "SELECT hex FROM registered WHERE allowed = 1 and hex = ?";
     try{
 
-		let result = await dbSelect(queryString, "hex", [pubkey], registeredTableFields)
+		const result = await dbSelect(queryString, "hex", [pubkey], registeredTableFields)
 		if (result == "") {
 			return false;
 		}
-
 		if (req.session.identifier) return true;
-
 		return await verifyNIP07login(req);
 
 	}catch (error) {
@@ -56,7 +51,7 @@ const isPubkeyValid = async (req: Request, checkAdminPrivileges :boolean = false
  */
 const isUserPasswordValid = async (username:string, password:string): Promise<boolean> => {
 	try{
-		let userDBPassword = await dbSelect("SELECT password FROM registered WHERE username = ?", 
+		const userDBPassword = await dbSelect("SELECT password FROM registered WHERE username = ?", 
 								"password", 
 								[username], 
 								registeredTableFields)
@@ -81,9 +76,9 @@ const checkAuthkey = async (req: Request) : Promise<boolean> =>{
 		logger.warn("Unauthorized request, no authorization header");
 		return false
 	}
-	let hashedAuthkey = await hashString(req.headers.authorization, 'authkey');
+	const hashedAuthkey = await hashString(req.headers.authorization, 'authkey');
 	try{
-		let hex =  await dbSelect("SELECT hex FROM registered WHERE authkey = ? and allowed = ?", "hex", [hashedAuthkey,"1"], registeredTableFields)
+		const hex =  await dbSelect("SELECT hex FROM registered WHERE authkey = ? and allowed = ?", "hex", [hashedAuthkey,"1"], registeredTableFields)
 		if (hex == ""){
 			logger.warn("Unauthorized request, authkey not found")
 			return false;}
@@ -118,7 +113,7 @@ const generateCredentials = async (type: credentialTypes, returnHashed: boolean
     try {
 
 		const credential = crypto.randomBytes(20).toString('hex');
-		let hashedCredential = await hashString(credential, type);
+		const hashedCredential = await hashString(credential, type);
 		const update = await dbUpdate("registered", type, hashedCredential, "hex", pubkey);
 		if (update){
 			logger.debug("New credential generated and saved to database");

src/lib/hash.ts

@@ -101,7 +101,7 @@ const validateHash = async (input:string, hash:string): Promise<boolean> => {
   hash = hash.replace(/^\$2y(.+)$/i, '$2a$1'); // PHP old hashes compatibility
 
     try{
-      let result = await bcrypt.compare(input, hash);
+      const result = await bcrypt.compare(input, hash);
       logger.debug("Hash validation result", result);
       return result;
     }catch (error) {

src/lib/redis.ts

@@ -7,7 +7,7 @@ import { LightningUsernameResult } from "../interfaces/lightning.js";
 //Redis configuration
 const redisClient = createClient();
 (async (): Promise<void> => {
-	redisClient.on("error", (error: any) =>{
+	redisClient.on("error", (error: Error) =>{
 		logger.error(`There is a problem connecting to redis server, is redis-server package installed on your system? : ${error}`);
 		process.exit(1);
 });

src/lib/server.ts

@@ -1,33 +1,30 @@
-
-//General server functions
-
-import config from "config";
 import { logger } from "./logger.js";
-import fs from "fs";
 import path from 'path';
 import url from 'url';
 import markdownit from 'markdown-it';
 import { Application } from "express";
+import { Request } from "express";
 
-const getClientIp = (req: any) =>{
+const getClientIp = (req: Request) =>{
 
     let ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
-    if (ip.substr(0, 7) == "::ffff:") {
-        ip = ip.substr(7)
+    if (typeof ip === 'string' && ip.startsWith("::ffff:")) {
+        ip = ip.substring(7);
     }
     return ip;
 };
 
-function format(seconds:number):string{
+const format = (seconds:number):string =>{
 	function pad(s: number){
-	  return (s < 10 ? '0' : '') + s;
+		return (s < 10 ? '0' : '') + s;
 	}
-	var hours = Math.floor(seconds / (60*60));
-	var minutes = Math.floor(seconds % (60*60) / 60);
-	var seconds = Math.floor(seconds % 60);
+	const hours = Math.floor(seconds / (60*60));
+	const minutes = Math.floor(seconds % (60*60) / 60);
+	const secs = Math.floor(seconds % 60);
 
-	return pad(hours) + ':' + pad(minutes) + ':' + pad(seconds);
-  }
+	return pad(hours) + ':' + pad(minutes) + ':' + pad(secs);
+}
+
 const currDir = (fileUrl:string) : string =>{
     const __filename = url.fileURLToPath(fileUrl);
     return path.dirname(__filename);

src/lib/session.ts

@@ -9,9 +9,9 @@ import { rateLimit } from 'express-rate-limit'
 
 declare module 'express-session' {
 	interface Session {
-	   identifier: string;
+       identifier: string;
        authkey: string;
-	 }
+    }
 }
 
 const initSession = async (app:Application): Promise<void> => {