Avoid code duplication

Author: MatteoPologruto

certificates/certificates.go

@@ -302,14 +302,19 @@ func PromptExpiredCerts(certDir *paths.Path) {
 				log.Errorf("cannot uninstall certificates something went wrong: %s", err)
 			} else {
 				DeleteCertificates(certDir)
-				GenerateCertificates(certDir)
-				err := InstallCertificate(certDir.Join("ca.cert.cer"))
-				// if something goes wrong during the cert install we remove them, so the user is able to retry
-				if err != nil {
-					log.Errorf("cannot install certificates something went wrong: %s", err)
-					DeleteCertificates(certDir)
-				}
+				GenerateAndInstallCertificates(certDir)
 			}
 		}
 	}
 }
+
+// GenerateAndInstallCertificates generates and installs the certificates
+func GenerateAndInstallCertificates(certDir *paths.Path) {
+	GenerateCertificates(certDir)
+	err := InstallCertificate(certDir.Join("ca.cert.cer"))
+	// if something goes wrong during the cert install we remove them, so the user is able to retry
+	if err != nil {
+		log.Errorf("cannot install certificates something went wrong: %s", err)
+		DeleteCertificates(certDir)
+	}
+}

main.go

@@ -237,14 +237,7 @@ func loop() {
 				if err != nil {
 					log.Panicf("config.ini cannot be parsed: %s", err)
 				}
-				certDir := config.GetCertificatesDir()
-				cert.GenerateCertificates(certDir)
-				err := cert.InstallCertificate(certDir.Join("ca.cert.cer"))
-				// if something goes wrong during the cert install we remove them, so the user is able to retry
-				if err != nil {
-					log.Errorf("cannot install certificates something went wrong: %s", err)
-					cert.DeleteCertificates(certDir)
-				}
+				cert.GenerateAndInstallCertificates(config.GetCertificatesDir())
 			} else {
 				err = config.SetInstallCertsIni(configPath.String(), "false")
 				if err != nil {
@@ -384,14 +377,7 @@ func loop() {
 			} else {
 				// installing the certificates from scratch at this point should only happen if
 				// something went wrong during previous installation attempts
-				certDir := config.GetCertificatesDir()
-				cert.GenerateCertificates(certDir)
-				err := cert.InstallCertificate(certDir.Join("ca.cert.cer"))
-				// if something goes wrong during the cert install we remove them, so the user is able to retry
-				if err != nil {
-					log.Errorf("cannot install certificates something went wrong: %s", err)
-					cert.DeleteCertificates(certDir)
-				}
+				cert.GenerateAndInstallCertificates(config.GetCertificatesDir())
 			}
 		}
 	}

systray/systray_real.go

@@ -109,14 +109,8 @@ func (s *Systray) start() {
 				}
 				pressedButton := utilities.UserPrompt("display dialog \"" + infoMsg + "\" buttons " + buttons + " with title \"Arduino Agent: manage HTTPS certificates\"")
 				if strings.Contains(pressedButton, "Install certificate for Safari") {
-					cert.GenerateCertificates(certDir)
-					err := cert.InstallCertificate(certDir.Join("ca.cert.cer"))
-					// if something goes wrong during the cert install we remove them, so the user is able to retry
-					if err != nil {
-						log.Errorf("cannot install certificates something went wrong: %s", err)
-						cert.DeleteCertificates(certDir)
-					}
-					err = config.SetInstallCertsIni(s.currentConfigFilePath.String(), "true")
+					cert.GenerateAndInstallCertificates(certDir)
+					err := config.SetInstallCertsIni(s.currentConfigFilePath.String(), "true")
 					if err != nil {
 						log.Errorf("cannot set installCerts value in config.ini: %s", err)
 					}