rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix misc bugs

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-03-04 10:45:43 +04:00
parent a160dc1f47
commit 8dc5fffa58
11 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/trust/src/pages/NDAPage.tsx
View File

@@ -108,8 +108,16 @@ export function NDAPage(props: {
const continueUrlParam = searchParams.get("continue");
let safeContinueUrl: string;
if (continueUrlParam) {
const continueUrl = new URL(continueUrlParam);
safeContinueUrl = window.location.origin + continueUrl.pathname + continueUrl.search;
try {
const continueUrl = new URL(continueUrlParam, window.location.origin);
if (continueUrl.origin === window.location.origin && continueUrl.pathname.startsWith(`${getPathPrefix()}/`)) {
safeContinueUrl = window.location.origin + continueUrl.pathname + continueUrl.search;
} else {
safeContinueUrl = window.location.origin + getPathPrefix();
}
} catch {
safeContinueUrl = window.location.origin + getPathPrefix();
}
} else {
safeContinueUrl = window.location.origin + getPathPrefix();
}

18
apps/trust/src/pages/auth/ConnectPage.tsx
View File

@@ -63,11 +63,18 @@ export function ConnectPage(props: {
const continueUrlParam = searchParams.get("continue");
let safeContinueUrl: string;
if (continueUrlParam) {
const continueUrl = new URL(continueUrlParam);
safeContinueUrl = window.location.origin + continueUrl.pathname + continueUrl.search;
try {
const continueUrl = new URL(continueUrlParam, window.location.origin);
if (continueUrl.origin === window.location.origin && continueUrl.pathname.startsWith(`${getPathPrefix()}/`)) {
safeContinueUrl = window.location.origin + continueUrl.pathname + continueUrl.search;
} else {
safeContinueUrl = window.location.origin + (getPathPrefix() || "/");
}
} catch {
safeContinueUrl = window.location.origin + (getPathPrefix() || "/");
}
} else {
const pathPrefix = getPathPrefix();
safeContinueUrl = window.location.origin + (pathPrefix ? getPathPrefix() : "/");
safeContinueUrl = window.location.origin + (getPathPrefix() || "/");
}
useEffect(() => {
@@ -119,8 +126,7 @@ export function ConnectPage(props: {
if (errors) {
for (const err of errors) {
if (err.extensions?.code === "ALREADY_AUTHENTICATED") {
const pathPrefix = getPathPrefix();
window.location.href = pathPrefix ? getPathPrefix() : "/";
window.location.href = getPathPrefix() || "/";
return;
}
}

14
apps/trust/src/pages/auth/VerifyMagicLinkPage.tsx
View File

@@ -42,8 +42,7 @@ export default function VerifyMagicLinkPagePageMutation() {
if (errors) {
for (const err of errors) {
if (err.extensions?.code === "ALREADY_AUTHENTICATED") {
const pathPrefix = getPathPrefix();
window.location.href = pathPrefix ? getPathPrefix() : "/";
window.location.href = getPathPrefix() || "/";
return;
}
}
@@ -64,11 +63,14 @@ export default function VerifyMagicLinkPagePageMutation() {
});
if (verifyMagicLink?.continue) {
const continueUrl = new URL(verifyMagicLink.continue);
window.location.href = window.location.origin + continueUrl.pathname + continueUrl.search;
try {
const continueUrl = new URL(verifyMagicLink.continue, window.location.origin);
window.location.href = window.location.origin + continueUrl.pathname + continueUrl.search;
} catch {
window.location.href = getPathPrefix() || "/";
}
} else {
const pathPrefix = getPathPrefix();
window.location.href = pathPrefix ? getPathPrefix() : "/";
window.location.href = getPathPrefix() || "/";
}
},
onError: (err) => {