On redirect to /login, redirect to initial route on successful login

Author: Brian Genisio

client/src/hooks/AuthContext.tsx

@@ -7,7 +7,7 @@ import {
   useCallback,
   createContext,
 } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { NavigateOptions, useNavigate } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
 import { setTokenHeader, SystemRoles } from 'librechat-data-provider';
 import { useGetStartupConfig } from '~/data-provider';
@@ -46,6 +46,15 @@ const AuthContextProvider = ({
   const { data: startupConfig = null } = useGetStartupConfig();
 
   const navigate = useNavigate();
+  const navigateToLogin = useCallback((options?: NavigateOptions) => {
+    const currentPath = document.location.pathname + document.location.search;
+    let loginPath = "/login";
+    if (!currentPath.startsWith('/login')) {
+      loginPath = `/login?redirect=${encodeURIComponent(currentPath)}`;
+    }
+
+    navigate(loginPath, options);
+  }, [navigate]);
 
   const setUserContext = useCallback(
     (userContext: TUserContext) => {
@@ -75,12 +84,14 @@ const AuthContextProvider = ({
     onSuccess: (data: t.TLoginResponse) => {
       const { user, token } = data;
       setError(undefined);
-      setUserContext({ token, isAuthenticated: true, user, redirect: '/c/new' });
+
+      const redirect = document.location.search ? document.location.search.split('redirect=')[1] : '/c/new';
+      setUserContext({ token, isAuthenticated: true, user, redirect: decodeURIComponent(redirect) });
     },
     onError: (error: TResError | unknown) => {
       const resError = error as TResError;
       doSetError(resError.message);
-      navigate('/login', { replace: true });
+      navigateToLogin({ replace: true });
     },
   });
   const logoutUser = useLogoutUserMutation({
@@ -126,15 +137,15 @@ const AuthContextProvider = ({
           if (authConfig?.test === true) {
             return;
           }
-          navigate('/login');
+          navigateToLogin();
         }
       },
       onError: (error) => {
         console.log('refreshToken mutation error:', error);
         if (authConfig?.test === true) {
           return;
         }
-        navigate('/login');
+        navigateToLogin();
       },
     });
   }, []);
@@ -154,7 +165,7 @@ const AuthContextProvider = ({
       setUser(userQuery.data);
     } else if (userQuery.isError) {
       doSetError((userQuery.error as Error).message);
-      navigate('/login', { replace: true });
+      navigateToLogin({replace: true});
     }
     if (error != null && error && isAuthenticated) {
       doSetError(undefined);

client/src/routes/useAuthRedirect.ts

@@ -9,7 +9,13 @@ export default function useAuthRedirect() {
   useEffect(() => {
     const timeout = setTimeout(() => {
       if (!isAuthenticated) {
-        navigate('/login', { replace: true });
+        const currentPath = document.location.pathname + document.location.search;
+        let loginPath = "/login";
+        if (!currentPath.startsWith('/login')) {
+          loginPath = `/login?redirect=${encodeURIComponent(currentPath)}`;
+        }
+
+        navigate(loginPath, { replace: true });
       }
     }, 300);
 

config/add-preset.js

@@ -0,0 +1,83 @@
+const path = require('path');
+require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
+const { askQuestion, silentExit } = require('./helpers');
+const User = require('~/models/User');
+const { savePreset } = require('~/models/Preset');
+const connect = require('./connect');
+
+(async () => {
+  await connect();
+
+  console.purple('------------------------');
+  console.purple('Create a new preset!');
+  console.purple('------------------------');
+
+  if (process.argv.length < 4) {
+    console.orange('Usage: npm run add-preset <username> <promptPrefix>');
+    console.orange('Note: if you do not pass in the arguments, you will be prompted for them.');
+    console.purple('------------------------');
+  }
+
+  let username = '';
+  let promptPrefix = '';
+
+  // Parse command line arguments
+  if (process.argv.length >= 3) {
+    username = process.argv[2];
+  }
+  if (process.argv.length >= 4) {
+    promptPrefix = process.argv[3];
+  }
+
+  if (!username) {
+    username = await askQuestion('Username:');
+  }
+
+  const user = await User.findOne({ username });
+  if (!user) {
+    console.red('Error: User not found!');
+    silentExit(1);
+  }
+
+  if (!promptPrefix) {
+    promptPrefix = await askQuestion('Prompt Prefix:');
+  }
+
+  if (!promptPrefix) {
+    console.red('Error: Prompt prefix is required!');
+    silentExit(1);
+  }
+
+  const preset = {
+    presetId: Math.random().toString(36).substring(2),
+    title: 'Custom Preset',
+    promptPrefix,
+    endpoint: 'openAI'
+  };
+
+  try {
+    const result = await savePreset(user._id, preset);
+    if (result.message) {
+      console.red('Error: ' + result.message);
+      silentExit(1);
+    }
+    console.green('Preset created successfully!');
+    silentExit(0);
+  } catch (error) {
+    console.red('Error creating preset: ' + error.message);
+    silentExit(1);
+  }
+})();
+
+process.on('uncaughtException', (err) => {
+  if (!err.message.includes('fetch failed')) {
+    console.error('There was an uncaught error:');
+    console.error(err);
+  }
+
+  if (err.message.includes('fetch failed')) {
+    return;
+  } else {
+    process.exit(1);
+  }
+});