Remove redundant 'next' parameter check in auth callback

Refactored the condition handling for the next path in auth-callback.service.ts to only rely on the callbackUrl instead of an additional 'next' parameter. This not only simplifies the code but also reduces potential errors linked to multiple sources of truth for the next path direction.
This commit is contained in:
gbuomprisco
2024-07-02 11:46:19 +08:00
parent bb846f461e
commit 6cdb46ea44

View File

@@ -49,21 +49,19 @@ class AuthCallbackService {
const token_hash = searchParams.get('token_hash');
const type = searchParams.get('type') as EmailOtpType | null;
const callbackParam = searchParams.get('callback');
const nextParam = searchParams.get('next');
let nextPath: string | null = null;
const callbackUrl = callbackParam ? new URL(callbackParam) : null;
// if we have a next path in the query params, we use that
if (nextParam) {
nextPath = nextParam;
} else {
if (callbackUrl) {
// if we have a callback url, we check if it has a next path
const callbackNextPath = callbackUrl ? callbackUrl.searchParams.get('next') : null;
const callbackNextPath = callbackUrl.searchParams.get('next');
// if we have a next path in the callback url, we use that
if (callbackNextPath) {
nextPath = callbackNextPath;
} else {
nextPath = callbackUrl.pathname;
}
}