k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #767 from rithujohn191/fix-refresh

Browse Source 
storage: Add ConnectorData to storage RefreshToken.
This commit is contained in:
Eric Chiang 2017-01-09 15:16:18 -08:00 committed by GitHub
commit 15fadeaf86
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/conformance/conformance.go
View File

@ -219,6 +219,7 @@ func testRefreshTokenCRUD(t *testing.T, s storage.Storage) {
EmailVerified: true, EmailVerified: true,
Groups: []string{"a", "b"}, Groups: []string{"a", "b"},
}, },
ConnectorData: []byte(`{"some":"data"}`),
} }
if err := s.CreateRefresh(refresh); err != nil { if err := s.CreateRefresh(refresh); err != nil {
t.Fatalf("create refresh token: %v", err) t.Fatalf("create refresh token: %v", err)

24
storage/kubernetes/storage.go
View File

@ -162,11 +162,12 @@ func (cli *client) CreateRefresh(r storage.RefreshToken) error {
Name: r.RefreshToken, Name: r.RefreshToken,
Namespace: cli.namespace, Namespace: cli.namespace,
}, },
ClientID: r.ClientID, ClientID: r.ClientID,
ConnectorID: r.ConnectorID, ConnectorID: r.ConnectorID,
Scopes: r.Scopes, Scopes: r.Scopes,
Nonce: r.Nonce, Nonce: r.Nonce,
Claims: fromStorageClaims(r.Claims), Claims: fromStorageClaims(r.Claims),
ConnectorData: r.ConnectorData,
} }
return cli.post(resourceRefreshToken, refresh) return cli.post(resourceRefreshToken, refresh)
} }
@ -243,12 +244,13 @@ func (cli *client) GetRefresh(id string) (storage.RefreshToken, error) {
return storage.RefreshToken{}, err return storage.RefreshToken{}, err
} }
return storage.RefreshToken{ return storage.RefreshToken{
RefreshToken: r.ObjectMeta.Name, RefreshToken: r.ObjectMeta.Name,
ClientID: r.ClientID, ClientID: r.ClientID,
ConnectorID: r.ConnectorID, ConnectorID: r.ConnectorID,
Scopes: r.Scopes, Scopes: r.Scopes,
Nonce: r.Nonce, Nonce: r.Nonce,
Claims: toStorageClaims(r.Claims), Claims: toStorageClaims(r.Claims),
ConnectorData: r.ConnectorData,
}, nil }, nil
} }

5
storage/kubernetes/types.go
View File

@ -367,8 +367,9 @@ type RefreshToken struct {
Nonce string `json:"nonce,omitempty"` Nonce string `json:"nonce,omitempty"`
Claims Claims `json:"claims,omitempty"` Claims Claims `json:"claims,omitempty"`
ConnectorID string `json:"connectorID,omitempty"` ConnectorID string `json:"connectorID,omitempty"`
ConnectorData []byte `json:"connectorData,omitempty"`
} }
// RefreshList is a list of refresh tokens. // RefreshList is a list of refresh tokens.