From ff7e2dd03250f2486dae73f73c32be99b0cc9266 Mon Sep 17 00:00:00 2001
From: Koen Serry <482723+koen-serry@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:46:36 +0100
Subject: [PATCH] Improved error handling of connection errors

---
 document.go    | 15 ++++++++++++---
 invoice.go     | 20 ++++++++++++++++----
 paylink.go     |  6 ++++--
 session.go     |  6 ++++--
 transaction.go | 12 ++++++++----
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/document.go b/document.go
index 0f587e6..9a5312c 100644
--- a/document.go
+++ b/document.go
@@ -323,7 +323,10 @@ func (c *Client) DocumentFeed(
 		req.Header.Set("Accept", "application/json")
 		req.Header.Set("User-Agent", c.UserAgent)
 
-		res, _ := c.HTTPClient.Do(req)
+		res, err := c.HTTPClient.Do(req)
+		if err != nil {
+			return err
+		}
 		if res.StatusCode == 200 {
 			payload, _ := ioutil.ReadAll(res.Body)
 			var updates MandateUpdates
@@ -365,7 +368,10 @@ func (c *Client) DownloadPdf(ctx context.Context, mndtId string, downloadFile st
 	req.Header.Add("Authorization", c.apiToken)
 
 	absPath, _ := filepath.Abs(downloadFile)
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
 	if res.StatusCode == 200 {
 		payload, _ := ioutil.ReadAll(res.Body)
 
@@ -403,7 +409,10 @@ func (c *Client) DocumentDetail(ctx context.Context, mndtId string, force bool)
 	req.Header.Set("User-Agent", c.UserAgent)
 	req.Header.Add("Authorization", c.apiToken)
 
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
 	if res.StatusCode == 200 {
 		payload, _ := ioutil.ReadAll(res.Body)
 
diff --git a/invoice.go b/invoice.go
index 835519a..d28c4f0 100644
--- a/invoice.go
+++ b/invoice.go
@@ -199,7 +199,10 @@ func (c *Client) InvoiceAdd(ctx context.Context, invoiceRequest *NewInvoiceReque
 		}
 	}
 
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
 	if res.StatusCode == 200 {
 		payload, _ := ioutil.ReadAll(res.Body)
 		c.Debug.Println("TwikeyInvoice: ", string(payload))
@@ -280,7 +283,10 @@ func (c *Client) InvoiceDetail(ctx context.Context, invoiceIdOrNumber string, si
 	req.Header.Set("User-Agent", c.UserAgent)
 	req.Header.Add("Authorization", c.apiToken)
 
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
 	if res.StatusCode == 200 {
 		payload, _ := ioutil.ReadAll(res.Body)
 
@@ -327,7 +333,10 @@ func (c *Client) InvoiceAction(ctx context.Context, invoiceIdOrNumber string, ac
 	req.Header.Set("User-Agent", c.UserAgent)
 	req.Header.Add("Authorization", c.apiToken)
 
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
 	if res.StatusCode == 204 {
 		return nil
 	}
@@ -354,7 +363,10 @@ func (c *Client) InvoicePayment(ctx context.Context, invoiceIdOrNumber string, m
 	req.Header.Set("User-Agent", c.UserAgent)
 	req.Header.Add("Authorization", c.apiToken)
 
-	res, _ := c.HTTPClient.Do(req)
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
 	if res.StatusCode == 204 {
 		return nil
 	}
diff --git a/paylink.go b/paylink.go
index 738f5bc..939ce14 100644
--- a/paylink.go
+++ b/paylink.go
@@ -119,8 +119,10 @@ func (c *Client) PaylinkFeed(ctx context.Context, callback func(paylink *Paylink
 		req.Header.Add("Authorization", c.apiToken)
 		req.Header.Set("User-Agent", c.UserAgent)
 
-		res, _ := c.HTTPClient.Do(req)
-
+		res, err := c.HTTPClient.Do(req)
+		if err != nil {
+			return err
+		}
 		if res.StatusCode == 200 {
 			payload, _ := ioutil.ReadAll(res.Body)
 			_ = res.Body.Close()
diff --git a/session.go b/session.go
index 9bdd42d..f333172 100644
--- a/session.go
+++ b/session.go
@@ -98,8 +98,10 @@ func (c *Client) logout() {
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Set("Authorization", c.apiToken)
 
-	res, _ := c.HTTPClient.Do(req)
-	if res.StatusCode != 200 {
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		c.Debug.Println("Error in logout from Twikey:", err)
+	} else if res.StatusCode != 200 {
 		c.Debug.Println("Error in logout from Twikey:", res.StatusCode)
 	}
 }
diff --git a/transaction.go b/transaction.go
index cc09d82..2197f9a 100644
--- a/transaction.go
+++ b/transaction.go
@@ -148,8 +148,10 @@ func (c *Client) TransactionFeed(ctx context.Context, callback func(transaction
 		req.Header.Add("Authorization", c.apiToken)
 		req.Header.Set("User-Agent", c.UserAgent)
 
-		res, _ := c.HTTPClient.Do(req)
-
+		res, err := c.HTTPClient.Do(req)
+		if err != nil {
+			return err
+		}
 		if res.StatusCode == 200 {
 			payload, _ := ioutil.ReadAll(res.Body)
 			_ = res.Body.Close()
@@ -193,8 +195,10 @@ func (c *Client) TransactionCollect(ctx context.Context, template string, prenot
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Authorization", c.apiToken)
 	req.Header.Set("User-Agent", c.UserAgent)
-	res, _ := c.HTTPClient.Do(req)
-
+	res, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return "", err
+	}
 	if res.StatusCode == 200 {
 		payload, _ := ioutil.ReadAll(res.Body)
 		_ = res.Body.Close()