From be2b4ba9f4365e4e9b0821919de305579ec2cb74 Mon Sep 17 00:00:00 2001
From: Thom Seddon <thom@seddonmedia.co.uk>
Date: Mon, 29 Jun 2020 21:01:59 +0100
Subject: [PATCH] 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
---
 internal/provider/google_test.go |  3 ---
 internal/provider/oidc.go        | 11 +----------
 internal/provider/oidc_test.go   |  2 --
 internal/provider/providers.go   |  5 +----
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/internal/provider/google_test.go b/internal/provider/google_test.go
index ffa4be3..64243fc 100644
--- a/internal/provider/google_test.go
+++ b/internal/provider/google_test.go
@@ -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)
 }
diff --git a/internal/provider/oidc.go b/internal/provider/oidc.go
index ac6f60e..5e17a58 100644
--- a/internal/provider/oidc.go
+++ b/internal/provider/oidc.go
@@ -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
 }
diff --git a/internal/provider/oidc_test.go b/internal/provider/oidc_test.go
index a251333..d514d37 100644
--- a/internal/provider/oidc_test.go
+++ b/internal/provider/oidc_test.go
@@ -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
diff --git a/internal/provider/providers.go b/internal/provider/providers.go
index 7fd0510..5c14466 100644
--- a/internal/provider/providers.go
+++ b/internal/provider/providers.go
@@ -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