Kaisong1990/merge master to dev (#1452)

* Updating MSAL framework checksum & url for 1.1.25 [skip ci] * Merge release 1.1.26 in master (#1429) * Allow to pass eqp to the /token endpoint. * Update changelog. * .. * updated changelog * Update common core * Updating common-core for fix in embedded wv * Updating changelog * Add PR number in changelog * Update changelog. Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] * Release/1.2.0 (#1444) * Allow to pass eqp to the /token endpoint. * Update changelog. * .. * updated changelog * Update common core * Updating common-core for fix in embedded wv * Updating changelog * Add PR number in changelog * Add additional flag to know when to wipe cache for all accounts. * Add button to wipe all accounts in MSAL Test App * Update submodule * Update submodule * Update submodule * Merge master in dev (#1432) * Updating MSAL framework checksum & url for 1.1.25 [skip ci] * Merge release 1.1.26 in master (#1429) * Allow to pass eqp to the /token endpoint. * Update changelog. * .. * updated changelog * Update common core * Updating common-core for fix in embedded wv * Updating changelog * Add PR number in changelog * Update changelog. Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Multiple WPJ PkeyAuth support * Add a list of additional locations for partner caches to be wiped. Add unit test. * Update changelog * Update comments for wipeCacheForAllAccounts property. * Add SBOM task (#1425) * Add SBOM task. * Update sbom task. * Changes to expose Mdm Id via Device Info sso ext request * Addressed review comments * Multitenant PkeyAuth support * Merge dev in common core * Updated changelog * Fixed changelog * Fixed library version in Info.plist files * Revert breaking API change to unbreak MSAL CPP * Update code to remove token cache from additional locations, allow to continue in case one fails but keep track of the list of failed locations. * Fix build error, code will only run on MacOS * Updated to return mdmId only if not nil or not empty * Add more logs in getDeviceInfo flow due to an IcM (#1439) * Add more logs in getDeviceInfo flow due to an IcM * Address Cr * Read the keychain data in order to trigger the prompt asking for login password, user HAS TO click 'Always Allow' to then be able to delete it. * Update submodule * Return failing additional partner locations as userInfo in case of error. Add test that check wiping for additional partner locations. * Continue trying to remove remaining partner locations cache if there is a read error. * Update MSAL.podspec The project does not seem to be a preliminary preview any longer. * Update common core to v2 pkeyauth changes * Addressed additional comments * Addressed comments * Added more test cases * common core updated * updated msal to point to latest common core after common core merge * update versions * Kaisong1990/resolve merge release conflicts (#1442) * Updating MSAL framework checksum & url for 1.1.25 [skip ci] * Merge release 1.1.26 in master (#1429) * Allow to pass eqp to the /token endpoint. * Update changelog. * .. * updated changelog * Update common core * Updating common-core for fix in embedded wv * Updating changelog * Add PR number in changelog * Update changelog. Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] * point to release 1.7.5 * add a space to trigger pipeline Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: Sergei Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Kaisong1990/update automation device version (#1445) * Update the simulator target * fix for Umbrella header for module 'MSAL' does not include header 'MSALWipeCacheForAllAccountsConfig.h' in automation * Add fix to disable to disable 3 tests due to Labe pending certificate, also apply fix on one test * Update CommonCore submodule to align with its latest master hash (#1450) Co-authored-by: Sergey Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> Co-authored-by: Juan Arias Roldan <jariasroldan@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@olgas-work-mac.lan> Co-authored-by: Veena Soman <veenasoman@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@Olgas-Work-Mac.local> Co-authored-by: Wolfgang Lutz <WLBORg@gmx.de> Co-authored-by: Olga Dalton <oldalton@microsoft.com> Co-authored-by: Juan Arias <juan-arias@users.noreply.github.com> * Use dotnet 2.1.0 in release pipeline for ESRP * Adding workaround of installing corenet app 2.1.x for ESRP task * Updating MSAL framework checksum & url for 1.2.0 [skip ci] * resolve merge conflicts Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: Sergei Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> Co-authored-by: Juan Arias Roldan <jariasroldan@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@olgas-work-mac.lan> Co-authored-by: Veena Soman <veenasoman@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@Olgas-Work-Mac.local> Co-authored-by: Wolfgang Lutz <WLBORg@gmx.de> Co-authored-by: Olga Dalton <oldalton@microsoft.com> Co-authored-by: Juan Arias <juan-arias@users.noreply.github.com> Co-authored-by: Ameya Patil <ameyapat@buffalo.edu>
AzureAD · Mar 3, 2022 · 3bc25ad · 3bc25ad
1 parent 517f59c
commit 3bc25ad
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 8 deletions.
diff --git a/MSAL.podspec b/MSAL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.1.26"
+  s.version      = "1.2.0"
   s.summary      = "Microsoft Authentication Library (MSAL) for iOS"
   s.description  = <<-DESC
                    The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
diff --git a/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test Automation (iOS).xcscheme b/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test Automation (iOS).xcscheme
@@ -46,6 +46,17 @@
                BlueprintName = "InteractiveiOSTests"
                ReferencedContainer = "container:MSAL.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "MSALPingUITests/testInteractivePingLogin_withConvergedApp_withPromptAlways_withLoginHint_andPassedInWebView">
+               </Test>
+               <Test
+                  Identifier = "MSALPingUITests/testInteractivePingLogin_withConvergedApp_withPromptAlways_withLoginHint_andSystemWebView">
+               </Test>
+               <Test
+                  Identifier = "MSALPingUITests/testInteractivePingLogin_withNonConvergedApp_withPromptAlways_noLoginHint_andEmbeddedWebView">
+               </Test>
+            </SkippedTests>
          </TestableReference>
          <TestableReference
             skipped = "NO">

diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m
@@ -1448,7 +1448,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
             block(NO, localError, nil);
             return;
         }
-        
+
 #if !TARGET_OS_IPHONE
         // Clear additional cache locations
         NSDictionary<NSString *, NSDictionary *> *additionalPartnerLocations = MSALWipeCacheForAllAccountsConfig.additionalPartnerLocations;

diff --git a/MSAL/src/public/MSAL.h b/MSAL/src/public/MSAL.h
@@ -87,3 +87,4 @@ FOUNDATION_EXPORT const unsigned char MSAL__Framework_VersionString[];
 #import <MSAL/MSALAuthenticationSchemePop.h>
 #import <MSAL/MSALAuthenticationSchemeProtocol.h>
 #import <MSAL/MSALHttpMethod.h>
+#import <MSAL/MSALWipeCacheForAllAccountsConfig.h>
diff --git a/MSAL/test/automation/tests/MSALBaseUITest.m b/MSAL/test/automation/tests/MSALBaseUITest.m
@@ -374,7 +374,16 @@ - (void)closeAuthUIUsingWebViewType:(MSIDWebviewType)webViewType
         buttonTitle = @"Done";
     }
 
-    [self.testApp.buttons[buttonTitle] msidTap];
+    XCUIElementQuery *elementQuery = [self.testApp.buttons matchingIdentifier:buttonTitle];
+    if(elementQuery.count > 1)
+    {
+        // We take the second one and tap it
+        XCUIElement *secondButton = [elementQuery elementBoundByIndex:1];
+        [secondButton msidTap];
+    } else
+    {
+        [self.testApp.buttons[buttonTitle] msidTap];
+    }
 }
 
 - (void)closeResultView

diff --git a/Package.swift b/Package.swift
@@ -13,6 +13,6 @@ let package = Package(
           targets: ["MSAL"]),
   ],
   targets: [
-      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.1.26/MSAL.zip", checksum: "7430bc49be821cac9e459ef47470316dd8cc9f600b92e5ffbad39bb81254f3d2")
+      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.2.0/MSAL.zip", checksum: "5f586e23557fe88cfa1d1ecf2f4af68eced2808056e9736d4ae895c905314665")
   ]
 )
diff --git a/azure_pipelines/automation.yml b/azure_pipelines/automation.yml
@@ -74,7 +74,7 @@ jobs:
           -workspace MSAL.xcworkspace \
           -scheme "MSAL Test Automation (iOS)" \
           -sdk iphonesimulator \
-          -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.0' \
+          -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.2' \
           -derivedDataPath 'build' \
           | tee xcodebuild.log \
           | xcpretty -c
@@ -86,8 +86,8 @@ jobs:
       script: |
         ls build/Build/Products/
         xcodebuild test-without-building \
-            -xctestrun 'build/Build/Products/MSAL Test Automation (iOS)_iphonesimulator15.0-x86_64.xctestrun' \
-            -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.0' \
+            -xctestrun 'build/Build/Products/MSAL Test Automation (iOS)_iphonesimulator15.2-x86_64.xctestrun' \
+            -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.2' \
             -retry-tests-on-failure \
             -parallel-testing-enabled NO \
             -resultBundlePath '$(Agent.BuildDirectory)/s/test_output/report.xcresult'

diff --git a/azure_pipelines/spm-framework.yml b/azure_pipelines/spm-framework.yml
@@ -101,6 +101,12 @@ jobs:
       archiveType: 'zip'
       archiveFile: '$(Build.ArtifactStagingDirectory)/MSAL.zip'
       replaceExistingArchive: true
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core sdk for signing'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: EsrpCodeSigning@1
     inputs:
       ConnectedServiceName: 'MSAL ESRP CodeSign Service Connection'