Centralize cookie creation

Change-Id: I1a17416121764f33a8d05a88c80cece0c03ac41d

1 files changed, 2 insertions, 8 deletions

diff --git a/src/main/java/com/gitblit/auth/SalesforceAuthProvider.java b/src/main/java/com/gitblit/auth/SalesforceAuthProvider.java
index fdda32af..e4273ff6 100644
--- a/src/main/java/com/gitblit/auth/SalesforceAuthProvider.java
+++ b/src/main/java/com/gitblit/auth/SalesforceAuthProvider.java
@@ -5,8 +5,6 @@ import com.gitblit.Constants.AccountType;
 import com.gitblit.Keys;
 import com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider;
 import com.gitblit.models.UserModel;
-import com.gitblit.utils.ArrayUtils;
-import com.gitblit.utils.StringUtils;
 import com.sforce.soap.partner.Connector;
 import com.sforce.soap.partner.GetUserInfoResult;
 import com.sforce.soap.partner.PartnerConnection;
@@ -62,15 +60,11 @@ public class SalesforceAuthProvider extends UsernamePasswordAuthenticationProvid
 			UserModel user = null;
 			synchronized (this) {
 				user = userManager.getUserModel(simpleUsername);
-				if (user == null)
+				if (user == null) {
 					user = new UserModel(simpleUsername);
-
-				if (StringUtils.isEmpty(user.cookie)
-						&& !ArrayUtils.isEmpty(password)) {
-					user.cookie = StringUtils.getSHA1(user.username
-							+ new String(password));
 				}
 
+				setCookie(user, password);
 				setUserAttributes(user, info);
 
 				updateUser(user);