Handle an expired admin user link #17667
Merged
Conversation
This file contains 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
selfcontained
commented
May 18, 2023
|
|
||
| // Wrap the App in an ErrorBoundary to catch User/Org loading errors | ||
| // This will also catch any errors that happen to bubble all the way up to the top | ||
| const AppWithErrorBoundary: FC = () => { |
There was a problem hiding this comment.
This was leftover and not needed anymore.
selfcontained
commented
May 18, 2023
| @@ -72,4 +67,13 @@ const App: FC = () => { | |||
| ); | |||
| }; | |||
|
|
|||
| export default AppWithErrorBoundary; | |||
| // Routing level above main App component for any routes that don't need user/orgs loaded, such as addressable error pages | |||
There was a problem hiding this comment.
This adds a layer above our App to let us render things like addressable error pages w/ their own routes. They won't load any external data by default.
selfcontained
commented
May 18, 2023
| return ( | ||
| <Suspense fallback={<AppLoading />}> | ||
| <Switch> | ||
| {/* Matching /error/expired-ots */} |
There was a problem hiding this comment.
We can add other addressable error pages here and use them for other cases where the api needs to redirect somewhere to show the user an error.
selfcontained
commented
May 18, 2023
| import cubicleDarkImg from "../images/cubicle-dark.png"; | ||
| import cubicleImg2x from "../images/cubicle@2x.png"; | ||
| import cubicleDarkImg2x from "../images/cubicle-dark@2x.png"; | ||
| import cubicleImg from "../images/cubicle.webp"; |
There was a problem hiding this comment.
Switched all these png to webp cause they're waaaaay smaller.
selfcontained
commented
May 18, 2023
| const code = e.code || 401; | ||
| res.sendStatus(code); | ||
| // Always redirect to an expired token page if there's an error | ||
| res.redirect("/error/expired-ots", 307); |
There was a problem hiding this comment.
unsure if we want to try and classify different errors, i.e. expired vs. invalid. If so, we can have an error route for each one.
selfcontained
changed the title
selfcontained
changed the title
svenefftinge
approved these changes
May 22, 2023
|
/unhold |
roboquat
added
deployed: webapp
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.
Description
Adds an error page to the admin login flow. I added a layer above our
<App/>that provides a way to add routes for things like addressable error pages. I've added/error/expired-otsfor this scenario, but anything under/error/*will resolve to this new routing layer, and render a default error page if we don't have an explicit route for it yet. This will let us add more addressable error pages in the future if we need. The primary intent of these is for scenarios where the api layer needs to redirect somewhere in the case of an error, and let us render clientside to accomplish that. No external data is loaded from the client for this routing layer, such as a user/orgs.Related Issue(s)
Fixes WEB-286
How to test
/error/expired-ots/error/foowill render a default error page, mostly to just have a catch-all for any undefined routes underneath the/error/*path./api/login/ots/admin/badtoken- it should redirect to the/error/expired-otserror pageDocumentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options:
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish Options
Installer Options
Add desired feature flags to the end of the line above, space separated
Preview Environment Options:
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh/hold