test_accounts.py failure fix - fallback using the camelCase parameter name "domainId" (as earlier)

Author: sureshanaparti

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/OauthLoginAPIAuthenticatorCmd.java

@@ -177,6 +177,10 @@ private String doOauthAuthentication(HttpSession session, Long domainId, String
 
     protected Long getDomainIdFromParams(Map<String, Object[]> params, StringBuilder auditTrailSb, String responseType) {
         String[] domainIdArr = (String[])params.get(ApiConstants.DOMAIN_ID);
+        if (domainIdArr == null) {
+            // Fallback to support clients using the camelCase parameter name "domainId"
+            domainIdArr = (String[])params.get(ApiConstants.DOMAIN__ID);
+        }
         Long domainId = null;
         if (domainIdArr != null && domainIdArr.length > 0) {
             try {

server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java

@@ -110,7 +110,11 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
         // FIXME: ported from ApiServlet, refactor and cleanup
         final String[] username = (String[])params.get(ApiConstants.USERNAME);
         final String[] password = (String[])params.get(ApiConstants.PASSWORD);
-        final String[] domainIdArr = (String[])params.get(ApiConstants.DOMAIN_ID);
+        String[] domainIdArr = (String[])params.get(ApiConstants.DOMAIN_ID);
+        if (domainIdArr == null) {
+            // Fallback to support clients using the camelCase parameter name "domainId"
+            domainIdArr = (String[])params.get(ApiConstants.DOMAIN__ID);
+        }
         Long domainId = null;
         if (domainIdArr != null && domainIdArr.length > 0) {
             try {