Skip to content

Commit 58e2a7c

Browse files
antonioalwanantonioalwan
authored
Merge pull request #2198 from AzureAD/release/1.4.0
MSAL Release 1.4.0
2 parents d2f81de + d7b521d commit 58e2a7c

File tree

64 files changed

+579
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+579
-571
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.4.0]:
2+
* Add platform sequence param. #2192
3+
* Native auth can now store multiple access tokens related to different resources.
4+
15
## [1.3.3]
26
* Update common core submodule.
37
* Automation improvements.

‎MSAL.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MSAL"
3-
s.version = "1.3.3"
3+
s.version = "1.4.0"
44
s.summary = "Microsoft Authentication Library (MSAL) for iOS"
55
s.description = <<-DESC
66
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.

‎MSAL/IdentityCore

Submodule IdentityCore updated 40 files

‎MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@
253253
287F650C2982F4AD00ED90BD /* MSALNativeAuthResponseSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287F650B2982F4AD00ED90BD /* MSALNativeAuthResponseSerializer.swift */; };
254254
287F65182983F77D00ED90BD /* MSALNativeAuthRequestParametersKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287F65172983F77D00ED90BD /* MSALNativeAuthRequestParametersKey.swift */; };
255255
287F6524298401AE00ED90BD /* MSALNativeAuthResponseSerializerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287F6523298401AE00ED90BD /* MSALNativeAuthResponseSerializerTests.swift */; };
256-
2884855C295DAFD400516492 /* MSALNativeAuthTokens.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2884855B295DAFD400516492 /* MSALNativeAuthTokens.swift */; };
257256
289747AC2979487900838C80 /* MSALNativeAuthUrlRequestSerializerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289747A92979487900838C80 /* MSALNativeAuthUrlRequestSerializerTests.swift */; };
258257
289747B129799C6B00838C80 /* MSALNativeAuthInputValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289747AF29799A8700838C80 /* MSALNativeAuthInputValidator.swift */; };
259258
289E15592948E601006104D9 /* MSALNativeAuthCacheInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289E15582948E601006104D9 /* MSALNativeAuthCacheInterface.swift */; };
@@ -1552,7 +1551,6 @@
15521551
287F650B2982F4AD00ED90BD /* MSALNativeAuthResponseSerializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthResponseSerializer.swift; sourceTree = "<group>"; };
15531552
287F65172983F77D00ED90BD /* MSALNativeAuthRequestParametersKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthRequestParametersKey.swift; sourceTree = "<group>"; };
15541553
287F6523298401AE00ED90BD /* MSALNativeAuthResponseSerializerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthResponseSerializerTests.swift; sourceTree = "<group>"; };
1555-
2884855B295DAFD400516492 /* MSALNativeAuthTokens.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthTokens.swift; sourceTree = "<group>"; };
15561554
289747A92979487900838C80 /* MSALNativeAuthUrlRequestSerializerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthUrlRequestSerializerTests.swift; sourceTree = "<group>"; };
15571555
289747AF29799A8700838C80 /* MSALNativeAuthInputValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthInputValidator.swift; sourceTree = "<group>"; };
15581556
289E15582948E601006104D9 /* MSALNativeAuthCacheInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthCacheInterface.swift; sourceTree = "<group>"; };
@@ -3952,7 +3950,6 @@
39523950
children = (
39533951
289E156C2948EB8A006104D9 /* MSALNativeAuthCacheAccessor.swift */,
39543952
289E15582948E601006104D9 /* MSALNativeAuthCacheInterface.swift */,
3955-
2884855B295DAFD400516492 /* MSALNativeAuthTokens.swift */,
39563953
);
39573954
path = cache;
39583955
sourceTree = "<group>";
@@ -5746,7 +5743,6 @@
57465743
E2C61FE729DED73700F15203 /* MSALNativeAuthSignUpChallengeResponseError.swift in Sources */,
57475744
289747B129799C6B00838C80 /* MSALNativeAuthInputValidator.swift in Sources */,
57485745
DEE34F7AD170B71C00BC302A /* MSALNativeAuthResetPasswordContinueResponseError.swift in Sources */,
5749-
2884855C295DAFD400516492 /* MSALNativeAuthTokens.swift in Sources */,
57505746
28E4D9032A30ABA200280921 /* ResendCodeError.swift in Sources */,
57515747
E2F6269D2A780DDE00C4A303 /* MSALNativeAuthPublicClientApplication+Internal.swift in Sources */,
57525748
DEE34F83D170B71C00BC302A /* MSALNativeAuthResetPasswordSubmitResponseError.swift in Sources */,

‎MSAL/resources/ios/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.3</string>
18+
<string>1.4.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

‎MSAL/resources/mac/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.3</string>
18+
<string>1.4.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

‎MSAL/src/MSALErrorConverter.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ + (void)initialize
112112
@(MSIDErrorJITTroubleshootingAcquireToken) : @(MSALErrorJITTroubleshootingAcquireToken),
113113
@(MSIDErrorDeviceNotPSSORegistered) : @(MSALErrorDeviceNotPSSORegistered),
114114
@(MSIDErrorPSSOKeyIdMismatch) : @(MSALErrorPSSOKeyIdMismatch),
115+
@(MSIDErrorJITErrorHandlingConfigNotFound) : @(MSALErrorJITErrorHandlingConfigNotFound),
115116

116117
// Oauth2 errors
117118
@(MSIDErrorServerOauth) : @(MSALInternalErrorAuthorizationFailed),

‎MSAL/src/MSALPublicClientApplication.m

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@
111111
#import "MSIDAssymetricKeyLookupAttributes.h"
112112
#import "MSIDRequestTelemetryConstants.h"
113113
#import "MSALWipeCacheForAllAccountsConfig.h"
114+
#import "NSString+MSIDTelemetryExtensions.h"
115+
#import "MSIDVersion.h"
114116

115117
@interface MSALPublicClientApplication()
116118
{
@@ -211,7 +213,7 @@ - (instancetype)initWithConfiguration:(MSALPublicClientApplicationConfig *)confi
211213
bypassRedirectValidation:config.bypassRedirectURIValidation
212214
error:&msidError];
213215

214-
if (!msalRedirectUri)
216+
if (!msalRedirectUri && !config.bypassRedirectURIValidation)
215217
{
216218
if (error) *error = [MSALErrorConverter msalErrorFromMsidError:msidError];
217219
return nil;
@@ -863,6 +865,10 @@ - (void)acquireTokenSilentWithParameters:(MSALSilentTokenParameters *)parameters
863865
NSMutableDictionary *extraURLQueryParameters = [self.internalConfig.extraQueryParameters.extraURLQueryParameters mutableCopy];
864866
[extraURLQueryParameters addEntriesFromDictionary:parameters.extraQueryParameters];
865867
msidParams.extraURLQueryParameters = extraURLQueryParameters;
868+
869+
msidParams.platformSequence = [NSString msidUpdatePlatformSequenceParamWithSrcName:[MSIDVersion platformName]
870+
srcVersion:[MSIDVersion sdkVersion]
871+
sequence:nil];
866872

867873
msidParams.tokenExpirationBuffer = self.internalConfig.tokenExpirationBuffer;
868874
msidParams.claimsRequest = parameters.claimsRequest.msidClaimsRequest;
@@ -879,6 +885,7 @@ - (void)acquireTokenSilentWithParameters:(MSALSilentTokenParameters *)parameters
879885
// Nested auth protocol
880886
msidParams.nestedAuthBrokerClientId = self.internalConfig.nestedAuthBrokerClientId;
881887
msidParams.nestedAuthBrokerRedirectUri = self.internalConfig.nestedAuthBrokerRedirectUri;
888+
msidParams.bypassRedirectURIValidation = self.internalConfig.bypassRedirectURIValidation;
882889

883890
MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, msidParams,
884891
@"-[MSALPublicClientApplication acquireTokenSilentForScopes:%@\n"
@@ -1200,6 +1207,10 @@ - (void)acquireTokenWithParameters:(MSALInteractiveTokenParameters *)parameters
12001207
[extraURLQueryParameters addEntriesFromDictionary:parameters.extraQueryParameters];
12011208
msidParams.extraURLQueryParameters = extraURLQueryParameters;
12021209

1210+
msidParams.platformSequence = [NSString msidUpdatePlatformSequenceParamWithSrcName:[MSIDVersion platformName]
1211+
srcVersion:[MSIDVersion sdkVersion]
1212+
sequence:nil];
1213+
12031214
msidParams.tokenExpirationBuffer = self.internalConfig.tokenExpirationBuffer;
12041215
msidParams.extendedLifetimeEnabled = self.internalConfig.extendedLifetimeEnabled;
12051216
msidParams.clientCapabilities = self.internalConfig.clientApplicationCapabilities;
@@ -1453,7 +1464,9 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
14531464
msidParams.validateAuthority = [self shouldValidateAuthorityForRequestAuthority:requestAuthority];
14541465
msidParams.keychainAccessGroup = self.internalConfig.cacheConfig.keychainSharingGroup;
14551466
msidParams.providedAuthority = requestAuthority;
1456-
1467+
msidParams.platformSequence = [NSString msidUpdatePlatformSequenceParamWithSrcName:[MSIDVersion platformName]
1468+
srcVersion:[MSIDVersion sdkVersion]
1469+
sequence:nil];
14571470
NSError *localError;
14581471
BOOL localRemovalResult = [self removeAccountImpl:account wipeAccount:signoutParameters.wipeAccount error:&localError];
14591472

‎MSAL/src/MSAL_Internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
//------------------------------------------------------------------------------
2727

2828
#define MSAL_VER_HIGH 1
29-
#define MSAL_VER_LOW 3
30-
#define MSAL_VER_PATCH 3
29+
#define MSAL_VER_LOW 4
30+
#define MSAL_VER_PATCH 0
3131

3232
#define STR_HELPER(x) #x
3333
#define STR(x) STR_HELPER(x)

‎MSAL/src/configuration/MSALPublicClientApplicationConfig.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ - (id)copyWithZone:(NSZone *)zone
130130
item->_verifiedRedirectUri = [_verifiedRedirectUri copyWithZone:zone];
131131
item->_extraQueryParameters = [_extraQueryParameters copyWithZone:zone];
132132
item->_multipleCloudsSupported = _multipleCloudsSupported;
133+
item->_bypassRedirectURIValidation = _bypassRedirectURIValidation;
133134
return item;
134135
}
135136

0 commit comments

Comments
 (0)