Merge pull request #121 from Selvasundaram/master

Removing the background flash image from change password wizard and Authentication issue on change password fix

3 files changed, 22 insertions, 15 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
index 45dcf27f..c0590d5f 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
@@ -18,18 +18,13 @@
  *******************************************************************************/
 package com.gluster.storage.management.client;
 
-import java.net.ConnectException;
-
-import javax.ws.rs.core.Response;
-
 import org.apache.log4j.Logger;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.Base64;
 
+
 public class UsersClient extends AbstractClient {
 	private static final String RESOURCE_NAME = "users";
 	private static final String FORM_PARAM_OLD_PASSWORD = "oldpassword";
@@ -60,8 +55,7 @@ public class UsersClient extends AbstractClient {
 		putRequest(user, form);
 		
 		// password changed. set the new security token
-		setSecurityToken(generateSecurityToken(user, newPassword));
-		GlusterDataModelManager.getInstance().setSecurityToken(getSecurityToken());
+		authenticate(user, newPassword);
 	}
 
 	public static void main(String[] args) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
index 1a04ece2..d62c5dcb 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
@@ -46,11 +46,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.UsersClient;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.ConnectionDetails;
-import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.validators.StringRequiredValidator;
 
@@ -128,7 +126,7 @@ public class ChangePasswordDialog extends Dialog {
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE));
+		// parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE));
 		parent.setBackgroundMode(SWT.INHERIT_FORCE);
 
 		composite = (Composite) super.createDialogArea(parent);
@@ -178,11 +176,17 @@ public class ChangePasswordDialog extends Dialog {
 			okButton.setEnabled(false);
 			return;
 		}
-		
+
+		if (confirmPwd.equals(CoreConstants.DEFAULT_PASSWORD)) {
+			okButton.setEnabled(false);
+			return;
+		}
+
 		if (newPwd.length() < 4 ) { // Minimum  password length is 4
 			okButton.setEnabled(false);
 			return;
 		}
+
 		okButton.setEnabled(true);
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
index 44a08ce8..6cb15d6a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
@@ -208,13 +208,22 @@ public class LoginDialog extends Dialog {
 		
 		// authentication successful. close the login dialog and open the next one.
 		close();
+
 		// If the password is default, Let user to change the password
-		if (password.equalsIgnoreCase( CoreConstants.DEFAULT_PASSWORD )) {
+		if (password.equalsIgnoreCase(CoreConstants.DEFAULT_PASSWORD)) {
+			String oldSecurityTokeString = GlusterDataModelManager.getInstance().getSecurityToken();
 			ChangePasswordDialog dialog = new ChangePasswordDialog(getShell());
 			dialog.open();
+
+			if (GlusterDataModelManager.getInstance().getSecurityToken().equals(oldSecurityTokeString)) {
+				MessageDialog.openInformation(getShell(), "Change password Cancelled",
+						"Gateway could not be accessed with default password !" + "\n\n" + "Application will close.");
+				cancelPressed();
+				return;
+			}
 		}
-		
-		ClustersClient clustersClient = new ClustersClient(usersClient.getSecurityToken());
+
+		ClustersClient clustersClient = new ClustersClient();
 
 		IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
 		boolean showClusterSelectionDialog = preferenceStore.getBoolean(PreferenceConstants.P_SHOW_CLUSTER_SELECTION_DIALOG);