Skip to content

Commit

Permalink
test: update fixtures
Browse files Browse the repository at this point in the history
  • Loading branch information
@aeneasr
aeneasr committed Feb 26, 2022
1 parent e614f6e commit 299c6e3
Show file tree
Hide file tree
Showing 22 changed files with 31 additions and 27 deletions.
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json
View file
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/session/7458af86-c1d8-401c-978a-8da89133f78b.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/session/8571e374-38f2-4f46-8ad3-b9d914e174d3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/session/dcde5aaa-f789-4d3d-ae1f-76da8d57e67c.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/session/f38cdebe-e567-42c9-a562-1bd4dee40998.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/194c5b05-0487-4a11-bcbc-f301c9ff9678.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/19ede218-928c-4e02-ab49-b76e12b34f31.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/21c5f714-3089-49d2-b387-f244d4dd9e00.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/74fd6c53-7651-453e-90b8-2c5adbf911bb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/77fe4fb3-2d4e-4532-b568-c44b0aece0aa.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/8248bb5d-8ef7-45e3-8e07-9e2003dd5352.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/90b4f970-b9ae-42bc-a0a7-73ec750e0aa1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/a79bfcf1-68ae-49de-8b23-4f96921b8341.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/aeba85bd-1a8c-44bf-8fc3-3be83c01a3dc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion persistence/sql/migratest/fixtures/settings_flow/cdfd1eed-34a4-491d-ad0a-7579d3a0a7ba.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]"
Expand Down
16 changes: 10 additions & 6 deletions schema/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 299c6e3

Please sign in to comment.