Merge pull request #12 from sinhashubham95/fixes

Fixed CORS Handling

controllers/handle.go

@@ -24,12 +24,6 @@ func Handle(ctx *fasthttp.RequestCtx) {
 		Path:   path,
 	}
 
-	// add the cors headers
-	ctx.Response.Header.Add("Access-Control-Allow-Origin", "*")
-	ctx.Response.Header.Add("Access-Control-Allow-Credentials", "true")
-	ctx.Response.Header.Add("Access-Control-Allow-Headers", "*")
-	ctx.Response.Header.Add("Access-Control-Allow-Methods", "POST,HEAD,PATCH,OPTIONS,GET,PUT")
-
 	// try to fetch the mock
 	err := PersistenceView(&mock)
 	if err == nil {

router.go

@@ -17,11 +17,23 @@ func getFastHTTPHandler() fasthttp.RequestHandler {
 		Prefix: commons.ActuatorPrefix,
 	})
 	return actuatorCore.WrapFastHTTPHandler(func(ctx *fasthttp.RequestCtx) {
+		// actuator
 		if strings.HasPrefix(string(ctx.Path()), commons.ActuatorPrefix) && string(ctx.Method()) == http.MethodGet {
 			// this means it is an actuator endpoint
 			actuatorHandler(ctx)
 			return
 		}
+
+		// cors
+		ctx.Response.Header.Add("Access-Control-Allow-Origin", "*")
+		ctx.Response.Header.Add("Access-Control-Allow-Credentials", "true")
+		ctx.Response.Header.Add("Access-Control-Allow-Headers", "*")
+		ctx.Response.Header.Add("Access-Control-Allow-Methods", "POST,HEAD,PATCH,OPTIONS,GET,PUT")
+		if strings.ToUpper(string(ctx.Method())) == http.MethodOptions {
+			ctx.SetStatusCode(http.StatusNoContent)
+			return
+		}
+
 		switch string(ctx.Path()) {
 		case commons.BasePath:
 			handle(ctx, http.MethodGet, controllers.HandleBase)

version.json

@@ -1,4 +1,4 @@
 {
   "name": "moxy",
-  "version": "1.0.5"
+  "version": "1.0.6"
 }