Skip to content

Commit

Permalink
Kaisong1990/resolve merge release conflicts (#1442)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
6 people committed Feb 14, 2022
1 parent 256bbf0 commit dbda20c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion MSAL/IdentityCore
Submodule IdentityCore updated 55 files
+10 −0 IdentityCore/IdentityCore.xcodeproj/project.pbxproj
+1 −0 IdentityCore/MSIDTestsHostApp/MSIDTestsHostApp.entitlements
+1 −0 IdentityCore/src/MSIDBrokerConstants.h
+1 −0 IdentityCore/src/MSIDBrokerConstants.m
+3 −0 IdentityCore/src/MSIDError.h
+1 −0 IdentityCore/src/broker_operation/request/account_request/MSIDBrokerOperationSignoutFromDeviceRequest.h
+3 −0 IdentityCore/src/broker_operation/request/account_request/MSIDBrokerOperationSignoutFromDeviceRequest.m
+1 −1 ...ityCore/src/broker_operation/request/interactive_token_request/MSIDBrokerOperationInteractiveTokenRequest.m
+2 −0 IdentityCore/src/broker_operation/response/MSIDDeviceInfo.h
+2 −1 IdentityCore/src/broker_operation/response/MSIDDeviceInfo.m
+3 −0 IdentityCore/src/cache/accessor/MSIDDefaultTokenCacheAccessor.h
+37 −0 IdentityCore/src/cache/accessor/MSIDDefaultTokenCacheAccessor.m
+20 −13 IdentityCore/src/cache/crypto/MSIDAssymetricKeyKeychainGenerator.m
+51 −0 IdentityCore/src/cache/crypto/MSIDWPJKeyPairWithCert.h
+115 −0 IdentityCore/src/cache/crypto/MSIDWPJKeyPairWithCert.m
+1 −0 IdentityCore/src/controllers/MSIDRequestControllerFactory.h
+2 −0 IdentityCore/src/controllers/MSIDRequestControllerFactory.m
+14 −1 IdentityCore/src/controllers/MSIDSilentController.m
+2 −0 IdentityCore/src/controllers/broker/MSIDSSOExtensionSignoutController.h
+3 −0 IdentityCore/src/controllers/broker/MSIDSSOExtensionSignoutController.m
+3 −2 IdentityCore/src/oauth2/MSIDWebviewFactory.m
+2 −1 IdentityCore/src/parameters/MSIDInteractiveTokenRequestParameters.h
+8 −2 IdentityCore/src/parameters/MSIDInteractiveTokenRequestParameters.m
+1 −1 IdentityCore/src/requests/broker/MSIDSSOExtensionGetAccountsRequest.m
+1 −1 IdentityCore/src/requests/broker/MSIDSSOExtensionGetDeviceInfoRequest.m
+1 −0 IdentityCore/src/requests/broker/MSIDSSOExtensionSignoutRequest.h
+4 −0 IdentityCore/src/requests/broker/MSIDSSOExtensionSignoutRequest.m
+1 −0 IdentityCore/src/requests/broker/MSIDSSOExtensionSilentTokenRequest.m
+24 −4 IdentityCore/src/requests/broker/MSIDSSOExtensionTokenRequestDelegate.m
+1 −1 IdentityCore/src/requests/sdk/msal/MSIDDefaultBrokerTokenRequest.m
+11 −12 IdentityCore/src/throttling/cache/MSIDLRUCache.m
+4 −4 IdentityCore/src/throttling/model/MSIDThrottlingModelFactory.m
+6 −5 IdentityCore/src/util/NSDictionary+MSIDExtensions.m
+4 −0 IdentityCore/src/webview/MSIDWebviewAuthorization.m
+2 −1 IdentityCore/src/webview/embeddedWebview/MSIDOAuth2EmbeddedWebviewController.m
+4 −2 IdentityCore/src/workplacejoin/MSIDPkeyAuthHelper.m
+4 −8 IdentityCore/src/workplacejoin/MSIDRegistrationInformation.h
+3 −6 IdentityCore/src/workplacejoin/MSIDRegistrationInformation.m
+5 −2 IdentityCore/src/workplacejoin/MSIDWorkPlaceJoinUtil.h
+16 −0 IdentityCore/src/workplacejoin/MSIDWorkPlaceJoinUtilBase.h
+79 −2 IdentityCore/src/workplacejoin/MSIDWorkPlaceJoinUtilBase.m
+65 −11 IdentityCore/src/workplacejoin/ios/MSIDWorkPlaceJoinUtil.m
+8 −109 IdentityCore/src/workplacejoin/mac/MSIDWorkPlaceJoinUtil.m
+3 −1 IdentityCore/tests/MSIDBrokerOperationSignoutFromDeviceRequestTests.m
+4 −1 IdentityCore/tests/MSIDDeviceInfoTests.m
+11 −5 IdentityCore/tests/MSIDDictionaryExtensionsTests.m
+7 −7 IdentityCore/tests/MSIDInteractiveTokenRequestParametersTests.m
+5 −5 IdentityCore/tests/MSIDPkeyAuthHelperTests.m
+231 −21 IdentityCore/tests/MSIDWorkPlaceJoinUtilTests.m
+1 −1 IdentityCore/tests/automation/ui_tests_lib/lab_api/MSIDTestAutomationAccountConfigurationRequest.m
+78 −0 IdentityCore/tests/integration/MSIDDefaultTokenCacheIntegrationTests.m
+4 −0 IdentityCore/tests/integration/MSIDSSOExtensionSignoutRequestIntegrationTests.m
+77 −0 IdentityCore/tests/integration/MSIDSilentControllerIntegrationTests.m
+1 −1 IdentityCore/tests/mocks/MSIDTestTokenRequestProvider.m
+14 −1 changelog.txt
1 change: 1 addition & 0 deletions MSAL/src/MSALPublicClientApplication.m
Expand Up @@ -1449,6 +1449,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
return;
}


#if !TARGET_OS_IPHONE
// Clear additional cache locations
NSDictionary<NSString *, NSDictionary *> *additionalPartnerLocations = MSALWipeCacheForAllAccountsConfig.additionalPartnerLocations;
Expand Down

0 comments on commit dbda20c

Please sign in to comment.