Merge pull request #23 from ba-st/22-CORS-not-working-on-error

Fixed CORS failing after an error
ba-st · Jan 25, 2019 · c819660 · c819660
2 parents 77e2b34 + 4985e4c
commit c819660
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 25 deletions.
diff --git a/...OriginResourceSharingHandlerTest.class.st → ...ourceSharingPreflightHandlerTest.class.st b/...OriginResourceSharingHandlerTest.class.st → ...ourceSharingPreflightHandlerTest.class.st
@@ -2,17 +2,17 @@
 I'm a test case for CrossOriginResourceSharingHandler
 "
 Class {
-	#name : #CrossOriginResourceSharingHandlerTest,
+	#name : #CrossOriginResourceSharingPreflightHandlerTest,
 	#superclass : #TestCase,
 	#category : #'Stargate-Model-Tests-CORS'
 }
 
 { #category : #tests }
-CrossOriginResourceSharingHandlerTest >> testEvaluationOnRequest [
+CrossOriginResourceSharingPreflightHandlerTest >> testEvaluationOnRequest [
 
 	| handler response |
 
-	handler := CrossOriginResourceSharingHandler allowing: #('GET' 'POST').
+	handler := CrossOriginResourceSharingPreflightHandler allowing: #('GET' 'POST').
 	response := handler teaEvalActionOnRequest: (ZnRequest options: 'url').
 
 	self

diff --git a/source/Stargate-Model/CrossOriginResourceSharingAfterFilter.class.st b/source/Stargate-Model/CrossOriginResourceSharingAfterFilter.class.st
@@ -0,0 +1,38 @@
+Class {
+	#name : #CrossOriginResourceSharingAfterFilter,
+	#superclass : #Object,
+	#instVars : [
+		'allowedOrigins'
+	],
+	#category : #'Stargate-Model-CORS'
+}
+
+{ #category : #'instance creation' }
+CrossOriginResourceSharingAfterFilter class >> allowing: origins [
+
+	^ self new initializeAllowing: origins
+]
+
+{ #category : #initialization }
+CrossOriginResourceSharingAfterFilter >> initializeAllowing: origins [
+
+	allowedOrigins := origins
+]
+
+{ #category : #'tea action' }
+CrossOriginResourceSharingAfterFilter >> teaEvalActionOnRequest: request response: response [
+
+	| requestOrigin requestOriginUrl |
+
+	requestOrigin := request headers at: 'Origin'.
+	requestOriginUrl := requestOrigin asUrl.
+
+	allowedOrigins
+		detect: [ :origin | origin = requestOriginUrl ]
+		ifFound: [ :allowedOrigin | 
+			response headers
+				at: 'Access-Control-Allow-Origin' put: requestOrigin;
+				at: 'Vary' put: 'Origin' ].
+
+	^ response
+]
diff --git a/...rossOriginResourceSharingHandler.class.st → ...nResourceSharingPreflightHandler.class.st b/...rossOriginResourceSharingHandler.class.st → ...nResourceSharingPreflightHandler.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #CrossOriginResourceSharingHandler,
+	#name : #CrossOriginResourceSharingPreflightHandler,
 	#superclass : #Object,
 	#instVars : [
 		'httpMethods'
@@ -8,25 +8,25 @@ Class {
 }
 
 { #category : #'instance creation' }
-CrossOriginResourceSharingHandler class >> allowing: anHttpMethodsCollection [
+CrossOriginResourceSharingPreflightHandler class >> allowing: anHttpMethodsCollection [
 
 	^ self new initializeAllowing: anHttpMethodsCollection
 ]
 
 { #category : #'private - accessing' }
-CrossOriginResourceSharingHandler >> commaSeparatedHttpMethods [
+CrossOriginResourceSharingPreflightHandler >> commaSeparatedHttpMethods [
 
 	^ (CollectionFormatter separatingWith: ', ') format: httpMethods
 ]
 
 { #category : #initialization }
-CrossOriginResourceSharingHandler >> initializeAllowing: anHttpMethodsCollection [
+CrossOriginResourceSharingPreflightHandler >> initializeAllowing: anHttpMethodsCollection [
 
 	httpMethods := anHttpMethodsCollection
 ]
 
 { #category : #evaluating }
-CrossOriginResourceSharingHandler >> teaEvalActionOnRequest: aRequest [
+CrossOriginResourceSharingPreflightHandler >> teaEvalActionOnRequest: aRequest [
 
 	| response |
 

diff --git a/source/Stargate-Model/HTTPBasedRESTfulAPI.class.st b/source/Stargate-Model/HTTPBasedRESTfulAPI.class.st
@@ -23,20 +23,7 @@ HTTPBasedRESTfulAPI class >> configuredBy: configuration installing: aRESTfulCon
 HTTPBasedRESTfulAPI >> beCORSAwareAllowing: origins [
 
 	teapotServer
-		after:
-			'/*'
-				-> [ :request :response | 
-					| requestOrigin requestOriginUrl |
-
-					requestOrigin := request headers at: 'Origin'.
-					requestOriginUrl := requestOrigin asUrl.
-					origins
-						detect: [ :origin | origin = requestOriginUrl ]
-						ifFound: [ :allowedOrigin | 
-							response headers
-								at: 'Access-Control-Allow-Origin' put: requestOrigin;
-								at: 'Vary' put: 'Origin' ].
-					response ];
+		after: '/*' -> (CrossOriginResourceSharingAfterFilter allowing: origins);
 		when: [ :request | request headers includesKey: 'Origin' ]
 ]
 
@@ -58,16 +45,21 @@ HTTPBasedRESTfulAPI >> configureRoutes [
 { #category : #initialization }
 HTTPBasedRESTfulAPI >> initializeConfiguredBy: configuration installing: aRESTfulControllerCollection [
 
-	teapotServer := Teapot
-		configure: configuration , {(#notFoundHandlerClass -> Tea405AwareNotFoundHandler)}.
+	teapotServer := Teapot configure: configuration , {(#notFoundHandlerClass -> Tea405AwareNotFoundHandler)}.
 	controllers := aRESTfulControllerCollection.
 	errorHandlers := OrderedCollection new.
+
 	self
 		on: HTTPClientError
 		addErrorHandler: [ :clientError :request | 
 			| json |
+
 			json := NeoJSONWriter toStringPretty: clientError.
 			(ZnResponse statusCode: clientError code)
+				headers:
+							(ZnHeaders defaultResponseHeaders
+								at: 'Access-Control-Allow-Origin' put: '*';
+								yourself);
 				entity: (ZnEntity json: json);
 				yourself ]
 ]

diff --git a/source/Stargate-Model/RouteConfigurator.class.st b/source/Stargate-Model/RouteConfigurator.class.st
@@ -43,7 +43,7 @@ RouteConfigurator >> configureCrossOriginSharingRoutes [
 			teapot
 				OPTIONS:
 					resourceLocation
-						-> (CrossOriginResourceSharingHandler allowing: (routesAllowingCors at: resourceLocation)) ]
+						-> (CrossOriginResourceSharingPreflightHandler allowing: (routesAllowingCors at: resourceLocation)) ]
 ]
 
 { #category : #'private - configuring' }