Skip to content

refactor: remote claim builder: simplify AddClaims #346

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

Merged
denopink merged 2 commits into from
Mar 26, 2026
Merged

refactor: remote claim builder: simplify AddClaims #346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391be2e
refactor: remote claim builder: simplify AddClaims
denopink Mar 25, 2026
fa43c45
Merge branch 'main' into denopink/refactor/simplify-remote-claims-
denopink Mar 26, 2026
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
37 changes: 8 additions & 29 deletions token/claimBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ func (cbs ClaimBuilders) AddClaims(ctx context.Context, r *Request, target map[s
type requestClaimBuilder struct{}

func (rc requestClaimBuilder) AddClaims(_ context.Context, r *Request, target map[string]interface{}) error {
for k, v := range r.Claims {
target[k] = v
}
maps.Copy(target, r.Claims)

return nil
}
Expand All @@ -72,9 +70,7 @@ func (rc requestClaimBuilder) AddClaims(_ context.Context, r *Request, target ma
type staticClaimBuilder map[string]interface{}

func (sc staticClaimBuilder) AddClaims(_ context.Context, r *Request, target map[string]interface{}) error {
for k, v := range sc {
target[k] = v
}
maps.Copy(target, sc)

return nil
}
Expand Down Expand Up @@ -125,33 +121,16 @@ type remoteClaimBuilder struct {
}

func (rc *remoteClaimBuilder) AddClaims(ctx context.Context, r *Request, target map[string]interface{}) error {
rCopy := Request{
Metadata: make(map[string]interface{}),
PathWildCards: make(map[string]interface{}),
}
rCopy := NewRequest()
maps.Copy(rCopy.Metadata, r.Metadata)
maps.Copy(rCopy.Metadata, rc.extra)
maps.Copy(rCopy.PathWildCards, r.PathWildCards)
if len(rc.extra) > 0 {
rCopy.Metadata = make(map[string]interface{}, len(r.Metadata)+len(rc.extra))
for k, v := range r.Metadata {
rCopy.Metadata[k] = v
}

for k, v := range rc.extra {
rCopy.Metadata[k] = v
}
}

result, err := rc.endpoint(ctx, &rCopy)
if err != nil {
return err
}

for k, v := range result.(map[string]interface{}) {
target[k] = v
result, err := rc.endpoint(ctx, rCopy)
if err == nil {
maps.Copy(target, result.(map[string]any))
}

return nil
return err
}

func newRemoteClaimBuilder(client xhttpclient.Interface, metadata map[string]interface{}, r *RemoteClaims) (*remoteClaimBuilder, error) {
Expand Down
Loading