cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: improve example & fix userinfo marshal (#132)

Browse source 
* fix: example client should track state, call cli.CodeFlow need context

* fix: oidc userinfo can UnmarshalJSON with address

* rp Discover use client.Discover

* add instruction for example to README.md
This commit is contained in:
陈杨文 2021-10-08 14:20:45 +08:00 • committed by GitHub
parent a63fbee93d
commit ff2c164057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/client/rp/relaying_party.go
View file

@ -170,17 +170,18 @@ func NewRelyingPartyOIDC(issuer, clientID, clientSecret, redirectURI string, sco
return nil, err
}
}
endpoints, err := Discover(rp.issuer, rp.httpClient)
discoveryConfiguration, err := client.Discover(rp.issuer, rp.httpClient)
if err != nil {
return nil, err
}
endpoints := GetEndpoints(discoveryConfiguration)
rp.oauthConfig.Endpoint = endpoints.Endpoint
rp.endpoints = endpoints
return rp, nil
}
//DefaultRPOpts is the type for providing dynamic options to the DefaultRP
//Option is the type for providing dynamic options to the DefaultRP
type Option func(*relyingParty) error
//WithCookieHandler set a `CookieHandler` for securing the various redirects

3
pkg/oidc/userinfo.go
View file

@ -360,6 +360,7 @@ func (i *userinfo) MarshalJSON() ([]byte, error) {
func (i *userinfo) UnmarshalJSON(data []byte) error {
type Alias userinfo
a := &struct {
Address *userInfoAddress `json:"address,omitempty"`
*Alias
UpdatedAt int64 `json:"update_at,omitempty"`
}{
@ -368,7 +369,7 @@ func (i *userinfo) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, &a); err != nil {
return err
}
i.Address = a.Address
i.UpdatedAt = Time(time.Unix(a.UpdatedAt, 0).UTC())
if err := json.Unmarshal(data, &i.claims); err != nil {

26
pkg/oidc/userinfo_test.go Normal file
View file

@ -0,0 +1,26 @@
package oidc
import (
"encoding/json"
"github.com/stretchr/testify/assert"
"testing"
)
func TestUserInfoMarshal(t *testing.T) {
userinfo := NewUserInfo()
userinfo.SetSubject("test")
userinfo.SetAddress(NewUserInfoAddress("Test 789\nPostfach 2", "", "", "", "", ""))
userinfo.SetEmail("test", true)
userinfo.SetPhone("0791234567", true)
userinfo.SetName("Test")
userinfo.AppendClaims("private_claim", "test")
marshal, err := json.Marshal(userinfo)
out := NewUserInfo()
assert.NoError(t, err)
assert.NoError(t, json.Unmarshal(marshal, out))
assert.Equal(t, userinfo.GetAddress(), out.GetAddress())
expected, err := json.Marshal(out)
assert.NoError(t, err)
assert.Equal(t, expected, marshal)
}