diff --git a/persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json b/persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json index 2d6996ff332..b7f4f31b6ad 100644 --- a/persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json +++ b/persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json @@ -1,7 +1,7 @@ { "id": "196d8c1e-4f04-40f0-94b3-5ec43996b28a", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json b/persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json index 616cdd15027..106bc39c785 100644 --- a/persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json +++ b/persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json @@ -1,7 +1,7 @@ { "id": "2ae6a5a7-2983-49e7-a4d8-7740b37c88cb", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "d7b10@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json b/persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json index ac8e011406f..120e8ea08af 100644 --- a/persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json +++ b/persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json @@ -1,7 +1,7 @@ { "id": "359963ec-b09b-4ea0-aece-fb4dd95f304a", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "d7b11@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json b/persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json index 6d15a49d7fc..b6e9ed0bc41 100644 --- a/persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json +++ b/persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json @@ -1,7 +1,7 @@ { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json b/persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json index a47b50a5b18..9baa12f444d 100644 --- a/persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json +++ b/persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json @@ -1,7 +1,7 @@ { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json b/persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json index 22d408245a3..bc860b29d0b 100644 --- a/persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json +++ b/persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json @@ -1,7 +1,7 @@ { "id": "d7b9addb-ac15-4bc2-9fa5-562e0bf48755", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "d7b9@ory.sh" diff --git a/persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json b/persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json index bc51a073c71..4ccac7db35f 100644 --- a/persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json +++ b/persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json @@ -1,7 +1,7 @@ { "id": "ed253b2c-48ed-4c58-9b6f-1dc963c30a66", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/session/7458af86-c1d8-401c-978a-8da89133f78b.json b/persistence/sql/migratest/fixtures/session/7458af86-c1d8-401c-978a-8da89133f78b.json index 9766cccc1f0..6c62ae6a75e 100644 --- a/persistence/sql/migratest/fixtures/session/7458af86-c1d8-401c-978a-8da89133f78b.json +++ b/persistence/sql/migratest/fixtures/session/7458af86-c1d8-401c-978a-8da89133f78b.json @@ -18,7 +18,7 @@ "identity": { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/session/8571e374-38f2-4f46-8ad3-b9d914e174d3.json b/persistence/sql/migratest/fixtures/session/8571e374-38f2-4f46-8ad3-b9d914e174d3.json index aab301fa70c..8f806931467 100644 --- a/persistence/sql/migratest/fixtures/session/8571e374-38f2-4f46-8ad3-b9d914e174d3.json +++ b/persistence/sql/migratest/fixtures/session/8571e374-38f2-4f46-8ad3-b9d914e174d3.json @@ -14,7 +14,7 @@ "identity": { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/session/dcde5aaa-f789-4d3d-ae1f-76da8d57e67c.json b/persistence/sql/migratest/fixtures/session/dcde5aaa-f789-4d3d-ae1f-76da8d57e67c.json index ced9f1334cc..95b62a5d8f6 100644 --- a/persistence/sql/migratest/fixtures/session/dcde5aaa-f789-4d3d-ae1f-76da8d57e67c.json +++ b/persistence/sql/migratest/fixtures/session/dcde5aaa-f789-4d3d-ae1f-76da8d57e67c.json @@ -14,7 +14,7 @@ "identity": { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/session/f38cdebe-e567-42c9-a562-1bd4dee40998.json b/persistence/sql/migratest/fixtures/session/f38cdebe-e567-42c9-a562-1bd4dee40998.json index 2ff9eface32..ec1a51759fc 100644 --- a/persistence/sql/migratest/fixtures/session/f38cdebe-e567-42c9-a562-1bd4dee40998.json +++ b/persistence/sql/migratest/fixtures/session/f38cdebe-e567-42c9-a562-1bd4dee40998.json @@ -14,7 +14,7 @@ "identity": { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/194c5b05-0487-4a11-bcbc-f301c9ff9678.json b/persistence/sql/migratest/fixtures/settings_flow/194c5b05-0487-4a11-bcbc-f301c9ff9678.json index bc1d0550475..7f2f9f2f213 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/194c5b05-0487-4a11-bcbc-f301c9ff9678.json +++ b/persistence/sql/migratest/fixtures/settings_flow/194c5b05-0487-4a11-bcbc-f301c9ff9678.json @@ -12,7 +12,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/19ede218-928c-4e02-ab49-b76e12b34f31.json b/persistence/sql/migratest/fixtures/settings_flow/19ede218-928c-4e02-ab49-b76e12b34f31.json index 07c740c55de..0e0f30c7688 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/19ede218-928c-4e02-ab49-b76e12b34f31.json +++ b/persistence/sql/migratest/fixtures/settings_flow/19ede218-928c-4e02-ab49-b76e12b34f31.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/21c5f714-3089-49d2-b387-f244d4dd9e00.json b/persistence/sql/migratest/fixtures/settings_flow/21c5f714-3089-49d2-b387-f244d4dd9e00.json index 4da4a77e0ab..4a07c3a40ee 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/21c5f714-3089-49d2-b387-f244d4dd9e00.json +++ b/persistence/sql/migratest/fixtures/settings_flow/21c5f714-3089-49d2-b387-f244d4dd9e00.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/74fd6c53-7651-453e-90b8-2c5adbf911bb.json b/persistence/sql/migratest/fixtures/settings_flow/74fd6c53-7651-453e-90b8-2c5adbf911bb.json index 21a60549296..71c6c2d761a 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/74fd6c53-7651-453e-90b8-2c5adbf911bb.json +++ b/persistence/sql/migratest/fixtures/settings_flow/74fd6c53-7651-453e-90b8-2c5adbf911bb.json @@ -12,7 +12,7 @@ "identity": { "id": "5ff66179-c240-4703-b0d8-494592cefff5", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "bazbar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/77fe4fb3-2d4e-4532-b568-c44b0aece0aa.json b/persistence/sql/migratest/fixtures/settings_flow/77fe4fb3-2d4e-4532-b568-c44b0aece0aa.json index 85187d50bdc..ea1be0f8947 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/77fe4fb3-2d4e-4532-b568-c44b0aece0aa.json +++ b/persistence/sql/migratest/fixtures/settings_flow/77fe4fb3-2d4e-4532-b568-c44b0aece0aa.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/8248bb5d-8ef7-45e3-8e07-9e2003dd5352.json b/persistence/sql/migratest/fixtures/settings_flow/8248bb5d-8ef7-45e3-8e07-9e2003dd5352.json index 1928b0ac98b..2e781c81dfb 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/8248bb5d-8ef7-45e3-8e07-9e2003dd5352.json +++ b/persistence/sql/migratest/fixtures/settings_flow/8248bb5d-8ef7-45e3-8e07-9e2003dd5352.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/90b4f970-b9ae-42bc-a0a7-73ec750e0aa1.json b/persistence/sql/migratest/fixtures/settings_flow/90b4f970-b9ae-42bc-a0a7-73ec750e0aa1.json index d7da01c6a3c..3d6d58ba6cc 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/90b4f970-b9ae-42bc-a0a7-73ec750e0aa1.json +++ b/persistence/sql/migratest/fixtures/settings_flow/90b4f970-b9ae-42bc-a0a7-73ec750e0aa1.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/a79bfcf1-68ae-49de-8b23-4f96921b8341.json b/persistence/sql/migratest/fixtures/settings_flow/a79bfcf1-68ae-49de-8b23-4f96921b8341.json index f432bae62c8..02c81d878a8 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/a79bfcf1-68ae-49de-8b23-4f96921b8341.json +++ b/persistence/sql/migratest/fixtures/settings_flow/a79bfcf1-68ae-49de-8b23-4f96921b8341.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/aeba85bd-1a8c-44bf-8fc3-3be83c01a3dc.json b/persistence/sql/migratest/fixtures/settings_flow/aeba85bd-1a8c-44bf-8fc3-3be83c01a3dc.json index d170900f6b8..bd847b0de81 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/aeba85bd-1a8c-44bf-8fc3-3be83c01a3dc.json +++ b/persistence/sql/migratest/fixtures/settings_flow/aeba85bd-1a8c-44bf-8fc3-3be83c01a3dc.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/persistence/sql/migratest/fixtures/settings_flow/cdfd1eed-34a4-491d-ad0a-7579d3a0a7ba.json b/persistence/sql/migratest/fixtures/settings_flow/cdfd1eed-34a4-491d-ad0a-7579d3a0a7ba.json index 58d0139f4af..9273d770733 100644 --- a/persistence/sql/migratest/fixtures/settings_flow/cdfd1eed-34a4-491d-ad0a-7579d3a0a7ba.json +++ b/persistence/sql/migratest/fixtures/settings_flow/cdfd1eed-34a4-491d-ad0a-7579d3a0a7ba.json @@ -13,7 +13,7 @@ "identity": { "id": "a251ebc2-880c-4f76-a8f3-38e6940eab0e", "schema_id": "default", - "schema_url": "https://www.ory.sh/schemas/default", + "schema_url": "https://www.ory.sh/schemas/ZGVmYXVsdA", "state": "active", "traits": { "email": "foobar@ory.sh" diff --git a/schema/handler.go b/schema/handler.go index 3639b214780..525e7be622a 100644 --- a/schema/handler.go +++ b/schema/handler.go @@ -91,14 +91,18 @@ func (h *Handler) getByID(w http.ResponseWriter, r *http.Request, ps httprouter. } id := ps.ByName("id") - if dec, err := base64.RawURLEncoding.DecodeString(ps.ByName("id")); err == nil { - id = string(dec) - } - s, err := ss.GetByID(id) if err != nil { - h.r.Writer().WriteError(w, r, errors.WithStack(herodot.ErrNotFound.WithDebugf("%+v", err))) - return + // Maybe it is a base64 encoded ID? + if dec, err := base64.RawURLEncoding.DecodeString(id); err == nil { + id = string(dec) + } + + s, err = ss.GetByID(id) + if err != nil { + h.r.Writer().WriteError(w, r, errors.WithStack(herodot.ErrNotFound.WithDebugf("%+v", err))) + return + } } src, err := ReadSchema(s)