diff --git a/MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift index a8df6da563..6b4e8e4eba 100644 --- a/MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift @@ -24,6 +24,7 @@ import Foundation import XCTest +import MSAL final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase { @@ -40,7 +41,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy) + let param = MSALNativeAuthSignInParameters(username: username) + param.password = password + param.correlationId = correlationId + sut.signIn(parameters: param, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -49,10 +53,12 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo XCTAssertEqual(signInDelegateSpy.result?.account.username, username) let previousIdToken = signInDelegateSpy.result?.idToken - let refreshAccessTokenExpectation = expectation(description: "refreshing access token") + let refreshAccessTokenExpectation = expectation(description: "refreshing access tforoken") let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation) - signInDelegateSpy.result?.getAccessToken(forceRefresh: true, delegate: credentialsDelegateSpy) + let tokenParam = MSALNativeAuthGetAccessTokenParameters() + tokenParam.forceRefresh = true + signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy) await fulfillment(of: [refreshAccessTokenExpectation]) @@ -75,7 +81,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy) + let signInParam = MSALNativeAuthSignInParameters(username: username) + signInParam.password = password + signInParam.correlationId = correlationId + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -86,7 +95,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo let refreshAccessTokenExpectation = expectation(description: "refreshing access token") let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation) - signInDelegateSpy.result?.getAccessToken(scopes: ["Calendar.Read"], forceRefresh: true, delegate: credentialsDelegateSpy) + let tokenParam = MSALNativeAuthGetAccessTokenParameters() + tokenParam.scopes = ["Calendar.Read"] + tokenParam.forceRefresh = true + signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy) await fulfillment(of: [refreshAccessTokenExpectation]) diff --git a/MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift index 66b9d0f37a..768483321b 100644 --- a/MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift @@ -42,7 +42,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase let codeRequiredExp = expectation(description: "code required") let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp) - sut.resetPassword(username: username, delegate: resetPasswordStartDelegate) + let param = MSALNativeAuthResetPasswordParameters(username: username) + sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate) await fulfillment(of: [codeRequiredExp]) XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled) @@ -85,7 +86,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase let codeRequiredExp = expectation(description: "code required") let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp) - sut.resetPassword(username: username, delegate: resetPasswordStartDelegate) + let param = MSALNativeAuthResetPasswordParameters(username: username) + sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate) await fulfillment(of: [codeRequiredExp]) XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled) @@ -124,7 +126,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase let signInAfterResetPasswordExp = expectation(description: "sign in after reset password") let signInAfterResetPasswordDelegate = SignInAfterResetPasswordDelegateSpy(expectation: signInAfterResetPasswordExp) - resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(delegate: signInAfterResetPasswordDelegate) + let autoParam = MSALNativeAuthSignInAfterResetPasswordParameters() + resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(parameters: autoParam, delegate: signInAfterResetPasswordDelegate) await fulfillment(of: [signInAfterResetPasswordExp]) XCTAssertTrue(signInAfterResetPasswordDelegate.onSignInCompletedCalled) diff --git a/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift index 0130cbbbf0..de27ae5246 100644 --- a/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift @@ -37,8 +37,12 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation) let unknownUsername = UUID().uuidString + "@contoso.com" + + let signInParam = MSALNativeAuthSignInParameters(username: unknownUsername) + signInParam.password = "testpass" + signInParam.correlationId = correlationId - sut.signIn(username: unknownUsername, password: "testpass", correlationId: correlationId, delegate: signInDelegateSpy) + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -77,7 +81,11 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy) + let signInParam = MSALNativeAuthSignInParameters(username: username) + signInParam.password = password + signInParam.correlationId = correlationId + + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -98,7 +106,10 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) let signInPasswordRequiredDelegateSpy = SignInPasswordRequiredDelegateSpy(expectation: passwordRequiredExpectation) - sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) + let signInParam = MSALNativeAuthSignInParameters(username: username) + signInParam.correlationId = correlationId + + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) diff --git a/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift index 70e9e880d1..109b19a8a1 100644 --- a/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift @@ -24,6 +24,7 @@ import Foundation import XCTest +import MSAL final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBaseTestCase { @@ -38,8 +39,11 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) let unknownUsername = UUID().uuidString + "@contoso.com" + + let signInParam = MSALNativeAuthSignInParameters(username: unknownUsername) + signInParam.correlationId = correlationId - sut.signIn(username: unknownUsername, correlationId: correlationId, delegate: signInDelegateSpy) + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -59,7 +63,10 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) + let signInParam = MSALNativeAuthSignInParameters(username: username) + signInParam.correlationId = correlationId + + sut.signIn(parameters: signInParam, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) @@ -96,7 +103,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) + let param = MSALNativeAuthSignInParameters(username: username) + param.correlationId = correlationId + sut.signIn(parameters: param, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) diff --git a/MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift index 3b157044dd..3b014c09a7 100644 --- a/MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift @@ -24,6 +24,7 @@ import Foundation import XCTest +import MSAL final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase { // Hero Scenario 2.4.1. Sign out – Local sign out from app on device (no SSO) @@ -43,7 +44,10 @@ final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTe let signInExpectation = expectation(description: "signing in") let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation) - sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy) + let param = MSALNativeAuthSignInParameters(username: username) + param.password = password + param.correlationId = correlationId + sut.signIn(parameters: param, delegate: signInDelegateSpy) await fulfillment(of: [signInExpectation]) diff --git a/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests.swift index 7ead163dbc..00aac800c4 100644 --- a/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests.swift @@ -41,11 +41,13 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -81,7 +83,8 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, expectedUsername: username) @@ -102,10 +105,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -156,12 +161,14 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.attributes = attributes + signUpParam.correlationId = correlationId sut.signUp( - username: username, - password: password, - attributes: attributes, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -197,7 +204,8 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, expectedUsername: username) @@ -218,9 +226,11 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -273,7 +283,8 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpPasswordDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpPasswordDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, expectedUsername: username) @@ -294,10 +305,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -363,9 +376,10 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let password = generateRandomPassword() let attributes = AttributesStub.allAttributes + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -435,7 +449,8 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(parameters: autoParam,delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, expectedUsername: username) @@ -458,9 +473,10 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -547,7 +563,8 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, expectedUsername: username) @@ -568,10 +585,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: codeRequiredExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -611,10 +630,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signUpFailureExp = expectation(description: "sign-up with existing email fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -640,10 +661,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signUpFailureExp = expectation(description: "sign-up with social account email fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -667,10 +690,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signUpFailureExp = expectation(description: "sign-up with invalid format email fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -694,10 +719,12 @@ final class MSALNativeAuthSignUpUsernameAndPasswordEndToEndTests: MSALNativeAuth let signUpFailureExp = expectation(description: "sign-up with invalid password complexity fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) diff --git a/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameEndToEndTests.swift b/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameEndToEndTests.swift index 9bd3952dd6..bb81be80bb 100644 --- a/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameEndToEndTests.swift +++ b/MSAL/test/integration/native_auth/end_to_end/sign_up/MSALNativeAuthSignUpUsernameEndToEndTests.swift @@ -38,8 +38,11 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) let usernameOTP = generateSignUpRandomEmail() + + let signInparam = MSALNativeAuthSignUpParameters(username: usernameOTP) + signInparam.correlationId = correlationId - sut.signUp(username: usernameOTP, correlationId: correlationId, delegate: signUpStartDelegate) + sut.signUp(parameters: signInparam, delegate: signUpStartDelegate) await fulfillment(of: [codeRequiredExp]) guard signUpStartDelegate.onSignUpCodeRequiredCalled else { @@ -66,8 +69,9 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - - signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, username: usernameOTP) @@ -85,7 +89,11 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) let usernameOTP = generateSignUpRandomEmail() - sut.signUp(username: usernameOTP, attributes: AttributesStub.allAttributes, correlationId: correlationId, delegate: signUpStartDelegate) + let param = MSALNativeAuthSignUpParameters(username: usernameOTP) + param.attributes = AttributesStub.allAttributes + param.correlationId = correlationId + + sut.signUp(parameters: param, delegate: signUpStartDelegate) await fulfillment(of: [codeRequiredExp]) checkSignUpStartDelegate(signUpStartDelegate) @@ -109,8 +117,9 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - - signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpVerifyCodeDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, username: usernameOTP) @@ -128,7 +137,9 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) let usernameOTP = generateSignUpRandomEmail() - sut.signUp(username: usernameOTP, correlationId: correlationId, delegate: signUpStartDelegate) + let signUpParam = MSALNativeAuthSignUpParameters(username: usernameOTP) + signUpParam.correlationId = correlationId + sut.signUp(parameters: signUpParam, delegate: signUpStartDelegate) await fulfillment(of: [codeRequiredExp]) checkSignUpStartDelegate(signUpStartDelegate) @@ -165,8 +176,9 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - - signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, username: usernameOTP) @@ -184,7 +196,9 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) let usernameOTP = generateSignUpRandomEmail() - sut.signUp(username: usernameOTP, correlationId: correlationId, delegate: signUpStartDelegate) + let signUpParam = MSALNativeAuthSignUpParameters(username: usernameOTP) + signUpParam.correlationId = correlationId + sut.signUp(parameters: signUpParam, delegate: signUpStartDelegate) await fulfillment(of: [codeRequiredExp]) guard signUpStartDelegate.onSignUpCodeRequiredCalled else { @@ -239,7 +253,8 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signInExp = expectation(description: "sign-in after sign-up") let signInAfterSignUpDelegate = SignInAfterSignUpDelegateSpy(expectation: signInExp) - signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(delegate: signInAfterSignUpDelegate) + let autoParam = MSALNativeAuthSignInAfterSignUpParameters() + signUpAttributesRequiredDelegate.signInAfterSignUpState?.signIn(parameters: autoParam, delegate: signInAfterSignUpDelegate) await fulfillment(of: [signInExp]) checkSignInAfterSignUpDelegate(signInAfterSignUpDelegate, username: usernameOTP) @@ -258,10 +273,12 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let codeRequiredExp = expectation(description: "code required") let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) + + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -307,9 +324,11 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpFailureExp = expectation(description: "sign-up with existing email fails") let signUpStartDelegate = SignUpStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -335,10 +354,12 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpFailureExp = expectation(description: "sign-up with social account email fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -361,9 +382,11 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpFailureExp = expectation(description: "sign-up with invalid email format fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate ) @@ -386,7 +409,10 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpStartDelegate = SignUpStartDelegateSpy(expectation: codeRequiredExp) let usernameOTP = generateSignUpRandomEmail() - sut.signUp(username: usernameOTP, correlationId: correlationId, delegate: signUpStartDelegate) + let signUpParam = MSALNativeAuthSignUpParameters(username: usernameOTP) + signUpParam.correlationId = correlationId + + sut.signUp(parameters: signUpParam, delegate: signUpStartDelegate) await fulfillment(of: [codeRequiredExp]) guard signUpStartDelegate.onSignUpCodeRequiredCalled else { @@ -423,10 +449,12 @@ final class MSALNativeAuthSignUpUsernameEndToEndTests: MSALNativeAuthEndToEndBas let signUpFailureExp = expectation(description: "sign-up with invalid challenge type fails") let signUpStartDelegate = SignUpPasswordStartDelegateSpy(expectation: signUpFailureExp) + let signUpParam = MSALNativeAuthSignUpParameters(username: username) + signUpParam.password = password + signUpParam.correlationId = correlationId + sut.signUp( - username: username, - password: password, - correlationId: correlationId, + parameters: signUpParam, delegate: signUpStartDelegate )