Moved #externalAccount string to common constants class

James Moger

2013-06-17 de3474a1ddd9201dec8246d7fd81e240b98bb6a5

Moved #externalAccount string to common constants class

 src/main/java/com/gitblit/Constants.java

@@ -43,6 +43,8 @@
    public static final String NOT_FEDERATED_ROLE = "#notfederated";

    

    public static final String NO_ROLE = "#none";

	
    public static final String EXTERNAL_ACCOUNT = "#externalAccount";



    public static final String PROPERTIES_FILE = "gitblit.properties";




 src/main/java/com/gitblit/GitblitUserService.java

@@ -52,8 +52,6 @@


    protected IUserService serviceImpl;

    

    protected final String ExternalAccount = "#externalAccount";



    private final Logger logger = LoggerFactory.getLogger(GitblitUserService.class);



    public GitblitUserService() {

@@ -324,7 +322,7 @@
    protected void setAccountType(UserModel user) {

        if (user != null) {

            if (!StringUtils.isEmpty(user.password)

                    && !ExternalAccount.equalsIgnoreCase(user.password)

                    && !Constants.EXTERNAL_ACCOUNT.equalsIgnoreCase(user.password)

                    && !"StoredInLDAP".equalsIgnoreCase(user.password)) {

                user.accountType = AccountType.LOCAL;

            } else {


 src/main/java/com/gitblit/LdapUserService.java

@@ -129,7 +129,7 @@
                                logger.debug("detecting removed LDAP users...");



                                for (UserModel userModel : super.getAllUsers()) {

                                    if (ExternalAccount.equals(userModel.password)) {

                                    if (Constants.EXTERNAL_ACCOUNT.equals(userModel.password)) {

                                        if (! ldapUsers.containsKey(userModel.username)) {

                                            logger.info("deleting removed LDAP user " + userModel.username + " from backing user service");

                                            super.deleteUser(userModel.username);

@@ -344,7 +344,7 @@
        setAdminAttribute(user);

        

        // Don't want visibility into the real password, make up a dummy

        user.password = ExternalAccount;

        user.password = Constants.EXTERNAL_ACCOUNT;

        user.accountType = getAccountType();

        

        // Get full name Attribute


 src/main/java/com/gitblit/RedmineUserService.java

@@ -135,7 +135,7 @@
        user.accountType = getAccountType();

        user.displayName = current.user.firstname + " " + current.user.lastname;

        user.emailAddress = current.user.mail;

        user.password = ExternalAccount;

        user.password = Constants.EXTERNAL_ACCOUNT;

        if (!StringUtils.isEmpty(current.user.login)) {

            // only admin users can get login name

            // evidently this is an undocumented behavior of Redmine


 src/main/java/com/gitblit/SalesforceUserService.java

@@ -96,7 +96,7 @@

    private void setUserAttributes(UserModel user, GetUserInfoResult info) {
        // Don't want visibility into the real password, make up a dummy
        user.password = ExternalAccount;
        user.password = Constants.EXTERNAL_ACCOUNT;
        user.accountType = getAccountType();

        // Get full name Attribute