Refactor SendRequest to inject http.client, refactor duplicated snippets

- Removed unused getHttpClient function in httpclient.go
- Removed httpclient initialisation from sendRequest
- inject httpClient into sendRequest, and initialise it using getHttpClient

Author: Alex-CD

goal/goal.go

@@ -64,7 +64,10 @@ func putGoalHttp(goal string, configuration config.Configuration) error {
 	if err != nil {
 		return err
 	}
-	_, err = httpclient.SendRequest(requestBody, "PUT", getGoalUrl(configuration), configuration.TimerInsecure)
+
+	httpClient := httpclient.GetHttpClient(configuration.TimerInsecure)
+	_, err = httpclient.SendRequest(requestBody, "PUT", getGoalUrl(configuration), httpClient)
+
 	return err
 }
 
@@ -87,7 +90,8 @@ func deleteGoalHttp(room string, user string, timerService string, disableSslVer
 	if err != nil {
 		return err
 	}
-	_, err = httpclient.SendRequest(requestBody, "DELETE", timerService+room+"/goal", disableSslVerification)
+	httpClient := httpclient.GetHttpClient(disableSslVerification)
+	_, err = httpclient.SendRequest(requestBody, "DELETE", timerService+room+"/goal", httpClient)
 	return err
 }
 

httpclient/httpclient.go

@@ -22,20 +22,12 @@ func GetHttpClient(disableSSLVerification bool) *http.Client {
 	return http.DefaultClient
 }
 
-func SendRequest(requestBody []byte, requestMethod string, requestUrl string, disableSSLVerification bool) (string, error) {
+func SendRequest(requestBody []byte, requestMethod string, requestUrl string, httpClient *http.Client) (string, error) {
 	say.Info(requestMethod + " " + requestUrl + " " + string(requestBody))
 
 	responseBody := bytes.NewBuffer(requestBody)
 	request, requestCreationError := http.NewRequest(requestMethod, requestUrl, responseBody)
 
-	httpClient := http.DefaultClient
-	if disableSSLVerification {
-		transCfg := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		httpClient = &http.Client{Transport: transCfg}
-	}
-
 	if requestCreationError != nil {
 		return "", fmt.Errorf("failed to create the http request object: %w", requestCreationError)
 	}
@@ -73,13 +65,3 @@ func SendRequest(requestBody []byte, requestMethod string, requestUrl string, di
 	}
 	return body, nil
 }
-
-func getHttpClient(disableSSLVerification bool) *http.Client {
-	if disableSSLVerification {
-		transCfg := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		return &http.Client{Transport: transCfg}
-	}
-	return http.DefaultClient
-}

timer.go

@@ -157,7 +157,8 @@ func httpPutTimer(timeoutInMinutes int, room string, user string, timerService s
 		"timer": timeoutInMinutes,
 		"user":  user,
 	})
-	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, disableSSLVerification)
+	httpClient := httpclient.GetHttpClient(disableSSLVerification)
+	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, httpClient)
 	return err
 }
 
@@ -166,7 +167,8 @@ func httpPutBreakTimer(timeoutInMinutes int, room string, user string, timerServ
 		"breaktimer": timeoutInMinutes,
 		"user":       user,
 	})
-	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, disableSSLVerification)
+	httpClient := httpclient.GetHttpClient(disableSSLVerification)
+	_, err := httpclient.SendRequest(putBody, "PUT", timerService+room, httpClient)
 	return err
 }