Eerly returns instead of if/else

credentials · Jan 30, 2020 · e8b56d2 · e8b56d2
1 parent 04674a6
commit e8b56d2
Showing 1 changed file with 38 additions and 38 deletions.
diff --git a/irmagobridge/session_handler.go b/irmagobridge/session_handler.go
@@ -118,61 +118,61 @@ func (sh *SessionHandler) RequestIssuancePermission(request *irma.IssuanceReques
 	err := CheckContainsCredentialIdentifiers(request.Disclosure())
 	if err != nil {
 		sh.Failure(err)
-	} else {
-		action := &OutgoingAction{
-			"type":                  "IrmaSession.RequestIssuancePermission",
-			"sessionId":             sh.sessionID,
-			"serverName":            serverName,
-			"issuedCredentials":     request.CredentialInfoList,
-			"disclosures":           disclose,
-			"disclosuresLabels":     request.Labels,
-			"disclosuresCandidates": candidates,
-		}
-
-		sh.permissionHandler = ph
-		sendAction(action)
+		return
 	}
+	action := &OutgoingAction{
+		"type":                  "IrmaSession.RequestIssuancePermission",
+		"sessionId":             sh.sessionID,
+		"serverName":            serverName,
+		"issuedCredentials":     request.CredentialInfoList,
+		"disclosures":           disclose,
+		"disclosuresLabels":     request.Labels,
+		"disclosuresCandidates": candidates,
+	}
+
+	sh.permissionHandler = ph
+	sendAction(action)
 }
 
 func (sh *SessionHandler) RequestVerificationPermission(request *irma.DisclosureRequest, candidates [][][]*irma.AttributeIdentifier, serverName irma.TranslatedString, ph irmaclient.PermissionHandler) {
 	logDebug("Handling RequestVerificationPermission")
 	err := CheckContainsCredentialIdentifiers(request)
 	if err != nil {
 		sh.Failure(err)
-	} else {
-		action := &OutgoingAction{
-			"type":                  "IrmaSession.RequestVerificationPermission",
-			"sessionId":             sh.sessionID,
-			"serverName":            serverName,
-			"disclosures":           request.Disclose,
-			"disclosuresLabels":     request.Labels,
-			"disclosuresCandidates": candidates,
-		}
-
-		sh.permissionHandler = ph
-		sendAction(action)
+		return
+	}
+	action := &OutgoingAction{
+		"type":                  "IrmaSession.RequestVerificationPermission",
+		"sessionId":             sh.sessionID,
+		"serverName":            serverName,
+		"disclosures":           request.Disclose,
+		"disclosuresLabels":     request.Labels,
+		"disclosuresCandidates": candidates,
 	}
+
+	sh.permissionHandler = ph
+	sendAction(action)
 }
 
 func (sh *SessionHandler) RequestSignaturePermission(request *irma.SignatureRequest, candidates [][][]*irma.AttributeIdentifier, serverName irma.TranslatedString, ph irmaclient.PermissionHandler) {
 	logDebug("Handling RequestSignaturePermission")
 	err := CheckContainsCredentialIdentifiers(request.Disclosure())
 	if err != nil {
 		sh.Failure(err)
-	} else {
-		action := &OutgoingAction{
-			"type":                  "IrmaSession.RequestSignaturePermission",
-			"sessionId":             sh.sessionID,
-			"serverName":            serverName,
-			"disclosures":           request.Disclose,
-			"disclosuresLabels":     request.Labels,
-			"disclosuresCandidates": candidates,
-			"message":               request.Message,
-		}
-
-		sh.permissionHandler = ph
-		sendAction(action)
+		return
 	}
+	action := &OutgoingAction{
+		"type":                  "IrmaSession.RequestSignaturePermission",
+		"sessionId":             sh.sessionID,
+		"serverName":            serverName,
+		"disclosures":           request.Disclose,
+		"disclosuresLabels":     request.Labels,
+		"disclosuresCandidates": candidates,
+		"message":               request.Message,
+	}
+
+	sh.permissionHandler = ph
+	sendAction(action)
 }
 
 func (sh *SessionHandler) RequestPin(remainingAttempts int, ph irmaclient.PinHandler) {