Rename redirect-path to continue + handle redirection on forbidden from wrong org assume
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
@@ -11,9 +11,12 @@ export function OrganizationErrorBoundary() {
|
||||
|
||||
const search = new URLSearchParams([
|
||||
["organization-id", organizationId],
|
||||
["redirect-path", window.location.pathname + window.location.search],
|
||||
]);
|
||||
|
||||
if (window.location.href !== window.location.origin) {
|
||||
search.set("continue", window.location.href);
|
||||
}
|
||||
|
||||
if (error instanceof UnAuthenticatedError) {
|
||||
return <Navigate to={{ pathname: "/auth/login", search: "?" + search.toString() }} />;
|
||||
}
|
||||
|
||||
@@ -6,12 +6,19 @@ import { PageError } from "./PageError";
|
||||
export function RootErrorBoundary() {
|
||||
const error = useRouteError();
|
||||
|
||||
const search = new URLSearchParams([
|
||||
["redirect-path", window.location.pathname + window.location.search],
|
||||
]);
|
||||
const search = new URLSearchParams();
|
||||
if (window.location.href !== window.location.origin) {
|
||||
search.set("continue", window.location.href);
|
||||
}
|
||||
|
||||
if (error instanceof UnAuthenticatedError) {
|
||||
return <Navigate to={{ pathname: "/auth/login", search: "?" + search.toString() }} />;
|
||||
return (
|
||||
<Navigate to={{
|
||||
pathname: "/auth/login",
|
||||
search: search.toString() ? "?" + search.toString() : "",
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return <PageError error={error instanceof Error ? error : new Error("unknown error")} />;
|
||||
|
||||
Reference in New Issue
Block a user