diff options
| author | James Moger <james.moger@gitblit.com> | 2013-06-17 16:00:17 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-06-17 16:00:17 -0400 |
| commit | 06116dd5f166ec2fff0531d21d6a291c9018703c (patch) | |
| tree | c46a97a5fa6fb3dcd496251b66ce4d3ae9bb1e35 /src/main | |
| parent | 06b691211585fbe4049099b15fffb4cdc42cb728 (diff) | |
| download | gitblit-06116dd5f166ec2fff0531d21d6a291c9018703c.tar.gz gitblit-06116dd5f166ec2fff0531d21d6a291c9018703c.zip | |
Minor tweaks to SalesForce user service
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/distrib/data/gitblit.properties | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/Constants.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/SalesforceUserService.java | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 412bcae2..9f7eb778 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -1128,7 +1128,7 @@ realm.salesforce.backingUserService = ${baseFolder}/users.conf # 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 5ed0a256..2c64570d 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -480,7 +480,7 @@ public class Constants { }
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 989b4878..aa0795ac 100644 --- a/src/main/java/com/gitblit/SalesforceUserService.java +++ b/src/main/java/com/gitblit/SalesforceUserService.java @@ -5,6 +5,7 @@ import java.io.File; 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 class SalesforceUserService extends GitblitUserService { 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; |