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

Jump to bottom

Fix etag calculation for updates when the content language in the req… #197

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Fix etag calculation for updates when the content language in the req… #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 35 additions & 24 deletions source/Stargate-Model/RESTfulRequestHandlerBehavior.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,24 @@ RESTfulRequestHandlerBehavior >> applyCachingDirectivesFor: aResource to: respon
]

{ #category : 'private' }
RESTfulRequestHandlerBehavior >> assert: etag matchesEntityTagOf: entity encodedAs: mediaType within: requestContext [
RESTfulRequestHandlerBehavior >> assert: etag matchesEntityTagOf: entity encodedAs: httpRequest within: requestContext [

etag = ( self entityTagOf: entity encodedAs: mediaType within: requestContext )
ifFalse: [ HTTPClientError preconditionFailed signal ]
| calculatedEtag entityTagCalculation |
entityTagCalculation := [
self
entityTagOf: entity
encodedAs: httpRequest contentType
within: requestContext ].

"The request content can be in another language that the one requested
in the Accept header, so in that case we need to calculated the etag
of the entity with this language as the current one"
calculatedEtag := httpRequest contentLanguageTags
ifEmpty: entityTagCalculation
ifNotEmpty: [ :languages |
CurrentLocale use: languages first during: entityTagCalculation ].

etag = calculatedEtag ifFalse: [ HTTPClientError preconditionFailed signal ]
]

{ #category : 'decoding/encoding' }
Expand Down Expand Up @@ -188,29 +202,26 @@ RESTfulRequestHandlerBehavior >> from: httpRequest within: requestContext get: a
{ #category : 'API' }
RESTfulRequestHandlerBehavior >> from: httpRequest within: requestContext get: findBlock thenUpdateWith: updateBlock [

| etag |
| etag |

etag := self entityTagToMatchBasedOn: httpRequest.
etag := self entityTagToMatchBasedOn: httpRequest.

^ self
from: httpRequest
within: requestContext
get: [ :id |
| resourceToUpdate updatedResource |

resourceToUpdate := findBlock cull: id.
self
assert: etag
matchesEntityTagOf: resourceToUpdate
encodedAs: httpRequest contentType
within: requestContext.

updatedResource := self decode: httpRequest within: requestContext.
self exceptionHandler handleConflictsDuring: [
self exceptionHandler handleDecodingFailedDuring: [
updateBlock value: resourceToUpdate value: updatedResource ]
]
]
^ self from: httpRequest within: requestContext get: [ :id |
| resourceToUpdate updatedResource |

resourceToUpdate := findBlock cull: id.
self
assert: etag
matchesEntityTagOf: resourceToUpdate
encodedAs: httpRequest
within: requestContext.

updatedResource := self decode: httpRequest within: requestContext.
self exceptionHandler handleConflictsDuring: [
self exceptionHandler handleDecodingFailedDuring: [
updateBlock value: resourceToUpdate value: updatedResource ]
]
]
]

{ #category : 'API' }
Expand Down