Rename myirma login attribute of test scheme manager back to email

irmaclient/manual_session_test.go

@@ -206,7 +206,7 @@ func TestManualSessionInvalidAttributeValue(t *testing.T) {
 func TestManualKeyShareSession(t *testing.T) {
 	invalidate = false
 
-	request := "{\"nonce\": 0, \"context\": 0, \"message\":\"I owe you everything\",\"messageType\":\"STRING\",\"content\":[{\"label\":\"Student number (RU)\",\"attributes\":[\"test.test.mijnirma.username\"]}]}"
+	request := "{\"nonce\": 0, \"context\": 0, \"message\":\"I owe you everything\",\"messageType\":\"STRING\",\"content\":[{\"label\":\"Student number (RU)\",\"attributes\":[\"test.test.mijnirma.email\"]}]}"
 
 	ms := createManualSessionHandler(request, request, t)
 

irmaclient/session_test.go

@@ -299,7 +299,7 @@ func keyshareSessions(t *testing.T, client *Client) {
 		&irma.CredentialRequest{
 			Validity:         &expiry,
 			CredentialTypeID: &credid,
-			Attributes:       map[string]string{"username": "testusername"},
+			Attributes:       map[string]string{"email": "testusername"},
 		},
 	)
 	sessionHelper(t, jwt, "issue", client)
@@ -309,7 +309,7 @@ func keyshareSessions(t *testing.T, client *Client) {
 		jwt.(*irma.ServiceProviderJwt).Request.Request.Content,
 		&irma.AttributeDisjunction{
 			Label:      "foo",
-			Attributes: []irma.AttributeTypeIdentifier{irma.NewAttributeTypeIdentifier("test.test.mijnirma.username")},
+			Attributes: []irma.AttributeTypeIdentifier{irma.NewAttributeTypeIdentifier("test.test.mijnirma.email")},
 		},
 	)
 	sessionHelper(t, jwt, "verification", client)
@@ -319,7 +319,7 @@ func keyshareSessions(t *testing.T, client *Client) {
 		jwt.(*irma.SignatureRequestorJwt).Request.Request.Content,
 		&irma.AttributeDisjunction{
 			Label:      "foo",
-			Attributes: []irma.AttributeTypeIdentifier{irma.NewAttributeTypeIdentifier("test.test.mijnirma.username")},
+			Attributes: []irma.AttributeTypeIdentifier{irma.NewAttributeTypeIdentifier("test.test.mijnirma.email")},
 		},
 	)
 	sessionHelper(t, jwt, "signature", client)

testdata/irma_configuration/test/description.xml

@@ -11,6 +11,6 @@
 	</Description>
 	<KeyshareServer>http://localhost:8080/irma_keyshare_server/api/v1</KeyshareServer>
 	<KeyshareWebsite>http://localhost:8080/irma_keyshare_server/mijnirma/</KeyshareWebsite>
-	<KeyshareAttribute>test.test.mijnirma.username</KeyshareAttribute>
+	<KeyshareAttribute>test.test.mijnirma.email</KeyshareAttribute>
 	<Contact>https://privacybydesign.foundation/</Contact>
 </SchemeManager>

testdata/irma_configuration/test/index

-e1cb76b0730accb0e14de21a6cf85a2e3a5ba5c47808f648168c17536f971173 test/description.xml
+c01fb73d8b9f3ae1e530f6335bbb1857d67d5022c5c25e5188f0dd9e0f688707 test/description.xml
 61aa81ab57c7e4812955d77e00aeb0afefa4c88a90bee5cd75fe9aaea9d4effb test/test/Issues/email/description.xml
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 test/test/Issues/email/logo.png
-c385a1e6f2cf201161af968c92b8ffdfe5a061e001b51217a41b9277aab817de test/test/Issues/mijnirma/description.xml
+32de560adea94257989b4d8fd688304919d365b13b5f4ad83114d21f6f728ddc test/test/Issues/mijnirma/description.xml
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 test/test/Issues/mijnirma/logo.png
 3571e30777cdf5b97acbb0820f1b69983d2dc2b6bae91c8fb67cfc79ef4e2543 test/test/PublicKeys/0.xml
 115bd71b738cd2ba10e832559fc5d35ee8222f4049a0fc10fc18d0853c4aa4d9 test/test/PublicKeys/1.xml

testdata/irma_configuration/test/test/Issues/mijnirma/description.xml

@@ -17,7 +17,7 @@
 	<ShouldBeSingleton>true</ShouldBeSingleton>
 
 	<Attributes>
-		<Attribute id="username">
+		<Attribute id="email">
 			<Name>
 				<en>Username</en>
 				<nl>Gebruikersnaam</nl>