handler: setup cors on non-OPTIONS

Author: nmattia

infra/api_gateway.tf

@@ -1,3 +1,8 @@
+variable "allowed_origins" {
+  type = "list"
+  default = ["localhost:3333", "deckdeckgo.com"]
+}
+
 resource "aws_api_gateway_rest_api" "lambda-api" {
   name = "deckdeckgo-handler-rest-api"
 }
@@ -98,7 +103,7 @@ resource "aws_api_gateway_integration_response" "options_integration_response" {
   response_parameters = {
     "method.response.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
     "method.response.header.Access-Control-Allow-Methods" = "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
-    "method.response.header.Access-Control-Allow-Origin"  = "'*'"
+    "method.response.header.Access-Control-Allow-Origin"  = "'${join(",",var.allowed_origins)}'"
   }
 }
 

infra/handler/Main.hs

@@ -21,6 +21,7 @@ import qualified Data.Aeson as Aeson
 import qualified Network.AWS as Aws
 import qualified Network.AWS.DynamoDB as DynamoDB
 import qualified Network.Wai.Handler.Lambda as Lambda
+import qualified Network.Wai.Middleware.Cors as Cors
 import qualified Servant as Servant
 import qualified System.Random as Random
 
@@ -99,7 +100,7 @@ main = do
   env <- Aws.newEnv Aws.Discover
 
   liftIO $ putStrLn "Booted!"
-  Lambda.run $ Servant.serve api (server env)
+  Lambda.run $ Cors.simpleCors $ Servant.serve api (server env)
 
 server :: Aws.Env -> Servant.Server API
 server env = serveDecks :<|> serveSlides

infra/handler/package.yaml

@@ -15,6 +15,7 @@ dependencies:
     - text
     - unliftio
     - unordered-containers
+    - wai-cors
     - wai-lambda
 
 ghc-options:

infra/main.js

@@ -85,7 +85,7 @@ exports.handler = function(event, context, callback) {
 
                 // Parse the response from the Haskell process
                 const response = JSON.parse(fs.readFileSync(responseFile, 'utf8'));
-                console.log("Parsed response");
+                console.log("Parsed response: " + JSON.stringify(response));
 
                 // Clean up the directory and finally reply
                 console.log("cleaning up");