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

Fix replacing substring of params in search query #1226

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix replacing substring of params in search query #1226

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e87ffee
update some search.location.replace steps
joeystoffels Apr 21, 2022
aff4f7d
Fixed search replace to stop matching on substring of parameters.
Xhofleer Apr 25, 2022
8153405
added github workflow to publish package
GeorgeHarbers May 27, 2022
29a5395
updated workflow
GeorgeHarbers May 27, 2022
f84b9a6
updated workflow
GeorgeHarbers May 27, 2022
65acb90
updated workflow
GeorgeHarbers May 27, 2022
072e669
updated workflow
GeorgeHarbers May 27, 2022
55c6ace
Testing a different file
May 27, 2022
54f7244
Revert "Testing a different file"
GeorgeHarbers May 28, 2022
9d3851f
Revert "updated workflow"
GeorgeHarbers May 28, 2022
c55c564
Revert "updated workflow"
GeorgeHarbers May 28, 2022
12a75c3
Revert "updated workflow"
GeorgeHarbers May 28, 2022
04d2a7e
Revert "updated workflow"
GeorgeHarbers May 28, 2022
4af5518
Revert "added github workflow to publish package"
GeorgeHarbers May 28, 2022
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
15 changes: 5 additions & 10 deletions projects/lib/src/oauth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,16 +1745,11 @@ export class OAuthService extends AuthConfig implements OnDestroy {
location.origin +
location.pathname +
location.search
.replace(/code=[^&\$]*/, '')
.replace(/scope=[^&\$]*/, '')
.replace(/state=[^&\$]*/, '')
.replace(/session_state=[^&\$]*/, '')
.replace(/^\?&/, '?')
.replace(/&$/, '')
.replace(/^\?$/, '')
.replace(/&+/g, '&')
.replace(/\?&/, '?')
.replace(/\?$/, '') +
Comment on lines -1752 to -1757
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new way of matching will result in less situations that can break the format of the URL that's why these replace are not needed anymore.

.replace(/[&?]code=[^&\$]*/, '')
.replace(/[&?]scope=[^&\$]*/, '')
.replace(/[&?]state=[^&\$]*/, '')
.replace(/[&?]session_state=[^&\$]*/, '')
.replace(/^&/, '?') +
location.hash;

history.replaceState(null, window.name, href);
Expand Down