Fix lint issues

backend/src/server/routes/v1/auth-router.ts

@@ -1,5 +1,6 @@
 import jwt from "jsonwebtoken";
 import { z } from "zod";
+
 import { getConfig } from "@app/lib/config/env";
 import { authRateLimit, writeLimit } from "@app/server/config/rateLimiter";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";

backend/src/services/auth-token/auth-token-service.ts

@@ -1,7 +1,7 @@
 import crypto from "node:crypto";
-import jwt from "jsonwebtoken";
 
 import bcrypt from "bcrypt";
+import jwt from "jsonwebtoken";
 import { Knex } from "knex";
 
 import { TAuthTokens, TAuthTokenSessions } from "@app/db/schemas";
@@ -101,40 +101,6 @@ export const tokenServiceFactory = ({ tokenDAL, userDAL, orgMembershipDAL }: TAu
     return token;
   };
 
-  const validateRefreshToken = async (refreshToken?: string) => {
-    const appCfg = getConfig();
-    if (!refreshToken)
-      throw new NotFoundError({
-        name: "AuthTokenNotFound",
-        message: "Failed to find refresh token"
-      });
-
-    const decodedToken = jwt.verify(refreshToken, appCfg.AUTH_SECRET) as AuthModeRefreshJwtTokenPayload;
-
-    if (decodedToken.authTokenType !== AuthTokenType.REFRESH_TOKEN)
-      throw new UnauthorizedError({
-        message: "The token provided is not a refresh token",
-        name: "InvalidToken"
-      });
-
-    const tokenVersion = await getUserTokenSessionById(decodedToken.tokenVersionId, decodedToken.userId);
-
-    if (!tokenVersion)
-      throw new UnauthorizedError({
-        message: "Valid token version not found",
-        name: "InvalidToken"
-      });
-
-    if (decodedToken.refreshVersion !== tokenVersion.refreshVersion) {
-      throw new UnauthorizedError({
-        message: "Token version mismatch",
-        name: "InvalidToken"
-      });
-    }
-
-    return { decodedToken, tokenVersion };
-  };
-
   const validateTokenForUser = async ({
     type,
     userId,
@@ -185,6 +151,40 @@ export const tokenServiceFactory = ({ tokenDAL, userDAL, orgMembershipDAL }: TAu
 
   const revokeAllMySessions = async (userId: string) => tokenDAL.deleteTokenSession({ userId });
 
+  const validateRefreshToken = async (refreshToken?: string) => {
+    const appCfg = getConfig();
+    if (!refreshToken)
+      throw new NotFoundError({
+        name: "AuthTokenNotFound",
+        message: "Failed to find refresh token"
+      });
+
+    const decodedToken = jwt.verify(refreshToken, appCfg.AUTH_SECRET) as AuthModeRefreshJwtTokenPayload;
+
+    if (decodedToken.authTokenType !== AuthTokenType.REFRESH_TOKEN)
+      throw new UnauthorizedError({
+        message: "The token provided is not a refresh token",
+        name: "InvalidToken"
+      });
+
+    const tokenVersion = await getUserTokenSessionById(decodedToken.tokenVersionId, decodedToken.userId);
+
+    if (!tokenVersion)
+      throw new UnauthorizedError({
+        message: "Valid token version not found",
+        name: "InvalidToken"
+      });
+
+    if (decodedToken.refreshVersion !== tokenVersion.refreshVersion) {
+      throw new UnauthorizedError({
+        message: "Token version mismatch",
+        name: "InvalidToken"
+      });
+    }
+
+    return { decodedToken, tokenVersion };
+  };
+
   // to parse jwt identity in inject identity plugin
   const fnValidateJwtIdentity = async (token: AuthModeJwtTokenPayload) => {
     const session = await tokenDAL.findOneTokenSession({
@@ -218,12 +218,12 @@ export const tokenServiceFactory = ({ tokenDAL, userDAL, orgMembershipDAL }: TAu
 
   return {
     createTokenForUser,
-    validateRefreshToken,
     validateTokenForUser,
     getUserTokenSession,
     clearTokenSessionById,
     getTokenSessionByUser,
     revokeAllMySessions,
+    validateRefreshToken,
     fnValidateJwtIdentity,
     getUserTokenSessionById
   };

backend/src/services/auth/auth-fns.ts

@@ -2,6 +2,7 @@ import jwt from "jsonwebtoken";
 
 import { getConfig } from "@app/lib/config/env";
 import { ForbiddenRequestError, UnauthorizedError } from "@app/lib/errors";
+
 import { AuthModeProviderJwtTokenPayload, AuthModeProviderSignUpTokenPayload, AuthTokenType } from "./auth-type";
 
 export const validateProviderAuthToken = (providerToken: string, username?: string) => {

backend/src/services/kms/kms-root-config-dal.ts

@@ -1,8 +1,9 @@
+import { Knex } from "knex";
+
 import { TDbClient } from "@app/db";
 import { TableName } from "@app/db/schemas";
 import { DatabaseError } from "@app/lib/errors";
 import { ormify } from "@app/lib/knex";
-import { Knex } from "knex";
 
 export type TKmsRootConfigDALFactory = ReturnType<typeof kmsRootConfigDALFactory>;
 

frontend/src/hooks/api/users/queries.tsx

@@ -3,6 +3,7 @@ import { AxiosError } from "axios";
 
 import { apiRequest } from "@app/config/request";
 import { SessionStorageKeys } from "@app/const";
+import { queryClient as qc } from "@app/hooks/api/reactQuery";
 
 import { APIKeyDataV2 } from "../apiKeys/types";
 import { MfaMethod } from "../auth/types";
@@ -24,7 +25,6 @@ import {
   User,
   UserEnc
 } from "./types";
-import { queryClient } from "@app/hooks/api/reactQuery";
 
 export const fetchUserDetails = async () => {
   const { data } = await apiRequest.get<{ user: User & UserEnc }>("/api/v1/user");
@@ -297,7 +297,7 @@ export const clearSession = (keepQueryClient?: boolean) => {
   sessionStorage.removeItem(SessionStorageKeys.CLI_TERMINAL_TOKEN);
 
   if (!keepQueryClient) {
-    queryClient.clear(); // Clear React Query cache
+    qc.clear(); // Clear React Query cache
   }
 };
 

frontend/src/pages/middlewares/authenticate.tsx

@@ -1,12 +1,11 @@
 import { createFileRoute, redirect } from "@tanstack/react-router";
+import { AxiosError } from "axios";
 
 import { createNotification } from "@app/components/notifications";
 import { ROUTE_PATHS } from "@app/const/routes";
 import { userKeys } from "@app/hooks/api";
 import { authKeys, fetchAuthToken } from "@app/hooks/api/auth/queries";
-import { fetchUserDetails } from "@app/hooks/api/users/queries";
+import { clearSession, fetchUserDetails, logoutUser } from "@app/hooks/api/users/queries";
-import { AxiosError } from "axios";
-import { clearSession, logoutUser } from "@app/hooks/api/users/queries";
 
 export const Route = createFileRoute("/_authenticate")({
   beforeLoad: async ({ context, location }) => {

frontend/src/pages/organization/NoOrgPage/route.tsx

@@ -1,7 +1,7 @@
-import { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute } from "@tanstack/react-router";
 
-import { NoOrgPage } from './NoOrgPage'
+import { NoOrgPage } from "./NoOrgPage";
 
-export const Route = createFileRoute('/_authenticate/organization/none')({
+export const Route = createFileRoute("/_authenticate/organization/none")({
-  component: NoOrgPage,
+  component: NoOrgPage
-})
+});

frontend/src/pages/organization/layout.tsx

@@ -1,9 +1,7 @@
-import { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute } from "@tanstack/react-router";
 
-import { OrganizationLayout } from '@app/layouts/OrganizationLayout'
+import { OrganizationLayout } from "@app/layouts/OrganizationLayout";
 
-export const Route = createFileRoute(
+export const Route = createFileRoute("/_authenticate/_inject-org-details/_org-layout")({
-  '/_authenticate/_inject-org-details/_org-layout',
+  component: OrganizationLayout
-)({
+});
-  component: OrganizationLayout,
-})