updates from PR feedback

Author: Glover, Rene (rg9975)

plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java

@@ -205,7 +205,6 @@ public static AuthnRequest buildAuthnRequestObject(final String authnId, final S
         authnRequest.setAssertionConsumerServiceURL(consumerUrl);
         authnRequest.setProviderName(spId);
         authnRequest.setIssuer(issuer);
-        //authnRequest.setRequestedAuthnContext(requestedAuthnContext);
 
         return authnRequest;
     }

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1447,9 +1447,7 @@ public UserVO createUser(String userName, String password, String firstName, Str
         List<UserVO> duplicatedUsers = _userDao.findUsersByName(userName);
         for (UserVO duplicatedUser : duplicatedUsers) {
             // users can't exist in same account
-            if (duplicatedUser.getAccountId() == account.getId()) {
-                throw new InvalidParameterValueException(String.format("Username [%s] already exists in account [id=%s,name=%s]", duplicatedUser.getUsername(), account.getUuid(), account.getAccountName()));
-            }
+            assertUserAlreadyInAccount(duplicatedUser, account);
         }
 
         UserVO user = null;
@@ -1592,15 +1590,7 @@ protected void validateAndUpdateUsernameIfNeeded(UpdateUserCmd updateUserCmd, Us
             }
 
             // users can't exist in same account
-            if (duplicatedUser.getAccountId() == account.getId()) {
-                throw new InvalidParameterValueException(String.format("Username [%s] already exists in account [id=%s,name=%s]", duplicatedUser.getUsername(), account.getUuid(), account.getAccountName()));
-            }
-
-            /**Account duplicatedUserAccountWithUserThatHasTheSameUserName = _accountDao.findById(duplicatedUser.getAccountId());
-            if (duplicatedUserAccountWithUserThatHasTheSameUserName.getDomainId() == account.getDomainId()) {
-                DomainVO domain = _domainDao.findById(duplicatedUserAccountWithUserThatHasTheSameUserName.getDomainId());
-                throw new InvalidParameterValueException(String.format("Username [%s] already exists in domain [id=%s,name=%s]", duplicatedUser.getUsername(), domain.getUuid(), domain.getName()));
-            }*/
+            assertUserAlreadyInAccount(duplicatedUser, account);
         }
         user.setUsername(userName);
     }
@@ -3522,4 +3512,10 @@ public UserAccount clearUserTwoFactorAuthenticationInSetupStateOnLogin(UserAccou
             return userAccountVO;
         });
     }
+
+    private void assertUserAlreadyInAccount(User user, Account account) {
+       if (user.getAccountId() == account.getId()) {
+           throw new InvalidParameterValueException(String.format("Username [%s] already exists in account [id=%s,name=%s]", user.getUsername(), account.getUuid(), account.getAccountName()));
+       }
+    }
 }

ui/src/components/header/SamlDomainSwitcher.vue

@@ -52,7 +52,7 @@
 <script>
 import store from '@/store'
 import { api } from '@/api'
-// import _ from 'lodash'
+import _ from 'lodash'
 
 export default {
   name: 'SamlDomainSwitcher',
@@ -89,7 +89,7 @@ export default {
             return
           }
           this.samlAccounts = samlAccounts
-          // this.samlAccounts =_.orderBy(samlAccounts, ['domainPath'], ['asc'])
+          this.samlAccounts =_.orderBy(samlAccounts, ['domainPath'], ['asc'])
           const currentAccount = this.samlAccounts.filter(x => {
             return x.userId === store.getters.userInfo.id
           })[0]