Refactoring

build/go-generate/updateApiRouting.go

@@ -132,12 +132,9 @@ func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
 						case "string":
 							method += fmt.Sprintf(`
 							if (exists) {
-								p.%s, err = parseHeaderString(r, %s)
-								if err != nil {
-									return fmt.Errorf("invalid value in header %s supplied")
-								}
+								p.%s = r.Header.Get(%s)
 							}
-							`, field.Names[0].Name, headerName, strings.Replace(headerName, "\"", "", -1))
+							`, field.Names[0].Name, headerName)
 
 						case "bool":
 							method += fmt.Sprintf(`
@@ -177,7 +174,6 @@ func generateParseRequestMethod(typeName string, fields []*ast.Field) string {
 			}
 		}
 	}
-
 	method += "\nreturn p.ProcessParameter(r)\n}\n"
 	method += writeNewInstanceCode(typeName)
 

internal/webserver/api/routing.go

@@ -147,9 +147,11 @@ func getRouting(requestUrl string) (apiRoute, bool) {
 }
 
 type requestParser interface {
-	ProcessParameter(r *http.Request) error
-	// ParseRequest reads the supplied headers
+	// ParseRequest reads the supplied headers, stores them and afterwards calls ProcessParameter()
 	ParseRequest(r *http.Request) error
+	// ProcessParameter goes through the submitted parameters, checks them and converts them to expected values
+	ProcessParameter(r *http.Request) error
+	// New returns an empty struct of the type
 	New() requestParser
 }
 
@@ -448,10 +450,6 @@ func checkHeaderExists(r *http.Request, key string, isRequired bool) (bool, erro
 	return exists, nil
 }
 
-func parseHeaderString(r *http.Request, key string) (string, error) {
-	return r.Header.Get(key), nil
-}
-
 func parseHeaderBool(r *http.Request, key string) (bool, error) {
 	value, err := strconv.ParseBool(r.Header.Get(key))
 	if err != nil {