SLE-431 Improve feedback when connection cannot be stored because of …

…secure storage error
SonarSource · Jul 15, 2021 · f531b27 · f531b27
1 parent c50573b
commit f531b27
Showing 1 changed file with 35 additions and 17 deletions.
diff --git a/...c/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java b/...c/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java
@@ -27,6 +27,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.IPageChangingListener;
 import org.eclipse.jface.dialogs.PageChangingEvent;
@@ -225,25 +226,41 @@ public boolean canFinish() {
 
   @Override
   public boolean performFinish() {
-    if (model.isEdit() && !testConnection(model.getOrganization())) {
+    try {
+      if (model.isEdit() && !testConnection(model.getOrganization())) {
+        return false;
+      }
+
+      if (model.isEdit()) {
+        editedServer.updateConfig(model.getServerUrl(), model.getOrganization(), model.getUsername(), model.getPassword(), model.getNotificationsDisabled());
+        resultServer = editedServer;
+      } else {
+        finalizeConnectionCreation();
+      }
+
+      updateConnectionStorage();
+      return true;
+    } catch (Exception e) {
+      DialogPage currentPage = (DialogPage) getContainer().getCurrentPage();
+      currentPage.setErrorMessage("Cannot create connection: " + e.getMessage());
+      SonarLintLogger.get().error("Error when finishing server connection wizard", e);
       return false;
     }
+  }
 
-    if (model.isEdit()) {
-      editedServer.updateConfig(model.getServerUrl(), model.getOrganization(), model.getUsername(), model.getPassword(), model.getNotificationsDisabled());
-      resultServer = editedServer;
-
-    } else {
-      resultServer = SonarLintCorePlugin.getServersManager().create(model.getConnectionId(), model.getServerUrl(), model.getOrganization(), model.getUsername(), model.getPassword(),
-        model.getNotificationsDisabled());
-      SonarLintCorePlugin.getServersManager().addServer(resultServer, model.getUsername(), model.getPassword());
-      try {
-        PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(BindingsView.ID);
-      } catch (PartInitException e) {
-        SonarLintLogger.get().error("Unable to open SonarLint bindings view", e);
-      }
+  private void finalizeConnectionCreation() {
+    resultServer = SonarLintCorePlugin.getServersManager().create(model.getConnectionId(), model.getServerUrl(), model.getOrganization(), model.getUsername(),
+      model.getPassword(),
+      model.getNotificationsDisabled());
+    SonarLintCorePlugin.getServersManager().addServer(resultServer, model.getUsername(), model.getPassword());
+    try {
+      PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(BindingsView.ID);
+    } catch (PartInitException e) {
+      SonarLintLogger.get().error("Unable to open SonarLint bindings view", e);
     }
+  }
 
+  private void updateConnectionStorage() {
     Job job = new ServerUpdateJob(resultServer);
 
     List<ISonarLintProject> boundProjects = resultServer.getBoundProjects();
@@ -260,14 +277,15 @@ public boolean performFinish() {
     List<ISonarLintProject> selectedProjects = model.getSelectedProjects();
     if (!skipBindingWizard) {
       if (selectedProjects != null && !selectedProjects.isEmpty()) {
-        ProjectBindingWizard.createDialogSkipServerSelection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), selectedProjects, (ConnectedEngineFacade) resultServer)
+        ProjectBindingWizard
+          .createDialogSkipServerSelection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), selectedProjects, (ConnectedEngineFacade) resultServer)
           .open();
       } else if (boundProjects.isEmpty()) {
-        ProjectBindingWizard.createDialogSkipServerSelection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Collections.emptyList(), (ConnectedEngineFacade) resultServer)
+        ProjectBindingWizard
+          .createDialogSkipServerSelection(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Collections.emptyList(), (ConnectedEngineFacade) resultServer)
           .open();
       }
     }
-    return true;
   }
 
   public IConnectedEngineFacade getResultServer() {