[2.x] fix: prevent UserSecurityPage crash when user loads asynchronously#4651
Open
datlechin wants to merge 2 commits intoflarum:2.xfrom
Open
[2.x] fix: prevent UserSecurityPage crash when user loads asynchronously#4651datlechin wants to merge 2 commits intoflarum:2.xfrom
datlechin wants to merge 2 commits intoflarum:2.xfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
UserSecurityPage.oninitcallsloadTokens()immediately afterloadUser(), assumingthis.useris set synchronously. That assumption only holds when the route slug equals the user's username, so any non-default slug driver (built-inIdWithDisplayNameincluded) crashes with:To reproduce: set the user slug driver to
IdWithDisplayNamein admin, then visit/u/<id>-<name>/security.The fix has two parts:
UserPage.loadUserreturnsPromise<void>so subclasses can chain dependent work after the user resolves.UserSecurityPagechainsloadTokens()onto it.loadUseralso comparesuser.slug(), and the preloaded API document's primary resource is used directly when present. This eliminates the loading flicker that otherwise appears on every initial render under non-default slug drivers (the page used to renderloading=truewhile the async user fetch ran).Test plan
yarn buildinframework/core/jspasses.IdWithDisplayNameslug driver:/u/<id>-<name>/securityloads without crash.