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:
parent
529e28d83b
commit
be2b4ba9f4
@ -144,8 +144,5 @@ func TestGoogleGetUser(t *testing.T) {
|
|||||||
user, err := p.GetUser("123456789")
|
user, err := p.GetUser("123456789")
|
||||||
assert.Nil(err)
|
assert.Nil(err)
|
||||||
|
|
||||||
assert.Equal("1", user.ID)
|
|
||||||
assert.Equal("example@example.com", user.Email)
|
assert.Equal("example@example.com", user.Email)
|
||||||
assert.True(user.Verified)
|
|
||||||
assert.Equal("example.com", user.Hd)
|
|
||||||
}
|
}
|
||||||
|
@ -91,18 +91,9 @@ func (o *OIDC) GetUser(token string) (User, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Extract custom claims
|
// Extract custom claims
|
||||||
var claims struct {
|
if err := idToken.Claims(&user); err != nil {
|
||||||
ID string `json:"sub"`
|
|
||||||
Email string `json:"email"`
|
|
||||||
Verified bool `json:"email_verified"`
|
|
||||||
}
|
|
||||||
if err := idToken.Claims(&claims); err != nil {
|
|
||||||
return user, err
|
return user, err
|
||||||
}
|
}
|
||||||
|
|
||||||
user.ID = claims.ID
|
|
||||||
user.Email = claims.Email
|
|
||||||
user.Verified = claims.Verified
|
|
||||||
|
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
@ -124,9 +124,7 @@ func TestOIDCGetUser(t *testing.T) {
|
|||||||
// Get user
|
// Get user
|
||||||
user, err := provider.GetUser(token)
|
user, err := provider.GetUser(token)
|
||||||
assert.Nil(err)
|
assert.Nil(err)
|
||||||
assert.Equal("1", user.ID)
|
|
||||||
assert.Equal("example@example.com", user.Email)
|
assert.Equal("example@example.com", user.Email)
|
||||||
assert.True(user.Verified)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Utils
|
// Utils
|
||||||
|
@ -28,10 +28,7 @@ type token struct {
|
|||||||
|
|
||||||
// User is the authenticated user
|
// User is the authenticated user
|
||||||
type User struct {
|
type User struct {
|
||||||
ID string `json:"id"`
|
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
Verified bool `json:"verified_email"`
|
|
||||||
Hd string `json:"hd"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OAuthProvider is a provider using the oauth2 library
|
// OAuthProvider is a provider using the oauth2 library
|
||||||
|
Loading…
x
Reference in New Issue
Block a user