Skip to content

Commit ab69751

Browse files
authored
Merge pull request #1541 from AzureAD/main
Merge Release 1.13.0 back to dev
2 parents bbc0915 + b2e54cf commit ab69751

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
lines changed

IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,18 +334,43 @@ - (void)enterPassword:(NSString *)password app:(XCUIApplication *)application is
334334
[self enterPassword:password
335335
app:application
336336
isMainApp:isMainApp];
337+
return;
337338
}
338-
else
339+
340+
useMyPasswordButton = application.buttons[@"Use your password"];
341+
if (useMyPasswordButton.exists)
342+
{
343+
[useMyPasswordButton tap];
344+
[self enterPassword:password
345+
app:application
346+
isMainApp:isMainApp];
347+
return;
348+
}
349+
350+
useMyPasswordButton = application.buttons[@"Use your password instead"];
351+
if (useMyPasswordButton.exists)
352+
{
353+
[useMyPasswordButton tap];
354+
[self enterPassword:password
355+
app:application
356+
isMainApp:isMainApp];
357+
return;
358+
}
359+
360+
useMyPasswordButton = application.buttons[@"Other ways to sign in"];
361+
if (useMyPasswordButton.exists)
339362
{
363+
[useMyPasswordButton tap];
364+
340365
useMyPasswordButton = application.buttons[@"Use your password"];
341-
if (useMyPasswordButton.exists)
366+
result = [self waitForElementsAndContinueIfNotAppear:useMyPasswordButton];
367+
if (result == XCTWaiterResultCompleted)
342368
{
343369
[useMyPasswordButton tap];
344370
[self enterPassword:password
345371
app:application
346372
isMainApp:isMainApp];
347373
}
348-
349374
}
350375
}
351376

changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 1.13.0
2+
* Improve logic for checking camera consent suppression flags (#1538)
3+
* Fix a potential crash related to webview in iOS26 (#1537)
4+
* Improve JIT troubleshooting in legacy auth flow (#1535)
5+
* Added ephemeral browser session to DUNA (#1534)
6+
17
Version 1.12.0
28
* Add classes to define jwe_crypto and APV (#1522)
39
* Add Request class to get nonce from server (#1525)

0 commit comments

Comments
 (0)