From 06116dd5f166ec2fff0531d21d6a291c9018703c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Jun 2013 16:00:17 -0400
Subject: [PATCH] Minor tweaks to SalesForce user service
---
src/main/java/com/gitblit/SalesforceUserService.java | 7 ++++++-
src/main/java/com/gitblit/Constants.java | 2 +-
src/main/distrib/data/gitblit.properties | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 412bcae..9f7eb77 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -1128,7 +1128,7 @@
# Restrict the Salesforce user to members of this org.
# default: 0 (i.e. do not check the Org ID)
#
-# RESTART REQUIRED
+# SINCE 1.3.0
realm.salesforce.orgId = 0
# URL of the LDAP server.
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 5ed0a25..2c64570 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -480,7 +480,7 @@
}
public static enum AccountType {
- LOCAL, LDAP, REDMINE;
+ LOCAL, LDAP, REDMINE, SALESFORCE;
public boolean isLocal() {
return this == LOCAL;
diff --git a/src/main/java/com/gitblit/SalesforceUserService.java b/src/main/java/com/gitblit/SalesforceUserService.java
index 989b487..aa0795a 100644
--- a/src/main/java/com/gitblit/SalesforceUserService.java
+++ b/src/main/java/com/gitblit/SalesforceUserService.java
@@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Constants.AccountType;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
@@ -18,7 +19,11 @@
public static final Logger logger = LoggerFactory
.getLogger(SalesforceUserService.class);
private IStoredSettings settings;
-
+
+ protected AccountType getAccountType() {
+ return AccountType.SALESFORCE;
+ }
+
@Override
public void setup(IStoredSettings settings) {
this.settings = settings;
--
Gitblit v1.9.1