Remove unused user fields (#141)

These aren't actually used anywhere and can result in a parse error
if the ID field isn't a string
This commit is contained in:
Thom Seddon 2020-06-29 21:01:59 +01:00 committed by GitHub
parent 529e28d83b
commit be2b4ba9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 19 deletions

View File

@ -144,8 +144,5 @@ func TestGoogleGetUser(t *testing.T) {
user, err := p.GetUser("123456789")
assert.Nil(err)
assert.Equal("1", user.ID)
assert.Equal("example@example.com", user.Email)
assert.True(user.Verified)
assert.Equal("example.com", user.Hd)
}

View File

@ -91,18 +91,9 @@ func (o *OIDC) GetUser(token string) (User, error) {
}
// Extract custom claims
var claims struct {
ID string `json:"sub"`
Email string `json:"email"`
Verified bool `json:"email_verified"`
}
if err := idToken.Claims(&claims); err != nil {
if err := idToken.Claims(&user); err != nil {
return user, err
}
user.ID = claims.ID
user.Email = claims.Email
user.Verified = claims.Verified
return user, nil
}

View File

@ -124,9 +124,7 @@ func TestOIDCGetUser(t *testing.T) {
// Get user
user, err := provider.GetUser(token)
assert.Nil(err)
assert.Equal("1", user.ID)
assert.Equal("example@example.com", user.Email)
assert.True(user.Verified)
}
// Utils

View File

@ -28,10 +28,7 @@ type token struct {
// User is the authenticated user
type User struct {
ID string `json:"id"`
Email string `json:"email"`
Verified bool `json:"verified_email"`
Hd string `json:"hd"`
Email string `json:"email"`
}
// OAuthProvider is a provider using the oauth2 library