Skip to content

Commit 0bccca4

Browse files
committed
modified redirect login in new frontend
1 parent de8e4ee commit 0bccca4

3 files changed

Lines changed: 18 additions & 36 deletions

File tree

src/new-landingpage/src/App.tsx

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,12 @@
1-
import { useAuth } from "@clerk/clerk-react";
21
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
32
import { LANDING_BASENAME } from "./landingRoutes";
43
import NewLandingPageLogin from "./NewLandingPageLogin";
54
import OrganizationOnboarding from "./OrganizationOnboarding";
65
import "./App.css";
76
import DashboardPage from "./DashboardPage";
8-
import { useCookies } from "react-cookie";
97
import LandingPage from "./LandingPage";
10-
import {
11-
hasWorkspaceSession,
12-
LANGFLOW_ACCESS_TOKEN,
13-
LANGFLOW_REFRESH_TOKEN,
14-
} from "./session";
158

169
function RootRoute() {
17-
const { isSignedIn } = useAuth();
18-
const [cookies] = useCookies([LANGFLOW_ACCESS_TOKEN, LANGFLOW_REFRESH_TOKEN]);
19-
20-
console.log("[App] RootRoute render", { isSignedIn });
21-
22-
if (isSignedIn) {
23-
const workspaceReady = hasWorkspaceSession(cookies);
24-
const destination = workspaceReady ? "/flows" : "/organization";
25-
26-
console.log("[App] Redirecting signed-in user from root", {
27-
workspaceReady,
28-
destination,
29-
});
30-
31-
if (workspaceReady) {
32-
window.location.assign(destination);
33-
return null;
34-
}
35-
36-
return <Navigate to={destination} replace />;
37-
}
38-
3910
return <LandingPage />;
4011
}
4112

src/new-landingpage/src/NewLandingPageLogin.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { SignIn, SignedIn, SignedOut, useAuth } from "@clerk/clerk-react";
22
import { useEffect } from "react";
33
import { useNavigate } from "react-router-dom";
4-
import { useCookies } from "react-cookie";
54
import { LANDING_BASENAME } from "./landingRoutes";
65
import {
76
clearStoredOrgSelection,
87
hasWorkspaceSession,
98
LANGFLOW_ACCESS_TOKEN,
109
LANGFLOW_REFRESH_TOKEN,
1110
} from "./session";
11+
import { useCookies } from "react-cookie";
1212

1313
export default function NewLandingPageLogin() {
1414
const { isSignedIn, isLoaded } = useAuth();
@@ -28,15 +28,15 @@ export default function NewLandingPageLogin() {
2828
const workspaceReady = hasWorkspaceSession(cookies);
2929
const destination = workspaceReady ? "/flows" : "/organization";
3030

31-
console.log(
32-
"[NewLandingPageLogin] User signed in, redirecting based on session",
33-
{ workspaceReady, destination },
34-
);
31+
console.log("[NewLandingPageLogin] User signed in, redirecting", {
32+
workspaceReady,
33+
destination,
34+
});
3535

3636
if (workspaceReady) {
3737
window.location.assign(destination);
3838
} else {
39-
navigate(destination, { replace: true });
39+
navigate("/organization", { replace: true });
4040
}
4141
}
4242
}, [cookies, isLoaded, isSignedIn, navigate]);
@@ -59,7 +59,7 @@ export default function NewLandingPageLogin() {
5959
/>
6060
</SignedOut>
6161
<SignedIn>
62-
<div style={{ textAlign: "center" }}>Redirecting you to your organization list</div>
62+
<div style={{ textAlign: "center" }}>Redirecting you to your workspace</div>
6363
</SignedIn>
6464
</div>
6565
</div>

src/new-landingpage/src/OrganizationOnboarding.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import logoicon from "./new-assets/visualailogo.png";
2424
import ProgressBar from "./ProgressBar";
2525
import {
2626
ACTIVE_ORG_STORAGE_KEY,
27+
hasWorkspaceSession,
2728
LANGFLOW_ACCESS_TOKEN,
2829
LANGFLOW_REFRESH_TOKEN,
2930
ORG_SELECTED_KEY,
@@ -545,13 +546,23 @@ export default function OrganizationOnboarding() {
545546
return null;
546547
}
547548

549+
const workspaceReady = hasWorkspaceSession(cookies);
550+
548551
if (!isSignedIn) {
549552
console.log(
550553
"[OrganizationOnboarding] User not signed in, redirecting to /login",
551554
);
552555
return <Navigate to="/login" replace />;
553556
}
554557

558+
if (workspaceReady) {
559+
console.log(
560+
"[OrganizationOnboarding] Workspace session present; redirecting to /flows",
561+
);
562+
window.location.assign("/flows");
563+
return null;
564+
}
565+
555566
if (shouldRedirectToFlows) {
556567
console.log("[OrganizationOnboarding] Local redirect flag set; sending to workspace", {
557568
redirectTo,

0 commit comments

Comments
 (0)