Merge branch 'dev' into revert-2651-revert-2587-gradleVersionChange2

somalaya · web-flow · commit c76ba0366003 · 2025-06-23T12:15:54.000-07:00
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/IOAuth2LoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/IOAuth2LoginComponentHandler.java
@@ -38,9 +38,10 @@ public interface IOAuth2LoginComponentHandler {
     /**
      * Enters the supplied password in the password field of a login page.
      *
-     * @param password the password of the user
+     * @param password     the password of the user
+     * @param isMsaAccount whether or not using msa account
      */
-    void handlePasswordField(final String password);
+    void handlePasswordField(final String password, final boolean isMsaAccount);
 
     /**
      * Clicks the back button on a login page.
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/B2CIdLabLocalLoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/B2CIdLabLocalLoginComponentHandler.java
@@ -45,7 +45,7 @@ public void handleEmailField(@NonNull final String username) {
     }
 
     @Override
-    public void handlePasswordField(@NonNull final String password) {
+    public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {
         Logger.i(TAG, "Handle B2C IdLab Local Login Password UI..");
         UiAutomatorUtils.handleInput("password", password);
         handleNextButton();
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/FacebookLoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/FacebookLoginComponentHandler.java
@@ -49,7 +49,7 @@ public void handleEmailField(@NonNull final String username) {
     }
 
     @Override
-    public void handlePasswordField(@NonNull final String password) {
+    public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {
         Logger.i(TAG, "Handle Facebook Login Password UI..");
         UiAutomatorUtils.handleInput("m_login_password", password);
         handleNextButton();
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/GoogleLoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/GoogleLoginComponentHandler.java
@@ -55,7 +55,7 @@ public void handleEmailField(@NonNull final String username) {
     }
 
     @Override
-    public void handlePasswordField(@NonNull final String password) {
+    public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {
         Logger.i(TAG, "Handle Google Login Password UI..");
         UiAutomatorUtils.handleInput("password", password);
         final UiObject passwordBox = UiAutomatorUtils.obtainUiObjectWithResourceId("password");
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/IdLabB2cSisoPolicyPromptHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/b2c/IdLabB2cSisoPolicyPromptHandler.java
@@ -66,7 +66,7 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p
         }
 
         if (!parameters.isSessionExpected()) {
-            loginComponentHandler.handlePasswordField(password);
+            loginComponentHandler.handlePasswordField(password, false);
 
             if (loginComponentHandler instanceof GoogleLoginComponentHandler &&
                     b2CProvider == B2CProviderWrapper.Google){
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java
@@ -26,7 +26,6 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
-import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.UiObjectNotFoundException;
 import androidx.test.uiautomator.UiSelector;
 
@@ -42,7 +41,6 @@
 
 import android.widget.Button;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -80,8 +78,26 @@ public void handleEmailField(@NonNull final String username) {
     }
 
     @Override
-    public void handlePasswordField(@NonNull final String password) {
+    public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {
         Logger.i(TAG, "Handle Aad Login Password UI..");
+
+        // We need to temporarily handle both possible flows for msa accounts.
+        // 1. If the user is using an MSA account, we may see a screen prompting MFA or OTP, with an option that
+        // says "Other ways to sign in"
+        // 2. No OTP or MFA, just prompted for password right away.
+        if (isMsaAccount) {
+            final UiObject otherWays = UiAutomatorUtils.obtainUiObjectWithExactText("Other ways to sign in", CommonUtils.FIND_UI_ELEMENT_TIMEOUT_SHORT);
+            if (otherWays.exists()) {
+                try {
+                    otherWays.click();
+
+                    UiAutomatorUtils.handleButtonClickForObjectWithExactText("Use your password");
+                } catch (final UiObjectNotFoundException e) {
+                    throw new AssertionError(e);
+                }
+            }
+        }
+
         UiAutomatorUtils.obtainUiObjectWithText("password", mFindLoginUiElementTimeout);
         try {
             UiAutomatorUtils.handleInputByClass("android.widget.EditText", password, mFindLoginUiElementTimeout);
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AdfsLoginComponentHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AdfsLoginComponentHandler.java
@@ -48,7 +48,7 @@ public void handleEmailField(@NonNull final String username) {
     }
 
     @Override
-    public void handlePasswordField(@NonNull final String password) {
+    public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {
         Logger.i(TAG, "Handle Adfs Login Password UI..");
         try {
             UiAutomatorUtils.handleInput("passwordInput", password, CommonUtils.FIND_UI_ELEMENT_TIMEOUT_SHORT);
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/MicrosoftStsPromptHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/MicrosoftStsPromptHandler.java
@@ -66,6 +66,8 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p
         final IMicrosoftStsLoginComponentHandler aadLoginComponentHandler =
                 (IMicrosoftStsLoginComponentHandler) loginComponentHandler;
 
+        final Boolean isMsaAccount = isMsaAccount(username);
+
         // if login hint was not provided, then we need to handle either account picker or email
         // field. If it was provided, then we expect to go straight to password field.
         if (!loginHintProvided) {
@@ -89,7 +91,7 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p
         }
 
         if (parameters.isPasswordPageExpected() || parameters.getPrompt() == PromptParameter.LOGIN || !parameters.isSessionExpected()) {
-            loginComponentHandler.handlePasswordField(password);
+            loginComponentHandler.handlePasswordField(password, isMsaAccount);
         }
 
         if (parameters.isVerifyYourIdentityPageExpected()) {
@@ -142,10 +144,16 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p
 
         if (parameters.isSecondPasswordPageExpected()) {
             try {
-                loginComponentHandler.handlePasswordField(password);
+                loginComponentHandler.handlePasswordField(password, isMsaAccount);
             } catch (AssertionError e) {
                 // Let's not throw an error if we fail on the second password field, sometimes seems to not show up in tests that use it.
             }
         }
     }
+
+    private Boolean isMsaAccount(@NonNull final String username) {
+        // We'll probably need to update this in the future, if additional MSA accounts get
+        // added to lab that don't have outlook domain
+        return username.contains("outlook.com");
+    }
 }
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/TlsPromptHandler.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/TlsPromptHandler.java
@@ -23,7 +23,6 @@
 package com.microsoft.identity.client.ui.automation.interaction.microsoftsts;
 
 import android.text.TextUtils;
-import android.widget.ImageButton;
 
 import androidx.annotation.NonNull;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -42,8 +41,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static com.microsoft.identity.client.ui.automation.utils.CommonUtils.FIND_UI_ELEMENT_TIMEOUT;
-
 /**
  * A Prompt Handler for TLS login flows.
  */
@@ -109,7 +106,7 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p
         }
 
         if (parameters.isPasswordPageExpected() || parameters.getPrompt() == PromptParameter.LOGIN || !parameters.isSessionExpected()) {
-            loginComponentHandler.handlePasswordField(password);
+            loginComponentHandler.handlePasswordField(password, false);
         }
         // installing certificate.
         UiAutomatorUtils.handleButtonClick("android:id/button1");
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/PowerLiftIncidentRule.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/PowerLiftIncidentRule.java
@@ -2,6 +2,8 @@
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.microsoft.identity.client.ui.automation.powerlift.IPowerLiftIntegratedApp;
 import com.microsoft.identity.client.ui.automation.logging.Logger;
 import com.microsoft.identity.client.ui.automation.powerlift.ThrowableWithPowerLiftIncident;
@@ -32,33 +34,41 @@ public void evaluate() throws Throwable {
                 try {
                     base.evaluate();
                 } catch (final Throwable originalThrowable) {
-                    String powerLiftIncidentDetails = null;
-                    try {
-                        Logger.e(
-                                TAG,
-                                "Encountered error during test....creating PowerLift incident.",
-                                originalThrowable
-                        );
-                        powerLiftIncidentDetails = powerLiftIntegratedApp.createPowerLiftIncident();
-                    } catch (final Throwable powerLiftError) {
-                        Logger.e(
-                                TAG,
-                                "Oops...something went wrong...unable to create PowerLift incident.",
-                                powerLiftError
-                        );
-                    }
-                    if (TextUtils.isEmpty(powerLiftIncidentDetails)) {
-                        throw originalThrowable;
-                    } else {
-                        assert powerLiftIncidentDetails != null;
-                        throw new ThrowableWithPowerLiftIncident(
-                                powerLiftIntegratedApp,
-                                powerLiftIncidentDetails,
-                                originalThrowable
-                        );
-                    }
+                    attemptPowerLiftIncident(originalThrowable, powerLiftIntegratedApp);
                 }
             }
         };
     }
+
+    public static void attemptPowerLiftIncident(final Throwable originalThrowable, @Nullable final IPowerLiftIntegratedApp powerLiftIntegratedApp) throws Throwable {
+        if (powerLiftIntegratedApp == null) {
+            throw originalThrowable;
+        }
+
+        String powerLiftIncidentDetails = null;
+        try {
+            Logger.e(
+                    TAG,
+                    "Encountered error during test....creating PowerLift incident.",
+                    originalThrowable
+            );
+            powerLiftIncidentDetails = powerLiftIntegratedApp.createPowerLiftIncident();
+        } catch (final Throwable powerLiftError) {
+            Logger.e(
+                    TAG,
+                    "Oops...something went wrong...unable to create PowerLift incident.",
+                    powerLiftError
+            );
+        }
+        if (TextUtils.isEmpty(powerLiftIncidentDetails)) {
+            throw originalThrowable;
+        } else {
+            assert powerLiftIncidentDetails != null;
+            throw new ThrowableWithPowerLiftIncident(
+                    powerLiftIntegratedApp,
+                    powerLiftIncidentDetails,
+                    originalThrowable
+            );
+        }
+    }
 }
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RetryTestRule.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RetryTestRule.java
@@ -24,7 +24,9 @@
 
 import com.microsoft.identity.client.ui.automation.BuildConfig;
 import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
+import com.microsoft.identity.client.ui.automation.broker.ITestBroker;
 import com.microsoft.identity.client.ui.automation.logging.Logger;
+import com.microsoft.identity.client.ui.automation.powerlift.IPowerLiftIntegratedApp;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -39,6 +41,12 @@ public class RetryTestRule implements TestRule {
     private final static String TAG = RetryTestRule.class.getSimpleName();
     private final static int MINIMUM_NUMBER_OF_ATTEMPTS = BuildConfig.MINIMUM_TEST_ATTEMPTS;
 
+    private ITestBroker mBroker;
+
+    public RetryTestRule(final ITestBroker broker) {
+        this.mBroker = broker;
+    }
+
     @Override
     public Statement apply(final Statement base, final Description description) {
         return new Statement() {
@@ -85,7 +93,13 @@ public void evaluate() throws Throwable {
                         " - Giving up after " + numAttempts + " attempts as all attempts have failed :(");
 
                 assert caughtThrowable != null;
-                throw caughtThrowable;
+
+                // Create powerlift incident at the end of retry attempts
+                if (mBroker != null && mBroker instanceof IPowerLiftIntegratedApp && BuildConfig.SEND_POWERLIFT_LOGS) {
+                    PowerLiftIncidentRule.attemptPowerLiftIncident(caughtThrowable, (IPowerLiftIntegratedApp) mBroker);
+                } else {
+                    throw caughtThrowable;
+                }
             }
         };
     }
diff --git a/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RulesHelper.java b/uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RulesHelper.java
@@ -69,7 +69,7 @@ public static RuleChain getPrimaryRules(@Nullable final ITestBroker broker, Time
         RuleChain ruleChain = RuleChain.outerRule(new AutomationLoggingRule());
 
         Log.i(TAG, "Adding RetryTestRule");
-        ruleChain = ruleChain.around(new RetryTestRule());
+        ruleChain = ruleChain.around(new RetryTestRule(broker));
 
         Log.i(TAG, "Adding Timeout Rule");
         ruleChain = ruleChain.around(timeout);
@@ -107,11 +107,6 @@ public static RuleChain getPrimaryRules(@Nullable final ITestBroker broker, Time
             Log.i(TAG, "Adding InstallBrokerTestRule");
             ruleChain = ruleChain.around(new InstallBrokerTestRule(broker));
 
-            if (broker instanceof IPowerLiftIntegratedApp && BuildConfig.SEND_POWERLIFT_LOGS) {
-                Log.i(TAG, "Adding PowerLiftIncidentRule");
-                ruleChain = ruleChain.around(new PowerLiftIncidentRule((IPowerLiftIntegratedApp) broker));
-            }
-
             Log.i(TAG, "Adding DeviceEnrollmentFailureRecoveryRule");
             ruleChain = ruleChain.around(new DeviceEnrollmentFailureRecoveryRule());
         }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void handleEmailField(@NonNull final String username) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- public void handlePasswordField(@NonNull final String password) {`
	`48`	`+ public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {`
`49`	`49`	`Logger.i(TAG, "Handle B2C IdLab Local Login Password UI..");`
`50`	`50`	`UiAutomatorUtils.handleInput("password", password);`
`51`	`51`	`handleNextButton();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void handleEmailField(@NonNull final String username) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- public void handlePasswordField(@NonNull final String password) {`
	`52`	`+ public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {`
`53`	`53`	`Logger.i(TAG, "Handle Facebook Login Password UI..");`
`54`	`54`	`UiAutomatorUtils.handleInput("m_login_password", password);`
`55`	`55`	`handleNextButton();`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void handleEmailField(@NonNull final String username) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
`58`		`- public void handlePasswordField(@NonNull final String password) {`
	`58`	`+ public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {`
`59`	`59`	`Logger.i(TAG, "Handle Google Login Password UI..");`
`60`	`60`	`UiAutomatorUtils.handleInput("password", password);`
`61`	`61`	`final UiObject passwordBox = UiAutomatorUtils.obtainUiObjectWithResourceId("password");`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if (!parameters.isSessionExpected()) {`
`69`		`- loginComponentHandler.handlePasswordField(password);`
	`69`	`+ loginComponentHandler.handlePasswordField(password, false);`
`70`	`70`
`71`	`71`	`if (loginComponentHandler instanceof GoogleLoginComponentHandler &&`
`72`	`72`	`b2CProvider == B2CProviderWrapper.Google){`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void handleEmailField(@NonNull final String username) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public void handlePasswordField(@NonNull final String password) {`
	`51`	`+ public void handlePasswordField(@NonNull final String password, final boolean isMsaAccount) {`
`52`	`52`	`Logger.i(TAG, "Handle Adfs Login Password UI..");`
`53`	`53`	`try {`
`54`	`54`	`UiAutomatorUtils.handleInput("passwordInput", password, CommonUtils.FIND_UI_ELEMENT_TIMEOUT_SHORT);`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p`
`66`	`66`	`final IMicrosoftStsLoginComponentHandler aadLoginComponentHandler =`
`67`	`67`	`(IMicrosoftStsLoginComponentHandler) loginComponentHandler;`
`68`	`68`
	`69`	`+ final Boolean isMsaAccount = isMsaAccount(username);`
	`70`	`+`
`69`	`71`	`// if login hint was not provided, then we need to handle either account picker or email`
`70`	`72`	`// field. If it was provided, then we expect to go straight to password field.`
`71`	`73`	`if (!loginHintProvided) {`
`@@ -89,7 +91,7 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`if (parameters.isPasswordPageExpected() \|\| parameters.getPrompt() == PromptParameter.LOGIN \|\| !parameters.isSessionExpected()) {`
`92`		`- loginComponentHandler.handlePasswordField(password);`
	`94`	`+ loginComponentHandler.handlePasswordField(password, isMsaAccount);`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`if (parameters.isVerifyYourIdentityPageExpected()) {`
`@@ -142,10 +144,16 @@ public void handlePrompt(@NonNull final String username, @NonNull final String p`
`142`	`144`
`143`	`145`	`if (parameters.isSecondPasswordPageExpected()) {`
`144`	`146`	`try {`
`145`		`- loginComponentHandler.handlePasswordField(password);`
	`147`	`+ loginComponentHandler.handlePasswordField(password, isMsaAccount);`
`146`	`148`	`} catch (AssertionError e) {`
`147`	`149`	`// Let's not throw an error if we fail on the second password field, sometimes seems to not show up in tests that use it.`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`	`}`
	`153`	`+`
	`154`	`+ private Boolean isMsaAccount(@NonNull final String username) {`
	`155`	`+ // We'll probably need to update this in the future, if additional MSA accounts get`
	`156`	`+ // added to lab that don't have outlook domain`
	`157`	`+ return username.contains("outlook.com");`
	`158`	`+ }`
`151`	`159`	`}`