force rebase origin/master

frontend/src/AuthContext.jsx

@@ -1,31 +1,20 @@
-import React, { useState, createContext, useEffect } from "react";
+import React, { useState, createContext } from "react";
 import {
   AUTH_TIMESTAMP,
   AUTH_TOKEN,
   AUTH_USER,
   USER_PROMPT_INPUT_MAP,
 } from "@/utils/constants";
-import System from "./models/system";
-import { useNavigate } from "react-router-dom";
-import { safeJsonParse } from "@/utils/request";
 
 export const AuthContext = createContext(null);
 export function AuthProvider(props) {
   const localUser = localStorage.getItem(AUTH_USER);
   const localAuthToken = localStorage.getItem(AUTH_TOKEN);
   const [store, setStore] = useState({
-    user: localUser ? safeJsonParse(localUser, null) : null,
+    user: localUser ? JSON.parse(localUser) : null,
     authToken: localAuthToken ? localAuthToken : null,
   });
 
-  const navigate = useNavigate();
-
-  /* NOTE:
-   * 1. There's no reason for these helper functions to be stateful. They could
-   * just be regular funcs or methods on a basic object.
-   * 2. These actions are not being invoked anywhere in the
-   * codebase, dead code.
-   */
   const [actions] = useState({
     updateUser: (user, authToken = "") => {
       localStorage.setItem(AUTH_USER, JSON.stringify(user));
@@ -41,29 +30,6 @@ export function AuthProvider(props) {
     },
   });
 
-  // On initial mount and whenever the token changes fetch a new user object
-  useEffect(() => {
-    if (store.authToken) {
-      System.refreshUser()
-        .then(({ user }) => {
-          localStorage.setItem(AUTH_USER, JSON.stringify(user));
-          setStore((prev) => ({
-            ...prev,
-            user,
-          }));
-        })
-        .catch(() => {
-          localStorage.removeItem(AUTH_USER);
-          localStorage.removeItem(AUTH_TOKEN);
-          localStorage.removeItem(AUTH_TIMESTAMP);
-          localStorage.removeItem(USER_PROMPT_INPUT_MAP);
-          setStore({ user: null, authToken: null });
-          navigate("/login");
-        });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [store.authToken]);
-
   return (
     <AuthContext.Provider value={{ store, actions }}>
       {props.children}

frontend/src/models/system.js

@@ -83,14 +83,6 @@ const System = {
         return { valid: false, message: e.message };
       });
   },
-  refreshUser: () => {
-    return fetch(`${API_BASE}/system/refresh-user`, { headers: baseHeaders() })
-      .then((res) => res.json())
-      .then((data) => data)
-      .catch((e) => {
-        console.log(e);
-      });
-  },
   recoverAccount: async function (username, recoveryCodes) {
     return await fetch(`${API_BASE}/system/recover-account`, {
       method: "POST",

server/endpoints/system.js

@@ -1,13 +1,6 @@
-const path = require("path");
-const fs = require("fs");
 process.env.NODE_ENV === "development"
   ? require("dotenv").config({ path: `.env.${process.env.NODE_ENV}` })
-  : require("dotenv").config({
-      path: process.env.STORAGE_DIR
-        ? path.resolve(process.env.STORAGE_DIR, ".env")
-        : path.resolve(__dirname, ".env"),
-    });
-
+  : require("dotenv").config();
 const { viewLocalFiles, normalizePath, isWithin } = require("../utils/files");
 const { purgeDocument, purgeFolder } = require("../utils/files/purgeDocument");
 const { getVectorDbClass } = require("../utils/helpers");
@@ -24,6 +17,8 @@ const { v4 } = require("uuid");
 const { SystemSettings } = require("../models/systemSettings");
 const { User } = require("../models/user");
 const { validatedRequest } = require("../utils/middleware/validatedRequest");
+const fs = require("fs");
+const path = require("path");
 const {
   getDefaultFilename,
   determineLogoFilepath,
@@ -119,35 +114,6 @@ function systemEndpoints(app) {
     }
   );
 
-  app.get("/system/refresh-user", [validatedRequest], async (req, res) => {
-    try {
-      if (multiUserMode(res)) {
-        const user = await userFromSession(req, res);
-        if (!user || user.suspended) {
-          res.sendStatus(403).end();
-          return;
-        }
-
-        res.status(200).json({
-          valid: true,
-          user: User.filterFields(user),
-          message: null,
-        });
-      } else {
-        res.status(500).json({
-          success: false,
-          message: "Multi-User Mode is not enabled.",
-        });
-      }
-    } catch (e) {
-      console.log(e);
-      res.status(400).json({
-        success: false,
-        message: "Failed to retrieve the user from session.",
-      });
-    }
-  });
-
   app.post("/request-token", async (request, response) => {
     try {
       const bcrypt = require("bcrypt");