Files
upstream-ory-kratos/selfservice/strategy/oidc/form.go
upstream-mirror c60cc7ca75
Some checks failed
CI / Run tests and lints (push) Failing after 29s
CI / Build CLI docs (push) Has been skipped
CI / Run Playwright end-to-end tests (mysql) (push) Failing after 3s
CI / Run Playwright end-to-end tests (postgres) (push) Failing after 2s
CI / Run Playwright end-to-end tests (sqlite) (push) Failing after 3s
CodeQL / Analyze (go) (push) Failing after 4s
CodeQL / Analyze (javascript) (push) Failing after 3s
Docker Image Scanners / scanners (push) Failing after 4s
Synchronize Issue Labels / Synchronize Issue Labels (push) Has been skipped
CI / Run end-to-end tests (postgres) (push) Failing after 19s
CI / Run end-to-end tests (sqlite) (push) Failing after 2s
CI / Run Playwright end-to-end tests (cockroach) (push) Failing after 2s
CI / Draft newsletter (push) Has been skipped
CI / Generate release (push) Has been skipped
CI / Pending approval Slack notification (push) Has been skipped
CI / Send newsletter (push) Has been skipped
snapshot of https://github.com/ory/kratos.git (master, 2026-09-15; blobs > 131072B omitted)
2026-09-15 21:19:12 +05:00

42 lines
792 B
Go

// Copyright © 2023 Ory Corp
// SPDX-License-Identifier: Apache-2.0
package oidc
import (
"encoding/json"
"dario.cat/mergo"
"github.com/ory/kratos/identity"
)
// merge merges the JSON messages in a and b. If a value is defined in both a and b, a wins.
func merge(a, b json.RawMessage) (identity.Traits, error) {
if len(a) == 0 || string(a) == "{}" {
return identity.Traits(b), nil
}
var aMap, bMap map[string]any
if err := json.Unmarshal(a, &aMap); err != nil {
return nil, err
}
if err := json.Unmarshal(b, &bMap); err != nil {
return nil, err
}
// values in aMap (src) win.
if err := mergo.Merge(&bMap, &aMap, mergo.WithOverride); err != nil {
return nil, err
}
traits, err := json.Marshal(bMap)
if err != nil {
return nil, err
}
return traits, nil
}