Skip to content

Commit 873af70

Browse files
Yuki-YuXinYuki-YuXin
committed
update the parameters
1 parent ee22a85 commit 873af70

7 files changed

+172
-78
lines changed

‎MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase {
2930

@@ -40,7 +41,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
4041
let signInExpectation = expectation(description: "signing in")
4142
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
4243

43-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
44+
let param = MSALNativeAuthSignInParameters(username: username)
45+
param.password = password
46+
param.correlationId = correlationId
47+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
4448

4549
await fulfillment(of: [signInExpectation])
4650

@@ -49,10 +53,12 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
4953
XCTAssertEqual(signInDelegateSpy.result?.account.username, username)
5054

5155
let previousIdToken = signInDelegateSpy.result?.idToken
52-
let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
56+
let refreshAccessTokenExpectation = expectation(description: "refreshing access tforoken")
5357
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)
5458

55-
signInDelegateSpy.result?.getAccessToken(forceRefresh: true, delegate: credentialsDelegateSpy)
59+
let tokenParam = MSALNativeAuthGetAccessTokenParameters()
60+
tokenParam.forceRefresh = true
61+
signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy)
5662

5763
await fulfillment(of: [refreshAccessTokenExpectation])
5864

@@ -75,7 +81,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
7581
let signInExpectation = expectation(description: "signing in")
7682
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
7783

78-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
84+
let signInParam = MSALNativeAuthSignInParameters(username: username)
85+
signInParam.password = password
86+
signInParam.correlationId = correlationId
87+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
7988

8089
await fulfillment(of: [signInExpectation])
8190

@@ -86,7 +95,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
8695
let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
8796
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)
8897

89-
signInDelegateSpy.result?.getAccessToken(scopes: ["Calendar.Read"], forceRefresh: true, delegate: credentialsDelegateSpy)
98+
let tokenParam = MSALNativeAuthGetAccessTokenParameters()
99+
tokenParam.scopes = ["Calendar.Read"]
100+
tokenParam.forceRefresh = true
101+
signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy)
90102

91103
await fulfillment(of: [refreshAccessTokenExpectation])
92104

‎MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
4242
let codeRequiredExp = expectation(description: "code required")
4343
let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp)
4444

45-
sut.resetPassword(username: username, delegate: resetPasswordStartDelegate)
45+
let param = MSALNativeAuthResetPasswordParameters(username: username)
46+
sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate)
4647

4748
await fulfillment(of: [codeRequiredExp])
4849
XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled)
@@ -85,7 +86,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
8586
let codeRequiredExp = expectation(description: "code required")
8687
let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp)
8788

88-
sut.resetPassword(username: username, delegate: resetPasswordStartDelegate)
89+
let param = MSALNativeAuthResetPasswordParameters(username: username)
90+
sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate)
8991

9092
await fulfillment(of: [codeRequiredExp])
9193
XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled)
@@ -124,7 +126,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
124126
let signInAfterResetPasswordExp = expectation(description: "sign in after reset password")
125127
let signInAfterResetPasswordDelegate = SignInAfterResetPasswordDelegateSpy(expectation: signInAfterResetPasswordExp)
126128

127-
resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(delegate: signInAfterResetPasswordDelegate)
129+
let autoParam = MSALNativeAuthSignInAfterResetPasswordParameters()
130+
resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(parameters: autoParam, delegate: signInAfterResetPasswordDelegate)
128131

129132
await fulfillment(of: [signInAfterResetPasswordExp])
130133
XCTAssertTrue(signInAfterResetPasswordDelegate.onSignInCompletedCalled)

‎MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
3737
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
3838

3939
let unknownUsername = UUID().uuidString + "@contoso.com"
40+
41+
let signInParam = MSALNativeAuthSignInParameters(username: unknownUsername)
42+
signInParam.password = "testpass"
43+
signInParam.correlationId = correlationId
4044

41-
sut.signIn(username: unknownUsername, password: "testpass", correlationId: correlationId, delegate: signInDelegateSpy)
45+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
4246

4347
await fulfillment(of: [signInExpectation])
4448

@@ -77,7 +81,11 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
7781
let signInExpectation = expectation(description: "signing in")
7882
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
7983

80-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
84+
let signInParam = MSALNativeAuthSignInParameters(username: username)
85+
signInParam.password = password
86+
signInParam.correlationId = correlationId
87+
88+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
8189

8290
await fulfillment(of: [signInExpectation])
8391

@@ -98,7 +106,10 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
98106
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
99107
let signInPasswordRequiredDelegateSpy = SignInPasswordRequiredDelegateSpy(expectation: passwordRequiredExpectation)
100108

101-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
109+
let signInParam = MSALNativeAuthSignInParameters(username: username)
110+
signInParam.correlationId = correlationId
111+
112+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
102113

103114
await fulfillment(of: [signInExpectation])
104115

‎MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBaseTestCase {
2930

@@ -38,8 +39,11 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
3839
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
3940

4041
let unknownUsername = UUID().uuidString + "@contoso.com"
42+
43+
let signInParam = MSALNativeAuthSignInParameters(username: unknownUsername)
44+
signInParam.correlationId = correlationId
4145

42-
sut.signIn(username: unknownUsername, correlationId: correlationId, delegate: signInDelegateSpy)
46+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
4347

4448
await fulfillment(of: [signInExpectation])
4549

@@ -59,7 +63,10 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
5963
let signInExpectation = expectation(description: "signing in")
6064
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
6165

62-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
66+
let signInParam = MSALNativeAuthSignInParameters(username: username)
67+
signInParam.correlationId = correlationId
68+
69+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
6370

6471
await fulfillment(of: [signInExpectation])
6572

@@ -96,7 +103,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
96103
let signInExpectation = expectation(description: "signing in")
97104
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
98105

99-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
106+
let param = MSALNativeAuthSignInParameters(username: username)
107+
param.correlationId = correlationId
108+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
100109

101110
await fulfillment(of: [signInExpectation])
102111

‎MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase {
2930
// Hero Scenario 2.4.1. Sign out – Local sign out from app on device (no SSO)
@@ -43,7 +44,10 @@ final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTe
4344
let signInExpectation = expectation(description: "signing in")
4445
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
4546

46-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
47+
let param = MSALNativeAuthSignInParameters(username: username)
48+
param.password = password
49+
param.correlationId = correlationId
50+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
4751

4852
await fulfillment(of: [signInExpectation])
4953

0 commit comments

Comments
 (0)