Check errors on all the things

Author: ken miles

CreateInvoice.go

@@ -82,7 +82,7 @@ func (s *BillingService) CreateInvoice(userID int, invoice CreateInvoiceRequest)
 	// WHMCS returns a error sometimes that is not in JSON !
 	r := strings.Replace(resp.Body, `<div class="alert alert-error">Module credit_purchase_improvement: Module error occured. Please contact with support.</div>`, ``, -1)
 	ir := InvoiceReply{}
-	json.Unmarshal([]byte(r), &ir)
+	err = json.Unmarshal([]byte(r), &ir)
 
 	return ir.InvoiceID, resp, err
 

GetClients.go

@@ -27,6 +27,6 @@ func (s *AccountsService) GetClients(parms map[string]string) (*WHMCSclients, *R
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &obj)
+	err = json.Unmarshal([]byte(resp.Body), &obj)
 	return obj, resp, err
 }

GetClientsDetails.go

@@ -28,7 +28,7 @@ func (s *AccountsService) GetClientsDetails(parms map[string]string) (*Account,
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &a)
+	err = json.Unmarshal([]byte(resp.Body), &a)
 
 	return a, resp, err
 }

GetClientsProducts.go

@@ -56,7 +56,7 @@ func (s *AccountsService) GetClientsProducts(parms map[string]string) (*ClientsP
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &p)
+	err = json.Unmarshal([]byte(resp.Body), &p)
 
 	return p, resp, err
 }

UpdateClientProduct.go

@@ -94,7 +94,7 @@ func (s *SystemService) UpdateClientProduct(parms map[string]string) (*UpdateCli
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &obj)
+	err = json.Unmarshal([]byte(resp.Body), &obj)
 	return obj, resp, err
 }
 

UpdateInvoice.go

@@ -77,6 +77,6 @@ func (s *BillingService) UpdateInvoice(invoiceID int, items []InvoiceLineItems)
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &i)
+	err = json.Unmarshal([]byte(resp.Body), &i)
 	return i, resp, err
 }

accounts.go

@@ -211,7 +211,7 @@ func (s *AccountsService) GetContacts(parms map[string]string) (*Account, *Respo
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &a)
+	err = json.Unmarshal([]byte(resp.Body), &a)
 
 	return a, resp, err
 }
@@ -280,7 +280,10 @@ func (s *AccountsService) ClientContactList(status string) ([]ContactList, error
 			if err != nil {
 				fmt.Println(err)
 			}
-			json.Unmarshal([]byte(resp.Body), &cl)
+			err = json.Unmarshal([]byte(resp.Body), &cl)
+			if err != nil {
+				fmt.Println(err)
+			}
 
 			cl.VendorSoftware = strings.TrimSpace(cl.VendorSoftware)
 			cl.Phone = strings.Replace(cl.Phone, "+61.", "0", -1)
@@ -335,17 +338,11 @@ func (s *AccountsService) ClientLastBilled(status string) ([]ClientLastBilledLis
 			if err != nil {
 				fmt.Println(err)
 			}
-			json.Unmarshal([]byte(resp.Body), &cl)
-			// cl.Phone = strings.Replace(cl.Phone, "+61.", "0", -1)
-			// cl.Phone = strings.Replace(cl.Phone, " ", "", -1)
-			// if len(cl.Phone) == 10 {
-			// 	cl.Phone = fmt.Sprintf("%s %s %s", cl.Phone[0:4], cl.Phone[4:7], cl.Phone[7:10])
-			// }
-
-			// cl.AlertPrimary = strings.Replace(cl.AlertPrimary, " ", "", -1)
-			// if len(cl.AlertPrimary) == 10 {
-			// 	cl.AlertPrimary = fmt.Sprintf("%s %s %s", cl.AlertPrimary[0:4], cl.AlertPrimary[4:7], cl.AlertPrimary[7:10])
-			// }
+			err = json.Unmarshal([]byte(resp.Body), &cl)
+
+			if err != nil {
+				fmt.Println(err)
+			}
 
 			contactList = append(contactList, cl)
 		}

billing.go

@@ -115,7 +115,11 @@ func (s *BillingService) GetLastInvoice(userid int, status string) (Invoice, err
 		return Invoice{}, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &invoices)
+	err = json.Unmarshal([]byte(resp.Body), &invoices)
+
+	if err != nil {
+		return Invoice{}, fmt.Errorf("Can't unmarshal invoices: %w", err)
+	}
 
 	if invoices.Numreturned > 0 {
 		return invoices.Invoices.Invoice[0], nil
@@ -160,7 +164,11 @@ func (s *BillingService) GetInvoices(parms map[string]string) ([]Invoice, *Respo
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &invoices)
+	err = json.Unmarshal([]byte(resp.Body), &invoices)
+
+	if err != nil {
+		return nil, nil, fmt.Errorf("unable to unmarshal invoices: %w", err)
+	}
 
 	var r []Invoice
 	for _, i := range invoices.Invoices.Invoice {
@@ -207,6 +215,6 @@ func (s *BillingService) CapturePayment(invoice int) (*CaptureResult, *Response,
 		return nil, resp, err
 	}
 
-	json.Unmarshal([]byte(resp.Body), &result)
+	err = json.Unmarshal([]byte(resp.Body), &result)
 	return result, resp, err
 }