fix domain path issue

Author: Daman Arora

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

@@ -21,7 +21,10 @@
 import java.util.Map;
 
 import com.cloud.api.response.ApiResponseSerializer;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
 import com.cloud.user.Account;
+import com.cloud.utils.component.ComponentContext;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -61,6 +64,10 @@ public class VerifyOAuthCodeAndGetUserCmd extends BaseListCmd implements APIAuth
             description = "Domain ID for domain-specific OAuth provider lookup")
     private Long domainId;
 
+    @Parameter(name = ApiConstants.DOMAIN, type = CommandType.STRING,
+            description = "Domain path for domain-specific OAuth provider lookup")
+    private String domainPath;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -83,6 +90,8 @@ public Long getDomainId() {
 
     protected OAuth2AuthManager _oauth2mgr;
 
+    DomainDao _domainDao;
+
     @Override
     public long getEntityOwnerId() {
         return Account.Type.NORMAL.ordinal();
@@ -108,6 +117,19 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
         if (ArrayUtils.isNotEmpty(domainIdArray)) {
             domainId = Long.parseLong(domainIdArray[0]);
         }
+        final String[] domainArray = (String[])params.get(ApiConstants.DOMAIN);
+        if (ArrayUtils.isNotEmpty(domainArray) && domainId == null) {
+            String path = domainArray[0];
+            if (path != null && !"/".equals(path)) {
+                // Look up domain by path - ensure path starts with /
+                String fullPath = path.startsWith("/") ? path : "/" + path;
+                if (!fullPath.endsWith("/")) fullPath = fullPath + "/";
+                DomainVO domain = _domainDao.findDomainByPath(fullPath);
+                if (domain != null) {
+                    domainId = domain.getId();
+                }
+            }
+        }
 
         String email = _oauth2mgr.verifyCodeAndFetchEmail(secretCode, provider, domainId);
         if (email != null) {
@@ -137,5 +159,9 @@ public void setAuthenticators(List<PluggableAPIAuthenticator> authenticators) {
         if (_oauth2mgr == null) {
             logger.error("No suitable Pluggable Authentication Manager found for listing OAuth providers");
         }
+        _domainDao = (DomainDao) ComponentContext.getComponent(DomainDao.class);
+        if (_domainDao == null) {
+            logger.error("Could not get DomainDao component");
+        }
     }
 }