added CORS methods

Author: KenWilliamson

coverage.out

@@ -1,4 +1,8 @@
 mode: set
+github.com/GolangToolKits/grrt/router.go:25.25,28.2 2 1
+github.com/GolangToolKits/grrt/router.go:31.46,33.49 2 1
+github.com/GolangToolKits/grrt/router.go:36.2,36.12 1 1
+github.com/GolangToolKits/grrt/router.go:33.49,35.3 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:28.32,32.2 3 1
 github.com/GolangToolKits/grrt/reqRoute.go:35.56,36.14 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:39.2,39.10 1 1
@@ -88,51 +92,57 @@ github.com/GolangToolKits/grrt/reqRoute.go:273.14,274.41 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:274.41,276.4 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:278.8,280.3 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:284.55,288.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:28.70,34.15 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:42.2,42.33 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:34.15,37.22 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:37.22,40.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:42.33,44.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:44.8,44.42 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:44.42,46.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:46.8,49.3 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:53.37,57.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:60.68,63.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:77.2,77.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:63.16,65.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:65.8,67.28 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:73.3,73.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:67.28,68.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:68.55,71.5 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:73.12,75.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:81.94,84.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:98.2,98.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:84.16,86.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:86.8,88.28 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:94.3,94.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:88.28,89.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:89.55,92.5 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:94.12,96.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:102.48,105.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:108.2,108.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:105.16,107.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:111.48,115.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:117.69,125.23 8 1
-github.com/GolangToolKits/grrt/reqRouter.go:146.2,146.19 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:125.23,126.13 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:131.3,133.17 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:126.13,127.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:128.9,128.19 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:128.19,129.9 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:133.17,134.28 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:134.28,135.38 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:135.38,139.11 4 1
-github.com/GolangToolKits/grrt/reqRouter.go:142.9,144.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:149.95,151.36 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:156.2,157.27 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:151.36,152.32 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:152.32,154.4 1 1
-github.com/GolangToolKits/grrt/router.go:19.25,22.2 2 1
-github.com/GolangToolKits/grrt/router.go:25.46,27.49 2 1
-github.com/GolangToolKits/grrt/router.go:30.2,30.12 1 1
-github.com/GolangToolKits/grrt/router.go:27.49,29.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:31.70,37.15 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:45.2,45.33 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:37.15,40.22 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:40.22,43.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:45.33,47.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:47.8,47.42 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:47.42,49.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:49.8,52.3 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:56.37,60.2 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:63.68,66.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:80.2,80.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:66.16,68.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:68.8,70.28 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:76.3,76.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:70.28,71.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:71.55,74.5 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:76.12,78.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:84.94,87.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:101.2,101.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:87.16,89.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:89.8,91.28 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:97.3,97.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:91.28,92.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:92.55,95.5 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:97.12,99.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:105.48,108.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:111.2,111.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:108.16,110.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:115.33,117.2 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:120.56,121.28 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:121.28,123.20 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:126.3,126.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:123.20,124.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:131.53,133.2 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:136.53,137.28 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:137.28,139.20 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:142.3,142.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:139.20,140.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:146.48,150.2 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:152.69,160.23 8 1
+github.com/GolangToolKits/grrt/reqRouter.go:181.2,181.19 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:160.23,161.13 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:166.3,168.17 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:161.13,162.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:163.9,163.19 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:163.19,164.9 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:168.17,169.28 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:169.28,170.38 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:170.38,174.11 4 1
+github.com/GolangToolKits/grrt/reqRouter.go:177.9,179.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:184.95,186.36 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:191.2,192.27 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:186.36,187.32 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:187.32,189.4 1 1

reqRouter.go

@@ -19,9 +19,12 @@ const (
 
 // ReqRouter RequestRouter
 type ReqRouter struct {
-	namedRoutes  map[string]*[]Route
-	prefixRoutes map[string]Route
-	corsEnabled  bool
+	namedRoutes    map[string]*[]Route
+	prefixRoutes   map[string]Route
+	corsEnabled    bool
+	allowedHeaders []string
+	allowedOrigins []string
+	allowedMethods []string
 }
 
 // ServeHTTP ServeHTTP dispatches the handler registered in the matched route.
@@ -113,6 +116,33 @@ func (t ReqRouter) EnableCORS() {
 	t.corsEnabled = true
 }
 
+// SetAllowedHeaders SetAllowedHeaders
+func (t ReqRouter) SetAllowedHeaders(headers []string) {
+	for _, v := range headers {
+		nHeader := http.CanonicalHeaderKey(strings.TrimSpace(v))
+		if nHeader == "" {
+			continue
+		}
+		t.allowedHeaders = append(t.allowedHeaders, nHeader)
+	}
+}
+
+// AllowedOrigins AllowedOrigins
+func (t ReqRouter) AllowedOrigins(origins []string) {
+	t.allowedOrigins = origins
+}
+
+// AllowedMethods AllowedMethods
+func (t ReqRouter) AllowedMethods(methods []string) {
+	for _, v := range methods {
+		nMethod := strings.ToUpper(strings.TrimSpace(v))
+		if nMethod == "" {
+			continue
+		}
+		t.allowedMethods = append(t.allowedMethods, nMethod)
+	}
+}
+
 func (t ReqRouter) findPrefix(px string) Route {
 	var rtn Route
 	rtn = t.prefixRoutes[px]

reqRouter_test.go

@@ -740,3 +740,168 @@ func TestReqRouter_findPrefix(t *testing.T) {
 		})
 	}
 }
+
+func TestReqRouter_SetAllowedHeaders(t *testing.T) {
+	type fields struct {
+		namedRoutes    map[string]*[]Route
+		prefixRoutes   map[string]Route
+		corsEnabled    bool
+		allowedHeaders []string
+		allowedOrigins []string
+		allowedMethods []string
+	}
+	type args struct {
+		headers []string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		// TODO: Add test cases.
+		{
+			name: "test 1",
+			fields: fields{
+				allowedHeaders: []string{"Content-Type"},
+			},
+			args: args{
+				headers: []string{"Content-Type", ""},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tr := ReqRouter{
+				namedRoutes:    tt.fields.namedRoutes,
+				prefixRoutes:   tt.fields.prefixRoutes,
+				corsEnabled:    tt.fields.corsEnabled,
+				allowedHeaders: tt.fields.allowedHeaders,
+				allowedOrigins: tt.fields.allowedOrigins,
+				allowedMethods: tt.fields.allowedMethods,
+			}
+			tr.SetAllowedHeaders(tt.args.headers)
+		})
+	}
+}
+
+func TestReqRouter_EnableCORS(t *testing.T) {
+	type fields struct {
+		namedRoutes    map[string]*[]Route
+		prefixRoutes   map[string]Route
+		corsEnabled    bool
+		allowedHeaders []string
+		allowedOrigins []string
+		allowedMethods []string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+	}{
+		// TODO: Add test cases.
+		{
+			name: "test 1",
+			fields: fields{
+				corsEnabled: true,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tr := ReqRouter{
+				namedRoutes:    tt.fields.namedRoutes,
+				prefixRoutes:   tt.fields.prefixRoutes,
+				corsEnabled:    tt.fields.corsEnabled,
+				allowedHeaders: tt.fields.allowedHeaders,
+				allowedOrigins: tt.fields.allowedOrigins,
+				allowedMethods: tt.fields.allowedMethods,
+			}
+			tr.EnableCORS()
+		})
+	}
+}
+
+func TestReqRouter_AllowedOrigins(t *testing.T) {
+	type fields struct {
+		namedRoutes    map[string]*[]Route
+		prefixRoutes   map[string]Route
+		corsEnabled    bool
+		allowedHeaders []string
+		allowedOrigins []string
+		allowedMethods []string
+	}
+	type args struct {
+		origins []string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		// TODO: Add test cases.
+		{
+			name: "test 1",
+			fields: fields{
+				allowedOrigins: []string{"test"},
+			},
+			args: args{
+				origins: []string{"*"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tr := ReqRouter{
+				namedRoutes:    tt.fields.namedRoutes,
+				prefixRoutes:   tt.fields.prefixRoutes,
+				corsEnabled:    tt.fields.corsEnabled,
+				allowedHeaders: tt.fields.allowedHeaders,
+				allowedOrigins: tt.fields.allowedOrigins,
+				allowedMethods: tt.fields.allowedMethods,
+			}
+			tr.AllowedOrigins(tt.args.origins)
+		})
+	}
+}
+
+func TestReqRouter_AllowedMethods(t *testing.T) {
+	type fields struct {
+		namedRoutes    map[string]*[]Route
+		prefixRoutes   map[string]Route
+		corsEnabled    bool
+		allowedHeaders []string
+		allowedOrigins []string
+		allowedMethods []string
+	}
+	type args struct {
+		methods []string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		// TODO: Add test cases.
+		{
+			name: "test 1",
+			fields: fields{
+				allowedMethods: []string{},
+			},
+			args: args{
+				methods: []string{"POST", ""},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tr := ReqRouter{
+				namedRoutes:    tt.fields.namedRoutes,
+				prefixRoutes:   tt.fields.prefixRoutes,
+				corsEnabled:    tt.fields.corsEnabled,
+				allowedHeaders: tt.fields.allowedHeaders,
+				allowedOrigins: tt.fields.allowedOrigins,
+				allowedMethods: tt.fields.allowedMethods,
+			}
+			tr.AllowedMethods(tt.args.methods)
+		})
+	}
+}

router.go

@@ -16,6 +16,9 @@ type Router interface {
 
 	//CORS methods
 	EnableCORS()
+	SetAllowedHeaders(headers []string)
+	AllowedOrigins(origins []string)
+	AllowedMethods(methods []string)
 }
 
 // NewRouter NewRouter creates new Router