Add Workaround for inconsistent API Response

passbolt · Nov 24, 2023 · e13f484 · e13f484
1 parent 360cc37
commit e13f484
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/api/resource_types.go b/api/resource_types.go
@@ -8,12 +8,12 @@ import (
 
 // ResourceType is the Type of a Resource
 type ResourceType struct {
-	ID          string `json:"id,omitempty"`
-	Slug        string `json:"slug,omitempty"`
-	Description string `json:"description,omitempty"`
-	Definition  string `json:"definition,omitempty"`
-	Created     *Time  `json:"created,omitempty"`
-	Modified    *Time  `json:"modified,omitempty"`
+	ID          string          `json:"id,omitempty"`
+	Slug        string          `json:"slug,omitempty"`
+	Description string          `json:"description,omitempty"`
+	Definition  json.RawMessage `json:"definition,omitempty"`
+	Created     *Time           `json:"created,omitempty"`
+	Modified    *Time           `json:"modified,omitempty"`
 }
 
 type ResourceTypeSchema struct {

diff --git a/helper/util.go b/helper/util.go
@@ -41,7 +41,22 @@ func validateSecretData(rType *api.ResourceType, secretData string) error {
 	var schemaDefinition api.ResourceTypeSchema
 	err := json.Unmarshal([]byte(rType.Definition), &schemaDefinition)
 	if err != nil {
-		return fmt.Errorf("Unmarshal Json Schema: %w", err)
+		// Workaround for inconsistant API Responses where sometime the Schema is embedded directly and sometimes it's escaped as a string
+		if err.Error() == "json: cannot unmarshal string into Go value of type api.ResourceTypeSchema" {
+			var tmp string
+			err = json.Unmarshal([]byte(rType.Definition), &tmp)
+			if err != nil {
+				return fmt.Errorf("Workaround Unmarshal Json Schema String: %w", err)
+			}
+
+			err = json.Unmarshal([]byte(tmp), &schemaDefinition)
+			if err != nil {
+				return fmt.Errorf("Workaround Unmarshal Json Schema: %w", err)
+			}
+
+		} else {
+			return fmt.Errorf("Unmarshal Json Schema: %w", err)
+		}
 	}
 
 	comp := jsonschema.NewCompiler()