Merge upstream dev into fix/add-ios17-authflowtester

Author: wmathurin

.github/workflows/pr.yaml

@@ -138,9 +138,20 @@ jobs:
 
   ui-tests-pr:
     needs: [test-orchestrator]
+    strategy:
+      fail-fast: false
+      matrix:
+        ios: [^26, ^18]
+        include:
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
     uses: ./.github/workflows/reusable-ui-test-workflow.yaml
     with:
       is_pr: true
+      ios: ${{ matrix.ios }}
+      xcode: ${{ matrix.xcode }}
       pr_test: "AuthFlowTesterUITests/LegacyLoginTests/testCAOpaque_DefaultScopes_WebServerFlow"
       short_timeout: "2"
       long_timeout: "7"

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Identity/SFIdentityCoordinator.m

@@ -135,11 +135,6 @@ - (NSString *)validateParameters
         if ([invalidParameters length] > 0) [invalidParameters appendString:@", "];
         [invalidParameters appendString:@"identity URL"];
     }
-    SFScopeParser *scopeParser = [[SFScopeParser alloc] initWithScopes:self.credentials.scopes];
-    if (![scopeParser hasIdentityScope]) {
-        if ([invalidParameters length] > 0) [invalidParameters appendString:@", "];
-        [invalidParameters appendString:@"identity scope"];
-    }
 
     NSString *invalidParametersError = nil;
     if ([invalidParameters length] > 0) {

native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/PageObjects/LoginPageObject.swift

@@ -221,7 +221,13 @@ class LoginPageObject {
     }
 
     private func advancedAuthCloseButton() -> XCUIElement {
-        return app.otherElements["TopBrowserBar"].buttons["Close"]
+        let topBar = app.otherElements["TopBrowserBar"]
+        let closeButton = topBar.buttons["Close"]
+        if closeButton.exists {
+            return closeButton
+        }
+        // Earlier iOS versions use "Cancel"
+        return topBar.buttons["Cancel"]
     }
 
     // MARK: - Actions