From a30a90f1c1f709c3c2a0433fd9923890d391fc53 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Fri, 6 Mar 2020 17:12:25 +0100
Subject: [PATCH] tests

---
 pkg/oidc/token.go | 14 +++++++-------
 pkg/op/token.go   |  5 +----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkg/oidc/token.go b/pkg/oidc/token.go
index ed364df..8f2afc2 100644
--- a/pkg/oidc/token.go
+++ b/pkg/oidc/token.go
@@ -219,16 +219,16 @@ func (j *jsonToken) UnmarshalUserinfoPhone() UserinfoPhone {
 }
 
 func (j *jsonToken) UnmarshalUserinfoAddress() *UserinfoAddress {
-	if j.jsonUserinfoAddress == nil {
+	if j.JsonUserinfoAddress == nil {
 		return nil
 	}
 	return &UserinfoAddress{
-		Country:       j.jsonUserinfoAddress.Country,
-		Formatted:     j.jsonUserinfoAddress.Formatted,
-		Locality:      j.jsonUserinfoAddress.Locality,
-		PostalCode:    j.jsonUserinfoAddress.PostalCode,
-		Region:        j.jsonUserinfoAddress.Region,
-		StreetAddress: j.jsonUserinfoAddress.StreetAddress,
+		Country:       j.JsonUserinfoAddress.Country,
+		Formatted:     j.JsonUserinfoAddress.Formatted,
+		Locality:      j.JsonUserinfoAddress.Locality,
+		PostalCode:    j.JsonUserinfoAddress.PostalCode,
+		Region:        j.JsonUserinfoAddress.Region,
+		StreetAddress: j.JsonUserinfoAddress.StreetAddress,
 	}
 }
 
diff --git a/pkg/op/token.go b/pkg/op/token.go
index 93e1851..06e9f9c 100644
--- a/pkg/op/token.go
+++ b/pkg/op/token.go
@@ -88,10 +88,7 @@ func CreateIDToken(ctx context.Context, issuer string, authReq AuthRequest, vali
 		AuthenticationContextClassReference: authReq.GetACR(),
 		AuthenticationMethodsReferences:     authReq.GetAMR(),
 		AuthorizedParty:                     authReq.GetClientID(),
-		Userinfo:                     *userinfo,
-		//UserinfoEmail:                       userinfo.UserinfoEmail,
-		//UserinfoPhone:                       userinfo.UserinfoPhone,
-		//UserinfoAddress:                     userinfo.Address,
+		Userinfo:                            *userinfo,
 	}
 	if accessToken != "" {
 		claims.AccessTokenHash, err = oidc.ClaimHash(accessToken, signer.SignatureAlgorithm())