Merge branch 'login-auth' of https://github.com/logspace-ai/langflow into login-auth

This commit is contained in:
Cristhian Zanforlin Lousa 2023-08-17 18:46:27 -03:00
commit b15ab5bae0
2 changed files with 3 additions and 3 deletions

View file

@ -3,7 +3,7 @@ import { Navigate } from "react-router-dom";
import { AuthContext } from "../../contexts/authContext"; import { AuthContext } from "../../contexts/authContext";
export const ProtectedAdminRoute = ({ children }) => { export const ProtectedAdminRoute = ({ children }) => {
const { isAdmin, isAuthenticated, logout, getAuthentication, userData } = const { isAdmin, isAuthenticated, logout, getAuthentication, userData, autoLogin } =
useContext(AuthContext); useContext(AuthContext);
useEffect(() => { useEffect(() => {
if (!isAuthenticated && !getAuthentication()) { if (!isAuthenticated && !getAuthentication()) {
@ -16,7 +16,7 @@ export const ProtectedAdminRoute = ({ children }) => {
return <Navigate to="/login" replace />; return <Navigate to="/login" replace />;
} }
if (userData && !isAdmin) { if (userData && !isAdmin || autoLogin) {
return <Navigate to="/" replace />; return <Navigate to="/" replace />;
} }

View file

@ -53,7 +53,7 @@ export default function Header() {
</Button> </Button>
)} )}
{isAdmin && ( {isAdmin && !autoLogin && (
<Button variant="outline" onClick={() => navigate("/admin")}> <Button variant="outline" onClick={() => navigate("/admin")}>
Admin page Admin page
</Button> </Button>