Move schemars to workspace dependencies

Also enables the `preserve_order` feature, hence the big schema output diff.

Cargo.lock

@@ -5054,6 +5054,7 @@ checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "chrono",
  "dyn-clone",
+ "indexmap 1.9.3",
  "schemars_derive",
  "serde",
  "serde_json",

Cargo.toml

@@ -86,6 +86,11 @@ version = "1.0.12"
 [workspace.dependencies.rand]
 version = "0.8.5"
 
+# JSON Schema generation
+[workspace.dependencies.schemars]
+version = "0.8.16"
+features = ["url", "chrono", "preserve_order"]
+
 # Serialization and deserialization
 [workspace.dependencies.serde]
 version = "1.0.196"

crates/config/Cargo.toml

@@ -23,7 +23,7 @@ camino = { workspace = true, features = ["serde1"] }
 chrono.workspace = true
 figment = { version = "0.10.14", features = ["env", "yaml", "test"] }
 ipnetwork = { version = "0.20.0", features = ["serde", "schemars"] }
-schemars = { version = "0.8.16", features = ["url", "chrono"] }
+schemars.workspace = true
 ulid.workspace = true
 url.workspace = true
 

crates/iana/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 serde = { workspace = true, optional = true }
-schemars = { version = "0.8.16", default-features = false, optional = true }
+schemars = { workspace = true, optional = true }
 
 [features]
 default = ["serde", "schemars"]

crates/jose/Cargo.toml

@@ -24,7 +24,7 @@ p256 = { version = "0.13.2", features = ["ecdsa"] }
 p384 = { version = "0.13.0", features = ["ecdsa"] }
 rand.workspace = true
 rsa = "0.9.6"
-schemars = "0.8.16"
+schemars.workspace = true
 sec1 = "0.7.3"
 serde.workspace = true
 serde_json.workspace = true

crates/policy/Cargo.toml

@@ -16,7 +16,7 @@ anyhow.workspace = true
 opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
 serde.workspace = true
 serde_json.workspace = true
-schemars = {version = "0.8.16", optional = true }
+schemars = { workspace = true, optional = true }
 thiserror.workspace = true
 tokio = { version = "1.35.1", features = ["io-util", "rt"] }
 tracing.workspace = true

policies/schema/authorization_grant_input.json

@@ -9,19 +9,19 @@
     "scope"
   ],
   "properties": {
+    "user": {
+      "type": "object",
+      "additionalProperties": true
+    },
     "client": {
       "type": "object",
       "additionalProperties": true
     },
-    "grant_type": {
-      "$ref": "#/definitions/GrantType"
-    },
     "scope": {
       "type": "string"
     },
-    "user": {
+    "grant_type": {
-      "type": "object",
+      "$ref": "#/definitions/GrantType"
-      "additionalProperties": true
     }
   },
   "definitions": {

policies/schema/register_input.json

@@ -12,12 +12,6 @@
         "username"
       ],
       "properties": {
-        "email": {
-          "type": "string"
-        },
-        "password": {
-          "type": "string"
-        },
         "registration_method": {
           "type": "string",
           "enum": [
@@ -26,6 +20,12 @@
         },
         "username": {
           "type": "string"
+        },
+        "password": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
         }
       }
     },
@@ -36,9 +36,6 @@
         "username"
       ],
       "properties": {
-        "email": {
-          "type": "string"
-        },
         "registration_method": {
           "type": "string",
           "enum": [
@@ -47,6 +44,9 @@
         },
         "username": {
           "type": "string"
+        },
+        "email": {
+          "type": "string"
         }
       }
     }