Skip to content

Commit 4e4beec

Browse files
spetrescu84ameyapatOlga Daltonoldaltonjasoncoolmax
authored
Merge Release 1.6.0 into main (#2355)
* Adding task to trigger pipeline in ADO * Update pr-validation.yml for Azure Pipelines * Correcting project and org Correcting * trigger * Update pr-validation.yml for Azure Pipelines * trigger * Update pr-validation.yml for Azure Pipelines * Allow passing query parameters in signout * Revert PPE change * Updated changelog * Fix changelog in common * Updating pipeline id for pr assitant * reduce timeout * Add a poorly written method to test AI * Adding index out of bounds * test * reverting * trigger * MacOS increase version to 10.15 (#2343) * Correct typo * Adding poor code * Adding comment * Update common core * Reverting change for poor code * Final check * Updating MSAL framework checksum & url for 1.5.1 [skip ci] (#2348) Co-authored-by: Yong Zeng <[email protected]> * Native authentication email OTP MFA (#2341) * Email OTP MFA Network layer implementation (#2275) * add introspect request, response and error classes * make authentication method fields mandatory, add validator code for introspect responses * update signIN challenge request and response * handle mfa required using suberror and not error code * fix unit tests after new changes * rename validate function and add new test for introspect required error result * add new unit tests for introspect validation * add new unit tests for token response validation - mfa required * fix integration tests compilation error * add new integration tests for introspect api * - Adjustments in integration tests to align with mock API changes * Address comments on PR --------- Co-authored-by: Marcos Borges <[email protected]> Co-authored-by: Marcos Borges <[email protected]> * first public interface draft * add missing method in signINPasswordRequiredDelegate * add dummy logic * Add dedicated errors for MFA sub flow * add optional new state to error callbacks * Make channel type extensible * Update and add new public comments * fix compilation errors in E2E tests * Fix typo and swiftlint warnings * add base mfa states, return awaiting mfa on password required state * add implementation for mfa required response after submitting a code * handle remaning strongAuthRequired response * handle introspect required and update todo comment * add send challenge MFA business logic * reuse code for send challenge method * Email OTP MFA - public interface changes (#2296) * first public interface draft * add missing method in signINPasswordRequiredDelegate * add dummy logic * Add dedicated errors for MFA sub flow * add optional new state to error callbacks * Make channel type extensible * Update and add new public comments * fix compilation errors in E2E tests * Fix typo and swiftlint warnings * Address PR comments * use same name for awaitingMFA method, add more details to the comment * merge two mfa error and handle get auth methods request * complete implementation of get auth methods method * implement submit challenge reusing submit code function * remove telemetry check in controller test. Delegate dispatcher should trigger telemetry * Add unit tests for SendChallenge delegate dispatcher * Add remaining tests for mfa delegate dispatchers * add new unit tests for MFA error classes * Writing tests for awaitingMFAState * add unit tests for mfaRequiredState * add new unit tests to existing signIn Controller * add new test for sendChallengeState, add new class for MFA controller tests * move mfa tests to dedicated class * add new tests for mfa controller. Fix some bugs too * add new tests for send challenge * add new tests for get auth methods * add new tests for submit Challenge, stop telemetry on successful result * fix compilation error on integration tests * rename sendChallenge to requestChallenge * Address PR comments * address PR comments. Fix bug around SSPR telemetry id * address PR comments * Email OTP MFA business logic (#2302) * first public interface draft * add missing method in signINPasswordRequiredDelegate * add dummy logic * Add dedicated errors for MFA sub flow * add optional new state to error callbacks * Make channel type extensible * Update and add new public comments * fix compilation errors in E2E tests * Fix typo and swiftlint warnings * add base mfa states, return awaiting mfa on password required state * add implementation for mfa required response after submitting a code * handle remaning strongAuthRequired response * handle introspect required and update todo comment * add send challenge MFA business logic * reuse code for send challenge method * merge two mfa error and handle get auth methods request * complete implementation of get auth methods method * implement submit challenge reusing submit code function * remove telemetry check in controller test. Delegate dispatcher should trigger telemetry * Add unit tests for SendChallenge delegate dispatcher * Add remaining tests for mfa delegate dispatchers * add new unit tests for MFA error classes * Writing tests for awaitingMFAState * add unit tests for mfaRequiredState * add new unit tests to existing signIn Controller * add new test for sendChallengeState, add new class for MFA controller tests * move mfa tests to dedicated class * add new tests for mfa controller. Fix some bugs too * add new tests for send challenge * add new tests for get auth methods * add new tests for submit Challenge, stop telemetry on successful result * fix compilation error on integration tests * rename sendChallenge to requestChallenge * Address PR comments * address PR comments. Fix bug around SSPR telemetry id * address PR comments * Log a warning message and add warning on code documentation (#2306) * add email otp mfa files to mac targets. Remove not used files * Add E2E tests for email OTP MFA feature (#2331) * add new e2e test for signIn with username and password and MFA * add new end to end tests for mfa * add missing E2E tests for email OTP MFA * throw xctskip error to skip error * refactor E2E tests * rename internal test function * send wrong code as string * Refresh token, customise MFA required error description (#2322) * add new error codes key and parse msid error codes * add new error converter tests * update changelog file * add custom error message if error code is mfaRequired * Add new unit tests for error codes handling * add file to mac os target * revert change for project file * Add new MFARequestChallengeError and MFAGetAuthMethodsError (#2340) * add period at the end of the sentence * remove null pointer in project file * remove trailing space and enable all mfa e2e tests --------- Co-authored-by: Marcos Borges <[email protected]> Co-authored-by: Marcos Borges <[email protected]> * [iOS SDK] Update current user account result with latest account and id token after refresh (#2346) * Update the current user account result data * Made user account get access token testable Added unit and e2e tests * PR comments * Fixed test around scopes after adding bundle id for IOS to client * PR comments * Added ConfigTested to validate config after being created Made createRetrieveAccessTokenError and adjusted tests * Reverted issue around UUID * Release 1.6.0 * Merge dev into release/1.6.0 (#2363) * Support caller app info for browser SSO flows (#2347) * modified: MSAL/IdentityCore * modified: MSAL/IdentityCore * modified: MSAL/IdentityCore * Update core. * Add specific minimum version to match downloaded visionOS simulator's version * Trigger Build * Remove duplicated test, use proper name for test and skip test for macOS (#2362) --------- Co-authored-by: Sergei Demchenko <[email protected]> Co-authored-by: Juan Arias Roldan <[email protected]> Co-authored-by: Juan Arias <[email protected]> * Updating MSAL framework checksum & url for 1.5.1 [skip ci] (#2357) Co-authored-by: Yong Zeng <[email protected]> --------- Co-authored-by: Ameya Patil <[email protected]> Co-authored-by: Olga Dalton <[email protected]> Co-authored-by: Olga Dalton <[email protected]> Co-authored-by: Ameya Patil <[email protected]> Co-authored-by: Yong Zeng <[email protected]> Co-authored-by: Danilo Raspa <[email protected]> Co-authored-by: Marcos Borges <[email protected]> Co-authored-by: Marcos Borges <[email protected]> Co-authored-by: Sergei Demchenko <[email protected]> Co-authored-by: Juan Arias Roldan <[email protected]> Co-authored-by: Juan Arias <[email protected]>
1 parent bad3105 commit 4e4beec

File tree

126 files changed

+4997
-487
lines changed

Some content is hidden

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

126 files changed

+4997
-487
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [1.6.0]:
2+
* Support extra query parameters on logout endpoint (#2339)
3+
14
## [1.5.1]:
25
* Parse and add STS error codes in token error result (#2319)
36
* VisionOS support added (#2139)

‎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.5.1"
3+
s.version = "1.6.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/.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ function_parameter_count:
1313

1414
disabled_rules:
1515
- todo
16+
- empty_enum_arguments

‎MSAL/IdentityCore

Submodule IdentityCore updated 16 files

‎MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 304 additions & 22 deletions
Large diffs are not rendered by default.

‎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.5.1</string>
18+
<string>1.6.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.5.1</string>
18+
<string>1.6.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

‎MSAL/src/MSALPublicClientApplication.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,6 +1458,10 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
14581458
msidParams.platformSequence = [NSString msidUpdatePlatformSequenceParamWithSrcName:[MSIDVersion platformName]
14591459
srcVersion:[MSIDVersion sdkVersion]
14601460
sequence:nil];
1461+
1462+
// Extra parameters to be added to the /authorize endpoint.
1463+
msidParams.extraURLQueryParameters = signoutParameters.extraQueryParameters;
1464+
14611465
NSError *localError;
14621466
BOOL localRemovalResult = [self removeAccountImpl:account wipeAccount:signoutParameters.wipeAccount error:&localError];
14631467

‎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 5
30-
#define MSAL_VER_PATCH 1
29+
#define MSAL_VER_LOW 6
30+
#define MSAL_VER_PATCH 0
3131

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

‎MSAL/src/native_auth/network/MSALNativeAuthInternalChannelType.swift renamed to ‎MSAL/src/native_auth/MSALNativeAuthLogMessage.swift

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,11 @@
2020
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2121
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2222
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23-
// THE SOFTWARE.
23+
// THE SOFTWARE.
2424

25-
enum MSALNativeAuthInternalChannelType: String, Decodable {
26-
case phone
27-
case email
25+
import Foundation
2826

29-
func toPublicChannelType() -> MSALNativeAuthChannelType {
30-
switch self {
31-
case .phone:
32-
return .phone
33-
case .email:
34-
return .email
35-
}
36-
}
27+
enum MSALNativeAuthLogMessage {
28+
static let privatePreviewLog =
29+
"Warning ⚠️: this API is experimental. It may be changed in the future without notice. Do not use in production applications."
3730
}

0 commit comments

Comments
 (0)