Skip to content

Fix AAD IT failure of cannot redirect to password page #19479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiliuTo merged 7 commits into from
Mar 3, 2021
Merged

Fix AAD IT failure of cannot redirect to password page #19479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a1d984
print actual page
yiliuTo Feb 26, 2021
3786eb4
move log after exception
yiliuTo Mar 1, 2021
e1c439c
restore helper class
yiliuTo Mar 1, 2021
3f9b5a9
solve account type selection
yiliuTo Mar 1, 2021
7ecbf0a
choose account type is needed
yiliuTo Mar 1, 2021
d0470cd
add error info
yiliuTo Mar 2, 2021
e4a1a54
combine logback.xml
yiliuTo Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion ...e-spring-boot-test-aad/src/test/java/com/azure/test/aad/selenium/AADSeleniumITHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.openqa.selenium.By;
import org.openqa.selenium.Keys;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.Map;
Expand All @@ -17,6 +19,8 @@

public class AADSeleniumITHelper extends SeleniumITHelper {

private static final Logger LOGGER = LoggerFactory.getLogger(AADSeleniumITHelper.class);

private String username;
private String password;

Expand All @@ -43,7 +47,23 @@ public AADSeleniumITHelper(Class<?> appClass, Map<String, String> properties, St
public void logIn() {
driver.get(app.root() + "oauth2/authorization/azure");
wait.until(ExpectedConditions.visibilityOfElementLocated(By.name("loginfmt"))).sendKeys(username + Keys.ENTER);
wait.until(ExpectedConditions.visibilityOfElementLocated(By.name("passwd"))).sendKeys(password + Keys.ENTER);
try {
try {
wait.until(ExpectedConditions.visibilityOfElementLocated(By.name("passwd"))).sendKeys(password + Keys.ENTER);
} catch (Exception exception) {
// Sometimes AAD cannot locate the user account and will ask to select it's a work account or personal account.
// Here select work accout.
// https://docs.microsoft.com/azure/devops/organizations/accounts/faq-azure-access?view=azure-devops#q-why-do-i-have-to-choose-between-a-work-or-school-account-and-my-personal-account
wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("aadTileTitle"))).click();
wait.until(ExpectedConditions.visibilityOfElementLocated(By.name("passwd"))).sendKeys(password + Keys.ENTER);
}
} catch (Exception exception) {
String passwdUrl = driver.getCurrentUrl();
LOGGER.info(passwdUrl);
String pageSource = driver.getPageSource();
LOGGER.info(pageSource);
throw exception;
}
wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("input[type='submit']"))).click();
}

Expand Down
10 changes: 9 additions & 1 deletion sdk/spring/azure-spring-boot-test-selenium-common/src/main/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<configuration>
<logger name="org.apache.hc" level="INFO" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>