From d8426e9287c37a8e6e277a0e84929239269fd0d5 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Wed, 16 Mar 2011 14:35:50 +0530
Subject: Introduced security token for REST clients

Signed-off-by: Shireesh Anjal <shireesh@gluster.com>
---
 .../src/com/gluster/storage/management/gui/login/LoginDialog.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'com.gluster.storage.management.gui/src/com/gluster/storage')

diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
index 851425ea..3e7fa5c3 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
@@ -39,6 +39,7 @@ 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.model.ConnectionDetails;
 import com.gluster.storage.management.gui.IImageKeys;
@@ -186,11 +187,13 @@ public class LoginDialog extends Dialog {
 		String user = connectionDetails.getUserId();
 		String password = connectionDetails.getPassword();
 		String server = connectionDetails.getServer();
-		if (new UsersClient(server, user, password).authenticate()) {
+
+		UsersClient usersClient = new UsersClient(server);
+		if (usersClient.authenticate(user, password)) {
+			GlusterDataModelManager.getInstance().initializeModel(server, usersClient.getSecurityToken());
 			super.okPressed();
 		} else {
 			MessageDialog.openError(getShell(), "Authentication Failed", "Invalid User ID or password");
-			return;
 		}
 	}
 }
-- 
cgit