Merge branch 'tenant-improve' into 'tenant-improve'

Fix user verifying functionality in OTP

See merge request entgra/carbon-device-mgt!617

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java

@@ -213,8 +213,8 @@ public class OTPManagementServiceImpl implements OTPManagementService {
 
         String[] superTenantDetails = otpWrapper.getUsername().split("@");
 
-        if (MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(superTenantDetails[1]) || !superTenantDetails[0]
+        if (!MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(superTenantDetails[superTenantDetails.length - 1])
-                .equals(kmConfig.getAdminUsername())) {
+                || !superTenantDetails[0].equals(kmConfig.getAdminUsername())) {
             String msg = "You don't have required permission to create OTP";
             log.error(msg);
             throw new UnAuthorizedException(msg);