wepala · RandyDeo · Mar 21, 2022 · Mar 16, 2022 · Mar 16, 2022 · Mar 18, 2022
diff --git a/controller/rest/fixtures/templates/index1.html b/controller/rest/fixtures/templates/index1.html
@@ -0,0 +1,4 @@
+{{ define "title" }}About{{ end }}
+
+
+{{ define "content" }}<p>About us page now</p>{{ end }}
diff --git a/controller/rest/fixtures/templates/index12.html b/controller/rest/fixtures/templates/index12.html
@@ -0,0 +1,4 @@
+{{ define "title" }}About{{ end }}
+
+
+{{ define "content" }}<p>About us page now</p>{{ end }}
diff --git a/controllers/rest/controller_standard.go b/controllers/rest/controller_standard.go
@@ -857,37 +857,15 @@ func DefaultResponseMiddleware(api *RESTAPI, projection projections.Projection,
 			} else if fileName != "" {
 				ctxt.File(fileName)
 			} else if len(templates) != 0 {
-				parameters := map[string]interface{}{}
-				for _, param := range operation.Parameters { //get parameter name to get from the context and add to map
-					name := param.Value.Name
-					if ctx.Value(name) == nil {
-						if tcontextName, ok := param.Value.ExtensionProps.Extensions[AliasExtension]; ok {
-							err := json.Unmarshal(tcontextName.(json.RawMessage), &name)
-							if err != nil {
-								api.e.Logger.Debugf("unexpected error finding parameter alias %s: %s ", name, err)
-								return NewControllerError(fmt.Sprintf("unexpected error finding parameter alias %s: %s ", name, err), nil, http.StatusBadRequest)
-
-							}
-						} else {
-							api.e.Logger.Debugf("unexpected error finding parameter alias %s ", name)
-							return NewControllerError(fmt.Sprintf("unexpected error finding parameter alias %s ", name), nil, http.StatusBadRequest)
-						}
-					}
-					if ctx.Value(name) == nil {
-						api.e.Logger.Debugf("unexpected error parameter %s not found ", name)
-						return NewControllerError(fmt.Sprintf("unexpected error parameter %s not found ", name), nil, http.StatusBadRequest)
-
-					}
-					parameters[name] = ctx.Value(name)
-				}
+				contextValues := ReturnContextValues(ctx)
 				t := template.New(path1.Base(templates[0]))
 				t, err := t.ParseFiles(templates...)
 				if err != nil {
 					api.e.Logger.Debugf("unexpected error %s ", err)
 					return NewControllerError(fmt.Sprintf("unexpected error %s ", err), err, http.StatusInternalServerError)
 
 				}
-				err = t.Execute(ctxt.Response().Writer, parameters)
+				err = t.Execute(ctxt.Response().Writer, contextValues)
 				if err != nil {
 					api.e.Logger.Debugf("unexpected error %s ", err)
 					return NewControllerError(fmt.Sprintf("unexpected error %s ", err), err, http.StatusInternalServerError)

diff --git a/controllers/rest/controller_standard_test.go b/controllers/rest/controller_standard_test.go
@@ -2268,7 +2268,7 @@ func TestStandardControllers_RenderTemplates(t *testing.T) {
 			t.Errorf("expected results to be %s got %s", expectResp, string(results))
 		}
 	})
-	t.Run("invalid go templates ", func(t *testing.T) {
+	t.Run("invalid endpoint since file doesnt exist ", func(t *testing.T) {
 		path := swagger.Paths.Find("/badtemplates")
 		resp := httptest.NewRecorder()
 		req := httptest.NewRequest(http.MethodGet, "/badtemplates", nil)
@@ -2282,18 +2282,29 @@ func TestStandardControllers_RenderTemplates(t *testing.T) {
 		response := resp.Result()
 		defer response.Body.Close()
 
-		expectResp := "<html>\n    <body>\n        <h1></h1>\n\n\n        \n    </body>\n</html>"
-
-		if response.StatusCode != http.StatusOK {
+		if response.StatusCode != http.StatusInternalServerError {
 			t.Errorf("expected response code to be %d, got %d", http.StatusOK, response.StatusCode)
 		}
-		results, err := io.ReadAll(response.Body)
-		if err != nil {
-			t.Errorf("unexpected error reading the response body: %s", err)
-		}
-		if !strings.Contains(expectResp, string(results)) {
-			t.Errorf("expected results to be %s got %s", expectResp, string(results))
+
+	})
+	t.Run("sending invalid template", func(t *testing.T) {
+		path := swagger.Paths.Find("/badtemplates1")
+		resp := httptest.NewRecorder()
+		req := httptest.NewRequest(http.MethodGet, "/badtemplates1", nil)
+		mw := rest.Context(restAPI, nil, nil, nil, nil, path, path.Get)
+		cResponseMiddleware := rest.ContentTypeResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
+		defaultMiddleware := rest.DefaultResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
+		controller := rest.DefaultResponseController(restAPI, nil, nil, nil, nil)
+		e.GET("/badtemplates1", controller, mw, cResponseMiddleware, defaultMiddleware)
+		e.ServeHTTP(resp, req)
+
+		response := resp.Result()
+		defer response.Body.Close()
+
+		if response.StatusCode != http.StatusInternalServerError {
+			t.Errorf("expected response code to be %d, got %d", http.StatusOK, response.StatusCode)
 		}
+
 	})
 }
 
@@ -2342,109 +2353,3 @@ func TestAPI_ContextZapLogger(t *testing.T) {
 		t.Errorf("expected the status code to be %d, got %d", 200, response.StatusCode)
 	}
 }
-
-func TestStandardControllers_RenderTemplates(t *testing.T) {
-	content, err := ioutil.ReadFile("./fixtures/blog.yaml")
-	if err != nil {
-		t.Fatalf("error loading api specification '%s'", err)
-	}
-	//change the $ref to another marker so that it doesn't get considered an environment variable WECON-1
-	tempFile := strings.ReplaceAll(string(content), "$ref", "__ref__")
-	//replace environment variables in file
-	tempFile = os.ExpandEnv(string(tempFile))
-	tempFile = strings.ReplaceAll(string(tempFile), "__ref__", "$ref")
-	//update path so that the open api way of specifying url parameters is change to the echo style of url parameters
-	re := regexp.MustCompile(`\{([a-zA-Z0-9\-_]+?)\}`)
-	tempFile = re.ReplaceAllString(tempFile, `:$1`)
-	content = []byte(tempFile)
-	loader := openapi3.NewSwaggerLoader()
-	swagger, err := loader.LoadSwaggerFromData(content)
-	if err != nil {
-		t.Fatalf("error loading api specification '%s'", err)
-	}
-	//instantiate api
-	e := echo.New()
-	restAPI := &rest.RESTAPI{}
-	restAPI.SetEchoInstance(e)
-
-	t.Run("specify html response with multiple files ", func(t *testing.T) {
-		path := swagger.Paths.Find("/multipletemplates")
-		resp := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, "/multipletemplates", nil)
-		mw := rest.Context(restAPI, nil, nil, nil, nil, path, path.Get)
-		cResponseMiddleware := rest.ContentTypeResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		defaultMiddleware := rest.DefaultResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		controller := rest.DefaultResponseController(restAPI, nil, nil, nil, nil)
-		e.GET("/multipletemplates", controller, mw, cResponseMiddleware, defaultMiddleware)
-		e.ServeHTTP(resp, req)
-
-		response := resp.Result()
-		defer response.Body.Close()
-		expectResp := "<html>\n    <body>\n        <h1>About</h1>\n\n\n        \n<p>About us page now</p>\n\n    </body>\n</html>"
-
-		if response.StatusCode != http.StatusOK {
-			t.Errorf("expected response code to be %d, got %d", http.StatusOK, response.StatusCode)
-		}
-		results, err := io.ReadAll(response.Body)
-		if err != nil {
-			t.Errorf("unexpected error reading the response body: %s", err)
-		}
-		if !strings.Contains(expectResp, string(results)) {
-			t.Errorf("expected results to be %s got %s", expectResp, string(results))
-		}
-	})
-	t.Run("rendering go template with data in the context ", func(t *testing.T) {
-		path := swagger.Paths.Find("/templates")
-		resp := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, "/templates?title=Test&content=LoremIpsum", nil)
-		mw := rest.Context(restAPI, nil, nil, nil, nil, path, path.Get)
-		cResponseMiddleware := rest.ContentTypeResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		defaultMiddleware := rest.DefaultResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		controller := rest.DefaultResponseController(restAPI, nil, nil, nil, nil)
-		e.GET("/templates", controller, mw, cResponseMiddleware, defaultMiddleware)
-		e.ServeHTTP(resp, req)
-
-		response := resp.Result()
-		defer response.Body.Close()
-		expectResp := "<html>\n    <body>\n        <h1>Test</h1>\n\n\n        LoremIpsum\n    </body>\n</html>"
-
-		if response.StatusCode != http.StatusOK {
-			t.Errorf("expected response code to be %d, got %d", http.StatusOK, response.StatusCode)
-		}
-		results, err := io.ReadAll(response.Body)
-		if err != nil {
-			t.Errorf("unexpected error reading the response body: %s", err)
-		}
-		if !strings.Contains(expectResp, string(results)) {
-			t.Errorf("expected results to be %s got %s", expectResp, string(results))
-		}
-	})
-	t.Run("invalid go templates ", func(t *testing.T) {
-		path := swagger.Paths.Find("/badtemplates")
-		resp := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, "/badtemplates", nil)
-		mw := rest.Context(restAPI, nil, nil, nil, nil, path, path.Get)
-		cResponseMiddleware := rest.ContentTypeResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		defaultMiddleware := rest.DefaultResponseMiddleware(restAPI, nil, nil, nil, nil, path, path.Get)
-		controller := rest.DefaultResponseController(restAPI, nil, nil, nil, nil)
-		e.GET("/badtemplates", controller, mw, cResponseMiddleware, defaultMiddleware)
-		e.ServeHTTP(resp, req)
-
-		response := resp.Result()
-		defer response.Body.Close()
-
-		expectResp := "<html>\n    <body>\n        <h1></h1>\n\n\n        \n    </body>\n</html>"
-
-		if response.StatusCode != http.StatusOK {
-			t.Errorf("expected response code to be %d, got %d", http.StatusOK, response.StatusCode)
-		}
-		results, err := io.ReadAll(response.Body)
-		if err != nil {
-			t.Errorf("unexpected error reading the response body: %s", err)
-		}
-		if !strings.Contains(expectResp, string(results)) {
-			t.Errorf("expected results to be %s got %s", expectResp, string(results))
-		}
-	})
-
-}
diff --git a/controllers/rest/fixtures/blog.yaml b/controllers/rest/fixtures/blog.yaml
@@ -188,7 +188,19 @@ paths:
         200:
           description: Homepage
           x-templates:
-            - ./fixtures/templates/base1.html
+            - ./fixtures/templates/base12.html
+        404:
+          description: File not found
+        402:
+          description: User not authenticated
+  /badtemplates1:
+    get:
+      operationId: getAsset
+      responses:
+        200:
+          description: Homepage
+          x-templates:
+            - ./fixtures/templates/badTem.html
         404:
           description: File not found
         402:
@@ -340,8 +352,7 @@ paths:
         _filters:
           - field: status
             operator: eq
-            value:
-              - Active
+            value: Active
           - field: lastUpdated
             operator: between
             values:

diff --git a/controllers/rest/fixtures/templates/badTem.html b/controllers/rest/fixtures/templates/badTem.html
@@ -0,0 +1,8 @@
+
+<hea>
+
+    <title> {{ template "content123wh" }}</title>
+
+<body>
+
+</body>
diff --git a/controllers/rest/fixtures/templates/base2.html b/controllers/rest/fixtures/templates/base2.html
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <h1>{{ template "title" }}</h1>
+
+
+    {{ template "content" }}
+  </body>
+</html>
diff --git a/controllers/rest/fixtures/templates/base3.html b/controllers/rest/fixtures/templates/base3.html
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <h1>{{.title}}</h1>
+
+
+    {{.content}}
+  </body>
+</html>
diff --git a/controllers/rest/fixtures/templates/index1.html b/controllers/rest/fixtures/templates/index1.html
@@ -0,0 +1,4 @@
+{{ define "title" }}About{{ end }}
+
+
+{{ define "content" }}<p>About us page now</p>{{ end }}
diff --git a/controllers/rest/operation_initializers_test.go b/controllers/rest/operation_initializers_test.go
@@ -382,3 +382,14 @@ func TestRouteInitializer(t *testing.T) {
 		}
 	})
 }
+
+func TestGettersForOperationFunctions(t *testing.T) {
+	ctx := context.Background()
+
+	t.Run("getting schema builder sending empty context", func(t *testing.T) {
+		builders := rest.GetSchemaBuilders(ctx)
+		if builders == nil {
+			t.Errorf("unexpected error expected map of builders to be returned got nil")
+		}
+	})
+}
diff --git a/controllers/rest/utils.go b/controllers/rest/utils.go
@@ -3,13 +3,16 @@ package rest
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
+	"reflect"
 	"strconv"
 	"strings"
+	"unsafe"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
@@ -343,3 +346,31 @@ func JSONMarshal(t interface{}) ([]byte, error) {
 	result = bytes.ReplaceAll(result, []byte(`\t`), []byte(""))
 	return result, err
 }
+
+//ReturnContextValues pulls out all the values stored in the context and adds it to a map to be returned
+func ReturnContextValues(ctxt interface{}) map[interface{}]interface{} {
+	contextValues := map[interface{}]interface{}{}
+	contextKeys := []interface{}{}
+	contextV := reflect.ValueOf(ctxt).Elem()
+	contextK := reflect.TypeOf(ctxt).Elem()
+	if contextK.Kind() == reflect.Struct {
+		for i := 0; i < contextV.NumField(); i++ {
+			reflectValue := contextV.Field(i)
+			reflectValue = reflect.NewAt(reflectValue.Type(), unsafe.Pointer(reflectValue.UnsafeAddr())).Elem()
+			reflectField := contextK.Field(i)
+
+			if reflectField.Name == "Context" {
+				contextVals := ReturnContextValues(reflectValue.Interface())
+				for key, value := range contextVals {
+					contextValues[key] = value
+				}
+			} else if reflectField.Name == "key" {
+				contextKeys = append(contextKeys, reflectValue.Interface())
+			}
+		}
+	}
+	for _, cKeys := range contextKeys {
+		contextValues[cKeys] = ctxt.(context.Context).Value(cKeys)
+	}
+	return contextValues
+}
diff --git a/end2end_test.go b/end2end_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	weosContext "github.com/wepala/weos/context"
+	"io"
 	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
@@ -1574,7 +1574,6 @@ func theResponseBodyShouldBe(expectResp *godog.DocString) error {
 	if err != nil {
 		return err
 	}
-
 	if !strings.Contains(expectResp.Content, string(results)) {
 		if bytes.Compare(results, exp) != 0 {
 			return fmt.Errorf("expected response to be %s, got %s", results, exp)