Merge branch 'warnremoval'

irmaclient/session.go

@@ -349,6 +349,10 @@ func (session *session) start() {
 				return
 			}
 			ir.CredentialInfoList = append(ir.CredentialInfoList, info)
+			preexistingCredentials := session.client.attrs(*credreq.CredentialTypeID)
+			if len(preexistingCredentials) != 0 && preexistingCredentials[0].IsValid() && preexistingCredentials[0].CredentialType().IsSingleton {
+				ir.RemovalCredentialInfoList = append(ir.RemovalCredentialInfoList, preexistingCredentials[0].Info())
+			}
 		}
 	}
 

requests.go

@@ -68,9 +68,10 @@ type SignatureRequest struct {
 // optionally also asking for certain attributes to be simultaneously disclosed.
 type IssuanceRequest struct {
 	SessionRequest
-	Credentials        []*CredentialRequest     `json:"credentials"`
-	Disclose           AttributeDisjunctionList `json:"disclose"`
-	CredentialInfoList CredentialInfoList       `json:",omitempty"`
+	Credentials               []*CredentialRequest     `json:"credentials"`
+	Disclose                  AttributeDisjunctionList `json:"disclose"`
+	CredentialInfoList        CredentialInfoList       `json:",omitempty"`
+	RemovalCredentialInfoList CredentialInfoList
 }
 
 // A CredentialRequest contains the attributes and metadata of a credential