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(pkce): 20111 PKCE auth flow does not return user to previous path like dex auth flow #20202

Merged
merged 12 commits into from
Oct 30, 2024
Merged

fix(pkce): 20111 PKCE auth flow does not return user to previous path like dex auth flow #20202

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
765f05b
Adding non-default basehref support for PKCE auth flow
austin5219 Oct 16, 2024
46b66c0
Adding ; for linting
austin5219 Oct 16, 2024
4fcb087
removing hook function
austin5219 Oct 16, 2024
391f577
Moving unauthorized error handling to class component to access conte…
austin5219 Oct 17, 2024
752ce6e
Store the subsrition handle to close in unmount
austin5219 Oct 17, 2024
b62ab8f
reorder imports
austin5219 Oct 17, 2024
4673121
Actually saving the subscriptions now
austin5219 Oct 17, 2024
905fb28
returning the 401 subscription from helper function
austin5219 Oct 17, 2024
4070e08
Handle the promise of a subscription
austin5219 Oct 17, 2024
ad31a3a
Removing then from non async subscribe
austin5219 Oct 17, 2024
d2a6e1f
Linter fixes
austin5219 Oct 17, 2024
a5091b7
Adding path caching to sessionStorage on pkceLogin and redirect step …
austin5219 Oct 16, 2024
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
Prev Previous commit
Next Next commit
Handle the promise of a subscription 
Signed-off-by: austin5219 <3936059+austin5219@users.noreply.github.com>
  • Loading branch information
@austin5219
austin5219 committed Oct 17, 2024
commit 4070e08fa903c8062f5674e5da4c328c0f95b383
18 changes: 14 additions & 4 deletions ui/src/app/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,18 @@ export class App extends React.Component<
this.navigationManager = new NavigationManager(history);
this.navItems = navItems;
this.routes = routes;
this.popupPropsSubscription = null;
this.unauthorizedSubscription = null;
services.extensions.addEventListener('systemLevel', this.onAddSystemLevelExtension.bind(this));
}

public async componentDidMount() {
this.popupPropsSubscription = this.popupManager.popupProps.subscribe(popupProps => this.setState({popupProps}));
this.unauthorizedSubscription = this.subscribeUnauthorized();
this.popupManager.popupProps.subscribe(popupProps => this.setState({popupProps})).then((subscription) => {
this.popupPropsSubscription = subscription;
});
this.subscribeUnauthorized().then((subscription) => {
this.unauthorizedSubscription = subscription;
});
const authSettings = await services.authService.settings();
const {trackingID, anonymizeUsers} = authSettings.googleAnalytics || {trackingID: '', anonymizeUsers: true};
const {loggedIn, username} = await services.users.get();
Expand Down Expand Up @@ -151,8 +157,12 @@ export class App extends React.Component<
}

public componentWillUnmount() {
this.popupPropsSubscription.unsubscribe();
this.unauthorizedSubscription.unsubscribe();
if (this.popupPropsSubscription) {
this.popupPropsSubscription.unsubscribe();
}
if (this.unauthorizedSubscription) {
this.unauthorizedSubscription.unsubscribe();
}
}

public render() {
Expand Down
Loading