[Swift5][URLSession] Fix handling of customHeaders between retries #7527
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.
While trying to implement @4brunu suggestion for token refresh ( #5462 (comment) ), with an access token configured in customHeaders with key "Authorization", I noticed that after changing the value in the customHeaders in the TokenRefresher, and then calling
shouldRetry(true)
, the following call would still use the old access token value.Looking into the issue I noticed that the new value (set via
MyAPI.customHeaders.updateValue(accessToken, forKey: "Authorization")
before callingshouldRetry(true)
was being overwritten with the old one stored in self.headers in thecreateURLRequest
function defined in URLSessionImplementations.swift.The proposed change creates the new headers for the modifiedRequest by adding the customHeaders last, so that they can overwrite the keys stored in self.headers, thus fixing the problem.
PR checklist
./bin/generate-samples.sh
to update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example./bin/generate-samples.sh bin/configs/java*
. For Windows users, please run the script in Git BASH.master
@jgavris @ehyche @Edubits @jaz-ah @4brunu