Retry when discovery document fetcher fails #133
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
andrew-nowak
force-pushed
the
an/retry-dd-failures
branch
from
fa8ffe6
to
eff4315
Compare
andrew-nowak
force-pushed
the
an/retry-dd-failures
branch
from
eff4315
to
575e810
Compare
davidfurey
reviewed
Jan 17, 2024
| ws.url(config.discoveryDocumentUrl).get().map(r => DiscoveryDocument.fromJson(r.json)) | ||
|
|
||
| private def discoveryDocument: Future[DiscoveryDocument] = | ||
| discoveryDocumentHolder.updateAndGet(ddf => |
There was a problem hiding this comment.
ddf isn't a great name but I can't think of anything better.
| @@ -45,7 +46,7 @@ class OAuth(config: OAuthSettings, system: String, redirectUrl: String) { | |||
| } | |||
|
|
|||
| def redirectToOAuthProvider(antiForgeryToken: String, email: Option[String] = None) | |||
| (implicit context: ExecutionContext, request: RequestHeader, ws: WSClient): Future[Result] = { | |||
| (implicit context: ExecutionContext): Future[Result] = { | |||
There was a problem hiding this comment.
It isn't immediately obvious to me why you have moved these implicit parameters to the class level
There was a problem hiding this comment.
They're not strictly necessary, but it made life a bunch easier to move the implicits for the discoveryDocument method up to be shared throughout the class, so that I can make the initial discovery doc request at construction. Once they're up at the class level, these implicits become unnecessary, because the values used in the construction of the OAuth class are also the values that are passed to redirectToOAuthProvider.
davidfurey
approved these changes
Feb 21, 2024
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.
@guardian/digital-cms
Motivated by seeing an example where DNS resolution failed for the discovery document, and that failure was held for the rest of the instance's lifetime. If when asking for the discovery document future, we see that the fetch has failed; replace the future with a fresh fetch.