Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Packages Projects Releases Wiki Activity

vendor: update go-oidc to add support for Azure AD

Browse source 
Update github.com/coreos/go-oidc/ to include coreos/go-oidc#87
which adds support for Azure AD
This commit is contained in:
Takashi Kusumi 2016-06-13 11:00:08 +09:00
parent 868f53228c
commit 316953d33f
4 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glide.lock generated
View file

@ -1,10 +1,10 @@
hash: 7e7b258be2aa7e03d1bb15c96f856a9b7982d850a1faeba699a0b11bcb0c6936 hash: af5ee807138ecd53eebc54567b4dcd66e3a6ddc7d758fb9f34e6e3eb13b20cf2
updated: 2016-05-27T00:22:02.656877293+02:00 updated: 2016-06-13T10:58:04.608971954+09:00
imports: imports:
- name: github.com/andybalholm/cascadia - name: github.com/andybalholm/cascadia
version: 6122e68c2642b7b75c538a63b15168c6c80fb757 version: 6122e68c2642b7b75c538a63b15168c6c80fb757
- name: github.com/coreos/go-oidc - name: github.com/coreos/go-oidc
version: e6174c764e906bd60c76fdfc33faf5e0bdc875d6 version: 8ae400b75540a4f57ec549a89b3e9d994c636f2a
subpackages: subpackages:
- http - http
- jose - jose

2
glide.yaml
View file

@ -5,7 +5,7 @@ import:
- package: github.com/andybalholm/cascadia - package: github.com/andybalholm/cascadia
version: 6122e68c2642b7b75c538a63b15168c6c80fb757 version: 6122e68c2642b7b75c538a63b15168c6c80fb757
- package: github.com/coreos/go-oidc - package: github.com/coreos/go-oidc
version: e6174c764e906bd60c76fdfc33faf5e0bdc875d6 version: 8ae400b75540a4f57ec549a89b3e9d994c636f2a
subpackages: subpackages:
- http - http
- jose - jose

24
vendor/github.com/coreos/go-oidc/oauth2/oauth2.go generated vendored
View file

@ -332,16 +332,16 @@ func parseTokenResponse(resp *http.Response) (result TokenResponse, err error) {
result.Scope = vals.Get("scope") result.Scope = vals.Get("scope")
} else { } else {
var r struct { var r struct {
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
TokenType string `json:"token_type"` TokenType string `json:"token_type"`
IDToken string `json:"id_token"` IDToken string `json:"id_token"`
RefreshToken string `json:"refresh_token"` RefreshToken string `json:"refresh_token"`
Scope string `json:"scope"` Scope string `json:"scope"`
State string `json:"state"` State string `json:"state"`
ExpiresIn int `json:"expires_in"` ExpiresIn json.Number `json:"expires_in"` // Azure AD returns string
Expires int `json:"expires"` Expires int `json:"expires"`
Error string `json:"error"` Error string `json:"error"`
Desc string `json:"error_description"` Desc string `json:"error_description"`
} }
if err = json.Unmarshal(body, &r); err != nil { if err = json.Unmarshal(body, &r); err != nil {
return return
@ -355,10 +355,10 @@ func parseTokenResponse(resp *http.Response) (result TokenResponse, err error) {
result.IDToken = r.IDToken result.IDToken = r.IDToken
result.RefreshToken = r.RefreshToken result.RefreshToken = r.RefreshToken
result.Scope = r.Scope result.Scope = r.Scope
if r.ExpiresIn == 0 { if expiresIn, err := r.ExpiresIn.Int64(); err != nil {
result.Expires = r.Expires result.Expires = r.Expires
} else { } else {
result.Expires = r.ExpiresIn result.Expires = int(expiresIn)
} }
} }
return return

14
vendor/github.com/coreos/go-oidc/oauth2/oauth2_test.go generated vendored
View file

@ -438,6 +438,20 @@ func TestParseTokenResponse(t *testing.T) {
RefreshToken: "spam", RefreshToken: "spam",
}, },
}, },
{
// Azure AD returns "expires_in" value as string
resp: response{
body: `{"access_token":"foo","id_token":"bar","expires_in":"300","token_type":"bearer","refresh_token":"spam"}`,
contentType: "application/json; charset=utf-8",
},
wantResp: TokenResponse{
AccessToken: "foo",
IDToken: "bar",
Expires: 300,
TokenType: "bearer",
RefreshToken: "spam",
},
},
{ {
resp: response{ resp: response{
body: `{"access_token":"foo","id_token":"bar","expires":200,"token_type":"bearer","refresh_token":"spam"}`, body: `{"access_token":"foo","id_token":"bar","expires":200,"token_type":"bearer","refresh_token":"spam"}`,