chore: Minor fixes

Author: tjtanjin

src/api/controllers/authController.ts

@@ -14,7 +14,7 @@ import Logger from '../logger';
  *
  * @returns redirects user to login process page on frontend on success, error page otherwise
  */
-const handleCallback = async (req: Request, res: Response) => {
+const handleCallback = (req: Request, res: Response) => {
   // State validation must happen before anything else.
   const receivedState = req.query.state as string;
   const sessionState = req.session.oAuthState;
@@ -116,29 +116,35 @@ const handleLoginProcess = async (req: Request, res: Response) => {
     return sendErrorResponse(res, 401, 'Login failed, please try again.');
   }
 
-  req.session.regenerate(async (err) => {
+  req.session.regenerate((err: Error | null) => {
     if (err) {
       Logger.error('Error regenerating session:', err);
-      // Potentially send an error response here, though the user is technically logged in.
-      // For now, we'll log the error and proceed with the success response
-      // as the main login functionality was successful.
+      return sendErrorResponse(res, 401, 'Session creation failed, please try again.');
     }
-    // Store session data again after regeneration as regenerate creates a new session
-    req.session.provider = provider;
-    req.session.userId = userData.id;
-
-    try {
-      const tokenSaved = await saveUserTokens(req.sessionID, userData.id, tokenResponse);
-      if (!tokenSaved) {
-        Logger.error('Failed to save tokens for session', req.sessionID);
+
+    const handleSession = async () => {
+      // store session data again after regeneration as regenerate creates a new session
+      req.session.provider = provider;
+      req.session.userId = userData.id;
+
+      try {
+        const tokenSaved = await saveUserTokens(req.sessionID, userData.id, tokenResponse);
+        if (!tokenSaved) {
+          Logger.error('Failed to save tokens for session', req.sessionID);
+          return sendErrorResponse(res, 500, 'Login partially succeeded, but token storage failed.');
+        }
+      } catch (e) {
+        Logger.error('saveUserTokens threw:', e);
         return sendErrorResponse(res, 500, 'Login partially succeeded, but token storage failed.');
       }
-    } catch (e) {
-      Logger.error('saveUserTokens threw:', e);
-      return sendErrorResponse(res, 500, 'Login partially succeeded, but token storage failed.');
-    }
 
-    return sendSuccessResponse(res, 200, userData, 'Login successful.');
+      sendSuccessResponse(res, 200, userData, 'Login successful.');
+    };
+
+    handleSession().catch((e) => {
+      Logger.error('Unexpected error in session handling:', e);
+      sendErrorResponse(res, 500, 'An unexpected error occurred.');
+    });
   });
 };
 
@@ -150,10 +156,10 @@ const handleLoginProcess = async (req: Request, res: Response) => {
  *
  * @returns user data on success, 401 unauthorized otherwise
  */
-const handleLogout = async (req: Request, res: Response) => {
+const handleLogout = (req: Request, res: Response) => {
   res.clearCookie('connect.sid');
 
-  req.session.destroy((err) => {
+  req.session.destroy((err: Error | null) => {
     if (err) {
       return sendErrorResponse(res, 500, err.message);
     }

src/api/controllers/pluginController.ts

@@ -96,7 +96,7 @@ const getPlugins = async (req: Request, res: Response) => {
     let userFavorites = await getUserFavoritePluginsFromCache(userId);
     if (userFavorites === null) {
       userFavorites = await getUserFavoritePluginsFromDb(userId);
-      saveUserFavoritePluginsToCache(userId, userFavorites);
+      void saveUserFavoritePluginsToCache(userId, userFavorites);
     }
     const userFavoriteIds = new Set(userFavorites.map((item) => item.id));
 

src/api/controllers/themeController.ts

@@ -46,8 +46,8 @@ const getThemesNoAuth = async (req: Request, res: Response) => {
       themes = await getThemeDataFromCache(searchResult);
     } else {
       themes = await getThemeDataFromDb(searchQuery, pageNum, pageSize, sortBy, sortDirection);
-      saveThemeSearchToCache(searchQuery, pageNum, pageSize, sortBy, sortDirection, themes);
-      saveThemeDataToCache(themes);
+      void saveThemeSearchToCache(searchQuery, pageNum, pageSize, sortBy, sortDirection, themes);
+      void saveThemeDataToCache(themes);
     }
 
     sendSuccessResponse(res, 200, themes, 'Themes fetched successfully.');
@@ -88,15 +88,15 @@ const getThemes = async (req: Request, res: Response) => {
       themes = await getThemeDataFromCache(searchResult);
     } else {
       themes = await getThemeDataFromDb(searchQuery, pageNum, pageSize, sortBy, sortDirection);
-      saveThemeSearchToCache(searchQuery, pageNum, pageSize, sortBy, sortDirection, themes);
-      saveThemeDataToCache(themes);
+      void saveThemeSearchToCache(searchQuery, pageNum, pageSize, sortBy, sortDirection, themes);
+      void saveThemeDataToCache(themes);
     }
 
     // check if cache contains user favorites and return if so ; otherwise fetch from db
     let userFavorites = await getUserFavoriteThemesFromCache(userId);
     if (userFavorites === null) {
       userFavorites = await getUserFavoriteThemesFromDb(userId);
-      saveUserFavoriteThemesToCache(userId, userFavorites);
+      void saveUserFavoriteThemesToCache(userId, userFavorites);
     }
     const userFavoriteIds = new Set(userFavorites.map((item) => item.id));
 
@@ -140,7 +140,7 @@ const getThemeById = async (req: Request, res: Response) => {
       let userFavorites = await getUserFavoriteThemesFromCache(userId);
       if (userFavorites === null) {
         userFavorites = await getUserFavoriteThemesFromDb(userId);
-        saveUserFavoriteThemesToCache(userId, userFavorites);
+        void saveUserFavoriteThemesToCache(userId, userFavorites);
       }
       const userFavoriteIds = new Set(userFavorites.map((item) => item.id));
       themeData.isFavorite = userFavoriteIds.has(themeId);
@@ -168,7 +168,7 @@ const getThemeVersions = async (req: Request, res: Response) => {
     let versions = await getThemeVersionsFromCache(themeId);
     if (versions === null) {
       versions = await getThemeVersionsFromDb(themeId);
-      saveThemeVersionsToCache(themeId, versions);
+      void saveThemeVersionsToCache(themeId, versions);
     }
 
     sendSuccessResponse(res, 200, versions, 'Theme versions fetched successfully.');

src/api/controllers/userController.ts

@@ -24,6 +24,7 @@ import {
 import { sendErrorResponse, sendSuccessResponse } from '../utils/responseUtils';
 import { User } from '../databases/sql/models';
 import Logger from '../logger';
+import { UserData } from '../interfaces/UserData';
 
 /**
  * Retrieves the user profile information (i.e. user data).
@@ -33,8 +34,8 @@ import Logger from '../logger';
  *
  * @returns user data if successful, 403 otherwise
  */
-const getUserProfile = async (req: Request, res: Response) => {
-  const userData = req.userData;
+const getUserProfile = (req: Request, res: Response) => {
+  const userData = req.userData as UserData;
   const queryUserId = (req.query.userId as string) ?? userData.id;
   const sessionUserId = req.session.userId;
 
@@ -60,7 +61,7 @@ const getUserProfile = async (req: Request, res: Response) => {
  * @returns list of user's themes if successful, 403 otherwise
  */
 const getUserOwnedThemes = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const queryUserId = (req.query.userId as string) ?? userData.id;
   const sessionUserId = req.session.userId;
 
@@ -77,7 +78,7 @@ const getUserOwnedThemes = async (req: Request, res: Response) => {
 
     if (userOwnedThemes === null) {
       userOwnedThemes = await getUserOwnedThemesFromDb(queryUserId);
-      saveUserOwnedThemesToCache(userData.id, userOwnedThemes);
+      void saveUserOwnedThemesToCache(userData.id, userOwnedThemes);
     }
 
     return sendSuccessResponse(res, 200, userOwnedThemes, 'User owned themes fetched successfully.');
@@ -96,7 +97,7 @@ const getUserOwnedThemes = async (req: Request, res: Response) => {
  * @returns list of user's favorited themes if successful, 403 otherwise
  */
 const getUserFavoriteThemes = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const queryUserId = (req.query.userId as string) ?? userData.id;
   const sessionUserId = req.session.userId;
 
@@ -112,7 +113,7 @@ const getUserFavoriteThemes = async (req: Request, res: Response) => {
     let userFavorites = await getUserFavoriteThemesFromCache(queryUserId);
     if (userFavorites === null) {
       userFavorites = await getUserFavoriteThemesFromDb(queryUserId);
-      saveUserFavoriteThemesToCache(queryUserId, userFavorites);
+      void saveUserFavoriteThemesToCache(queryUserId, userFavorites);
     }
 
     return sendSuccessResponse(res, 200, userFavorites, 'User favorite themes fetched successfully.');
@@ -131,7 +132,7 @@ const getUserFavoriteThemes = async (req: Request, res: Response) => {
  * @returns 201 if successful, 404 if theme not found, 400 if already favorited, 500 otherwise
  */
 const addUserFavoriteTheme = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const { themeId } = req.body;
 
   try {
@@ -152,7 +153,7 @@ const addUserFavoriteTheme = async (req: Request, res: Response) => {
  * @returns 200 if successful, 404 if theme not found, 500 otherwise
  */
 const removeUserFavoriteTheme = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const themeId = req.query.themeId as string;
 
   try {
@@ -173,7 +174,7 @@ const removeUserFavoriteTheme = async (req: Request, res: Response) => {
  * @returns list of user's plugins if successful, 403 otherwise
  */
 const getUserOwnedPlugins = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const queryUserId = (req.query.userId as string) ?? userData.id;
   const sessionUserId = req.session.userId;
 
@@ -189,7 +190,7 @@ const getUserOwnedPlugins = async (req: Request, res: Response) => {
     let userOwnedPlugins = await getUserOwnedPluginsFromCache(queryUserId);
     if (userOwnedPlugins === null) {
       userOwnedPlugins = await getUserOwnedPluginsFromDb(queryUserId);
-      saveUserOwnedPluginsToCache(userData.id, userOwnedPlugins);
+      void saveUserOwnedPluginsToCache(userData.id, userOwnedPlugins);
     }
 
     return sendSuccessResponse(res, 200, userOwnedPlugins, 'User owned plugins fetched successfully.');
@@ -208,7 +209,7 @@ const getUserOwnedPlugins = async (req: Request, res: Response) => {
  * @returns list of user's favorited plugins if successful, 403 otherwise
  */
 const getUserFavoritePlugins = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const queryUserId = (req.query.userId as string) ?? userData.id;
   const sessionUserId = req.session.userId;
 
@@ -224,7 +225,7 @@ const getUserFavoritePlugins = async (req: Request, res: Response) => {
     let userFavorites = await getUserFavoritePluginsFromCache(queryUserId);
     if (userFavorites === null) {
       userFavorites = await getUserFavoritePluginsFromDb(queryUserId);
-      saveUserFavoritePluginsToCache(queryUserId, userFavorites);
+      void saveUserFavoritePluginsToCache(queryUserId, userFavorites);
     }
 
     return sendSuccessResponse(res, 200, userFavorites, 'User favorite plugins fetched successfully.');
@@ -243,7 +244,7 @@ const getUserFavoritePlugins = async (req: Request, res: Response) => {
  * @returns 201 if successful, 404 if theme not found, 400 if already favorited, 500 otherwise
  */
 const addUserFavoritePlugin = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const { pluginId } = req.body;
 
   try {
@@ -264,7 +265,7 @@ const addUserFavoritePlugin = async (req: Request, res: Response) => {
  * @returns 200 if successful, 404 if theme not found, 500 otherwise
  */
 const removeUserFavoritePlugin = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const pluginId = req.query.pluginId as string;
 
   try {
@@ -285,7 +286,7 @@ const removeUserFavoritePlugin = async (req: Request, res: Response) => {
  * @returns 200 if successful, 400 if invalid request body and, 500 otherwise
  */
 const setUserAcceptAuthorAgreement = async (req: Request, res: Response) => {
-  const userData = req.userData;
+  const userData = req.userData as UserData;
   const userId = userData.id;
   const accept = req.body.accept;
 

src/api/services/authentication/providers/github.ts

@@ -35,9 +35,9 @@ const getUserTokensWithCode = async (key: string) => {
     // buffer 15 minutes from token expiry times, hence -900
     // multiply expiry time by 1000 since it is given in seconds
     const tokenResponse: TokenResponse = {
-      accessToken: response.data.access_token,
+      accessToken: response.data.access_token as string,
       accessTokenExpiry: Date.now() + response.data.expires_in * 1000 - 900,
-      refreshToken: response.data.refresh_token,
+      refreshToken: response.data.refresh_token as string,
       refreshTokenExpiry: Date.now() + response.data.refresh_token_expires_in * 1000 - 900,
     };
     return tokenResponse;

src/jobs/syncThemesFromGitHub.ts

@@ -58,7 +58,7 @@ const runSyncThemesFromGitHub = async () => {
     const databaseThemes = await Theme.findAll({
       attributes: ['id'],
     });
-    const databaseThemeIds = databaseThemes.map((theme) => theme.dataValues.id);
+    const databaseThemeIds: string[] = databaseThemes.map((theme) => theme.dataValues.id);
 
     // fetch all themes from github
     const gitHubThemes = await fetchFolders();
@@ -67,10 +67,10 @@ const runSyncThemesFromGitHub = async () => {
     const themeJobs = await ThemeJobQueue.findAll({
       attributes: ['id'],
     });
-    const themeJobIds = themeJobs.map((job) => job.dataValues.id);
+    const themeJobIds: string[] = themeJobs.map((job) => job.dataValues.id);
 
     // delete themes no longer found on github, but exclude those in theme job
-    const themesToDelete = databaseThemeIds.filter((id) => !gitHubThemes.includes(id) && !themeJobIds.includes(id));
+    const themesToDelete: string[] = databaseThemeIds.filter((id) => !gitHubThemes.includes(id) && !themeJobIds.includes(id));
     if (themesToDelete.length > 0) {
       await Theme.destroy({
         where: {
@@ -110,12 +110,12 @@ const runSyncThemesFromGitHub = async () => {
         } else {
           throw new Error(`Missing meta.json data for theme: ${themeId}`);
         }
-      } catch (error) {
+      } catch (error: unknown) {
         await transaction.rollback();
         Logger.error(`Failed to create theme ${themeId}: ${error}`);
       }
     }
-  } catch (error) {
+  } catch (error: unknown) {
     Logger.error('Error fetching themes:', error);
     // todo: send an alert on failure since this is critical?
   }