Changeset 7362 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddCertificate.cs

Timestamp:

01/18/12 14:58:17 (12 years ago)

Author:

spimming

Message:

#1680:

• Check if password is valid for pfx file
• progress bar is now marquee style
• control flow refactored

File:

• branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddCertificate.cs (modified) (4 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddCertificate.cs

@@ -1 +1 @@
 using System;
 using System.ComponentModel;
-using System.Threading;
+using System.Security.Cryptography.X509Certificates;
 using System.Windows.Forms;
 
@@ -8 +8 @@
     private BackgroundWorker worker = new BackgroundWorker();
     public bool ErrorOccured { get; set; }
+    public string CertificateFile { get; set; }
+    public string CertificatePassword { get; set; }
 
     public AddCertificate() {
       InitializeComponent();
+      ErrorOccured = true;
+
       worker.DoWork += new DoWorkEventHandler(AddCertificateTask);
       worker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(WorkerCompleted);
@@ -28 +32 @@
 
     private void btnOk_Click(object sender, EventArgs e) {
-      if (tbCertificateFile.Text.Length == 0) {
+      CertificateFile = tbCertificateFile.Text;
+      CertificatePassword = tbCertificatePassword.Text;
+
+      if (CertificateFile.Length == 0) {
         MessageBox.Show("Certificate file is required", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-      } else if (tbCertificatePassword.Text.Length == 0) {
+      } else if (CertificatePassword.Length == 0) {
         MessageBox.Show("Password is required", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
       } else {
         SetControlsEnabled(false);
         progressBar.Visible = true;
-        worker.RunWorkerAsync();
+        var parameters = Tuple.Create<string, string>(CertificateFile, CertificatePassword);
+        worker.RunWorkerAsync(parameters);
       }
-
     }
 
@@ -48 +55 @@
 
     private void AddCertificateTask(object sender, DoWorkEventArgs e) {
-      try {
-        // simulate service call
-        Thread.Sleep(3000);
-      }
-      catch (Exception ex) {
-        ErrorOccured = true;
-        MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-      }
+      Tuple<string, string> parameters = e.Argument as Tuple<string, string>;
+      string file = parameters.Item1;
+      string pw = parameters.Item2;
+
+      X509Certificate cert = new X509Certificate(file, pw);
     }
 
     private void WorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
       progressBar.Visible = false;
-      if (!ErrorOccured) {
+
+      if (e.Error == null) {
+        ErrorOccured = false;
         this.Close();
       } else {
+        MessageBox.Show(e.Error.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        CertificateFile = string.Empty;
+        CertificateFile = string.Empty;
+        ErrorOccured = true;
         this.Show();
         SetControlsEnabled(true);