Skip to content

Set go back url on cloud crater authorization #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicosammito merged 1 commit into from
Aug 12, 2026
Merged

Set go back url on cloud crater authorization #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/packages/cloud/src/Middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export function middleware(request: NextRequest) {
const {searchParams, pathname} = request.nextUrl
const callbackUrl = searchParams.get('callbackUrl')
const selectNamespace = searchParams.get('selectNamespace')
const cancelUrl = searchParams.get('cancelUrl')
const authPaths = ["/email", "/login", "/password", "/redirect", "/register", "/callback"]
const isAuthPath = authPaths.some(path => pathname.startsWith(path))
const isRedirectPath = pathname.startsWith("/redirect")
Expand All @@ -26,36 +27,43 @@ export function middleware(request: NextRequest) {
const redirectUrl = new URL('/redirect', request.url)
redirectUrl.searchParams.set('callbackUrl', callbackUrl)
if (selectNamespace) redirectUrl.searchParams.set('selectNamespace', selectNamespace)
if (cancelUrl) redirectUrl.searchParams.set('cancelUrl', cancelUrl)
const response = NextResponse.redirect(redirectUrl)
response.cookies.set('codezero_callback', callbackUrl, cookieOptions)
if (selectNamespace) response.cookies.set('codezero_selectNamespace', selectNamespace, cookieOptions)
if (cancelUrl) response.cookies.set('codezero_cancel', cancelUrl, cookieOptions)
return response
}

const redirectUrl = request.nextUrl.clone()
redirectUrl.searchParams.delete('callbackUrl')
redirectUrl.searchParams.delete('selectNamespace')
redirectUrl.searchParams.delete('cancelUrl')
const response = NextResponse.redirect(redirectUrl)
response.cookies.set('codezero_callback', callbackUrl, cookieOptions)
if (selectNamespace) response.cookies.set('codezero_selectNamespace', selectNamespace, cookieOptions)
if (cancelUrl) response.cookies.set('codezero_cancel', cancelUrl, cookieOptions)
return response
}

const callbackCookie = request.cookies.get('codezero_callback')?.value
const selectNamespaceCookie = request.cookies.get('codezero_selectNamespace')?.value
const cancelCookie = request.cookies.get('codezero_cancel')?.value

if (callbackCookie) {
if (!isAuthPath) {
const redirectUrl = new URL('/redirect', request.url)
redirectUrl.searchParams.set('callbackUrl', callbackCookie)
if (selectNamespaceCookie) redirectUrl.searchParams.set('selectNamespace', selectNamespaceCookie)
if (cancelCookie) redirectUrl.searchParams.set('cancelUrl', cancelCookie)
return NextResponse.redirect(redirectUrl)
}

if (isRedirectPath && !searchParams.has('callbackUrl')) {
const url = request.nextUrl.clone()
url.searchParams.set('callbackUrl', callbackCookie)
if (selectNamespaceCookie) url.searchParams.set('selectNamespace', selectNamespaceCookie)
if (cancelCookie) url.searchParams.set('cancelUrl', cancelCookie)
return NextResponse.redirect(url)
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/packages/cloud/src/user/pages/UserRedirectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const UserRedirectPage: React.FC = () => {
const params = useSearchParams()
const callbackUrl = params.get("callbackUrl")
const selectNamespace = params.get("selectNamespace")
const cancelUrl = params.get("cancelUrl")
const router = useRouter()
const isValidCallback = isValidRedirect(callbackUrl)
const organizationService = useService(OrganizationService)
Expand Down Expand Up @@ -146,7 +147,8 @@ export const UserRedirectPage: React.FC = () => {
<Button type={"submit"} onClick={() => {
document.cookie = "codezero_callback=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
document.cookie = "codezero_selectNamespace=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
window.location.href = "/"
document.cookie = "codezero_cancel=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
window.location.href = isValidRedirect(cancelUrl) ? cancelUrl! : "/"
}} data-qa-selector={"auth-login-send"} color={isValidCallback ? "secondary" : "success"} w={"100%"}
mb={1.3}>
No, go back
Expand All @@ -158,6 +160,7 @@ export const UserRedirectPage: React.FC = () => {
if (!craterToken) return
document.cookie = "codezero_callback=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
document.cookie = "codezero_selectNamespace=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
document.cookie = "codezero_cancel=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
const targetURL = new URL(callbackUrl)
targetURL.searchParams.set('token', craterToken)
if (selectNamespace && namespaceId) targetURL.searchParams.set('namespace', namespaceId)
Expand Down