Merge pull request #61 from ba-st/links-base-url

Added support for creating a url based on the authority of another.
ba-st · Oct 3, 2019 · 3e748b9 · 3e748b9
2 parents 3a0fd10 + 41ffb0a
commit 3e748b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/source/Stargate-Examples/PetsRESTfulController.class.st b/source/Stargate-Examples/PetsRESTfulController.class.st
@@ -164,7 +164,7 @@ PetsRESTfulController >> getPetsBasedOn: httpRequest within: requestContext [
 					end := pagination end min: total.
 					self
 						addPaginationControlsTo: requestContext
-						basedOn: httpRequest absoluteUrl
+						basedOn: ( httpRequest absoluteUrl asHostedAt: requestHandler resourceLocator baseUrl )
 						start: start
 						limit: pagination limit
 						end: end

diff --git a/source/Stargate-Model/HypermediaDrivenRESTfulRequestHandler.class.st b/source/Stargate-Model/HypermediaDrivenRESTfulRequestHandler.class.st
@@ -36,12 +36,11 @@ HypermediaDrivenRESTfulRequestHandler >> encodeResourceCollection: resourceColle
 	requestContext
 		holdAsHypermediaControls:
 			( self paginationPolicy
-				addPaginationControlsTo: ( Array with: 'self' -> httpRequest absoluteUrl )
+				addPaginationControlsTo:
+					( Array with: 'self' -> ( httpRequest absoluteUrl asHostedAt: self resourceLocator baseUrl ) )
 				within: requestContext )
 		for: resourceCollection.
-
 	resourceCollection do: [ :resource | self holdResource: resource controlsWithin: requestContext ].
-
 	^ super
 		encodeResourceCollection: ( ResourceCollection wrapping: resourceCollection )
 		to: mediaType