Merge pull request #62 from silinternational/develop

Release 2.1.2 - remove CORS middleware

server/main.go

@@ -13,9 +13,7 @@ import (
 	mfa "github.com/silinternational/serverless-mfa-api-go"
 )
 
-var (
-	envConfig mfa.EnvConfig
-)
+var envConfig mfa.EnvConfig
 
 func main() {
 	log.SetOutput(os.Stdout)
@@ -31,7 +29,7 @@ func main() {
 	// ListenAndServe starts an HTTP server with a given address and
 	// handler defined in NewRouter.
 	log.Println("Starting service on port 8080")
-	router := newRouter([]mux.MiddlewareFunc{corsMiddleware})
+	router := newRouter()
 	log.Fatal(http.ListenAndServe(":8080", router))
 }
 
@@ -88,15 +86,10 @@ var routes = []route{
 }
 
 // newRouter forms a new mux router, see https://github.com/gorilla/mux.
-func newRouter(mws []mux.MiddlewareFunc) *mux.Router {
+func newRouter() *mux.Router {
 	// Create a basic router.
 	router := mux.NewRouter().StrictSlash(true)
 
-	// attach any extra middleware
-	for _, mw := range mws {
-		router.Use(mw)
-	}
-
 	// authenticate request based on api key and secret in headers
 	// also adds user to context
 	router.Use(authenticationMiddleware)

u2fserver/main.go

@@ -12,9 +12,7 @@ import (
 	u2fsim "github.com/silinternational/serverless-mfa-api-go/u2fsimulator"
 )
 
-var (
-	envConfig mfa.EnvConfig
-)
+var envConfig mfa.EnvConfig
 
 func main() {
 	log.SetOutput(os.Stdout)
@@ -23,7 +21,7 @@ func main() {
 	// ListenAndServe starts an HTTP server with a given address and
 	// handler defined in NewRouter.
 	log.Println("Starting service on port 8080")
-	router := newRouter(nil)
+	router := newRouter()
 	log.Fatal(http.ListenAndServe(":8080", router))
 }
 
@@ -47,7 +45,7 @@ var routes = []route{
 }
 
 // newRouter forms a new mux router, see https://github.com/gorilla/mux.
-func newRouter(mws []mux.MiddlewareFunc) *mux.Router {
+func newRouter() *mux.Router {
 	// Create a basic router.
 	router := mux.NewRouter().StrictSlash(true)