fix: schemas encoding issue

ory · Oct 23, 2024 · 3a1503c · 3a1503c
1 parent 60e13b9
commit 3a1503c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/internal/client-go/go.sum b/internal/client-go/go.sum
@@ -4,6 +4,7 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/internal/client-go/model_identity_schema_container.go b/internal/client-go/model_identity_schema_container.go
diff --git a/internal/httpclient/model_identity_schema_container.go b/internal/httpclient/model_identity_schema_container.go
diff --git a/schema/handler.go b/schema/handler.go
@@ -71,6 +71,15 @@ func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) {
 //lint:ignore U1000 Used to generate Swagger and OpenAPI definitions
 type identitySchema json.RawMessage
 
+func (m identitySchema) MarshalJSON() ([]byte, error) {
+	return json.RawMessage(m).MarshalJSON()
+}
+
+func (m *identitySchema) UnmarshalJSON(data []byte) error {
+	mm := json.RawMessage(*m)
+	return mm.UnmarshalJSON(data)
+}
+
 // Get Identity JSON Schema Response
 //
 // swagger:parameters getIdentitySchema
@@ -151,7 +160,7 @@ type identitySchemaContainer struct {
 	// The ID of the Identity JSON Schema
 	ID string `json:"id"`
 	// The actual Identity JSON Schema
-	Schema identitySchema `json:"schema"`
+	Schema json.RawMessage `json:"schema"`
 }
 
 // List Identity JSON Schemas Response

diff --git a/schema/handler_test.go b/schema/handler_test.go
@@ -189,7 +189,7 @@ func TestHandler(t *testing.T) {
 		body := getFromTSPaginated(t, 0, 2, http.StatusOK)
 
 		var result []client.IdentitySchemaContainer
-		require.NoError(t, json.Unmarshal(body, &result))
+		require.NoError(t, json.Unmarshal(body, &result), "%s", body)
 
 		ids_orig := []string{}
 		for _, s := range schemas {

diff --git a/spec/api.json b/spec/api.json
@@ -1187,7 +1187,8 @@
             "type": "string"
           },
           "schema": {
-            "$ref": "#/components/schemas/identitySchema"
+            "description": "The actual Identity JSON Schema",
+            "type": "object"
           }
         },
         "type": "object"

diff --git a/spec/swagger.json b/spec/swagger.json
@@ -4319,7 +4319,8 @@
           "type": "string"
         },
         "schema": {
-          "$ref": "#/definitions/identitySchema"
+          "description": "The actual Identity JSON Schema",
+          "type": "object"
         }
       }
     },