Skip to content
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

Jump to bottom

Added handling for hash part of URL in case of server-side redirect. #1935

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Added handling for hash part of URL in case of server-side redirect. #1935

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
7 changes: 6 additions & 1 deletion src/services/aadService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ export class AadService implements IAadService {
}
}

const returnUrl = this.routeHelper.getQueryParameter("returnUrl") || Constants.pageUrlHome;
const hash = this.router.getHash()
let returnUrl = this.routeHelper.getQueryParameter("returnUrl") || Constants.pageUrlHome;

if (hash) { // special case for server-side redirect when hash part of URL gets discarded
returnUrl += `#${hash}`;
}

this.router.getCurrentUrl() === returnUrl
? location.reload()
Expand Down
7 changes: 6 additions & 1 deletion src/services/aadServiceV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ export class AadServiceV2 implements IAadService {
}
}

const returnUrl = this.routeHelper.getQueryParameter("returnUrl") || Constants.pageUrlHome;
const hash = this.router.getHash()
let returnUrl = this.routeHelper.getQueryParameter("returnUrl") || Constants.pageUrlHome;

if (hash) { // special case for server-side redirect when hash part of URL gets discarded
returnUrl += `#${hash}`;
}

this.router.getCurrentUrl() === returnUrl
? location.reload()
Expand Down