Skip to content

fix: make RecoveryAddress.ID optional to prevent UUID parsing error #4455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix: make RecoveryAddress.ID optional to prevent UUID parsing error #4455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61f60da
fix: make recovery address ID optional
blackshady Aug 2, 2025
26ee890
fix: remove required ID from recovery address schema
blackshady Aug 2, 2025
c0b0034
chore: regenerate SDK and apply formatting
blackshady Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion identity/identity_recovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ type (

// swagger:model recoveryIdentityAddress
RecoveryAddress struct {
// required: true
ID uuid.UUID `json:"id" db:"id" faker:"-"`

// required: true
Expand Down
36 changes: 22 additions & 14 deletions internal/client-go/model_recovery_identity_address.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 22 additions & 14 deletions internal/httpclient/model_recovery_identity_address.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions oryx/clidoc/md_docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//Copyright 2015 Red Hat Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
3 changes: 3 additions & 0 deletions oryx/clidoc/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2015 Red Hat Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
3 changes: 3 additions & 0 deletions oryx/hasherx/hash_comparator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package hasherx

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/hasherx/hasher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package hasherx

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/hasherx/hasher_argon2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package hasherx

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/hasherx/hasher_bcrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package hasherx

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/hasherx/hasher_pbkdf2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package hasherx

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/josex/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

/*-
* Copyright 2019 Square Inc.
*
Expand Down
3 changes: 3 additions & 0 deletions oryx/josex/public.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package josex

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/josex/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

/*-
* Copyright 2019 Square Inc.
*
Expand Down
3 changes: 3 additions & 0 deletions oryx/jsonnetsecure/jsonnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package jsonnetsecure

import (
Expand Down
3 changes: 3 additions & 0 deletions oryx/popx/db_columns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright © 2025 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package popx

import (
Expand Down
3 changes: 2 additions & 1 deletion oryx/popx/migrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ import (
"time"

"github.com/cockroachdb/cockroach-go/v2/crdb"
"github.com/ory/pop/v6"
"github.com/pkg/errors"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"

"github.com/ory/pop/v6"

"github.com/ory/x/cmdx"
"github.com/ory/x/logrusx"
"github.com/ory/x/otelx"
Expand Down
5 changes: 3 additions & 2 deletions persistence/sql/migratest/migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ package migratest
import (
"context"
"encoding/json"
"github.com/ory/kratos/identity"
"github.com/ory/x/pagination/keysetpagination"
"os"
"path/filepath"
"regexp"
"strings"
"sync"
"testing"

"github.com/ory/kratos/identity"
"github.com/ory/x/pagination/keysetpagination"

"github.com/bradleyjkemp/cupaloy/v2"
"github.com/stretchr/testify/assert"

Expand Down
1 change: 0 additions & 1 deletion spec/api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,6 @@
}
},
"required": [
"id",
"value",
"via"
],
Expand Down
1 change: 0 additions & 1 deletion spec/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5188,7 +5188,6 @@
"recoveryIdentityAddress": {
"type": "object",
"required": [
"id",
"value",
"via"
],
Expand Down
Loading