Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dev into release/1.6.0 #2363

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Merge dev into release/1.6.0 #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c6c291
Support caller app info for browser SSO flows (#2347)
antrix1989 Oct 4, 2024
8f11fa7
Add specific minimum version to match downloaded visionOS simulator's…
juan-arias Oct 4, 2024
797f935
Trigger Build
juan-arias Oct 5, 2024
254dc5d
Merge pull request #2358 from AzureAD/jarias/fix-visionos-build-errors
juan-arias Oct 5, 2024
6a21cf5
Remove duplicated test, use proper name for test and skip test for ma…
nilo-ms Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MSAL/IdentityCore
Open in desktop
Submodule IdentityCore updated 7 files
+9 −0 ...rc/broker_operation/request/browser_native_message_request/MSIDBrokerOperationBrowserNativeMessageRequest.h
+43 −0 ...rc/broker_operation/request/browser_native_message_request/MSIDBrokerOperationBrowserNativeMessageRequest.m
+16 −0 ...yCore/src/broker_operation/request/browser_native_message_request/MSIDBrowserNativeMessageGetTokenRequest.m
+2 −0 IdentityCore/src/broker_operation/request/browser_native_message_request/MSIDBrowserNativeMessageRequest.h
+84 −0 IdentityCore/tests/MSIDBrokerOperationBrowserNativeMessageRequestTests.m
+31 −0 IdentityCore/tests/MSIDBrowserNativeMessageGetTokenRequestTests.m
+2 −0 changelog.txt
2 changes: 2 additions & 0 deletions MSAL/MSAL.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9009,6 +9009,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
TARGETED_DEVICE_FAMILY = "1,2,7";
XROS_DEPLOYMENT_TARGET = 1.2;
};
name = Debug;
};
Expand All @@ -9024,6 +9025,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
TARGETED_DEVICE_FAMILY = "1,2,7";
XROS_DEPLOYMENT_TARGET = 1.2;
};
name = Release;
};
Expand Down
36 changes: 2 additions & 34 deletions ...tegration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
XCTAssertEqual(signInDelegateSpy.result?.account.username, username)
}

// Sign in with username and password to get access token and force refresh with existing scopes
func test_signInAndForceRefreshWithExistingScopesSucceeds() async throws {
// Sign in with username and password to get access token and force refresh with access token not linked to client Id
func test_signInAndForceRefreshWithNotConfiguredScopes() async throws {
#if os(macOS)
throw XCTSkip("Bundle id for macOS is not added to the client id, test is not needed on both iOS and macOS")
#endif
Expand All @@ -83,38 +83,6 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
XCTAssertNotNil(signInDelegateSpy.result?.idToken)
XCTAssertEqual(signInDelegateSpy.result?.account.username, username)

let previousIdToken = signInDelegateSpy.result?.idToken
let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)

signInDelegateSpy.result?.getAccessToken(scopes: ["User.Read"], forceRefresh: true, delegate: credentialsDelegateSpy)

await fulfillment(of: [refreshAccessTokenExpectation])

XCTAssertTrue(credentialsDelegateSpy.onAccessTokenRetrieveCompletedCalled)
XCTAssertNotNil(credentialsDelegateSpy.result?.accessToken)
XCTAssertNotEqual(previousIdToken, signInDelegateSpy.result?.idToken)
XCTAssertEqual(signInDelegateSpy.result?.account.username, username)
}

// Sign in with username and password to get access token and force refresh with different scopes
func test_signInAndForceRefreshWithDifferentScopesFails() async throws {
guard let sut = initialisePublicClientApplication(), let username = retrieveUsernameForSignInUsernameAndPassword(), let password = await retrievePasswordForSignInUsername() else {
XCTFail("Missing information")
return
}

let signInExpectation = expectation(description: "signing in")
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)

sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)

await fulfillment(of: [signInExpectation])

XCTAssertTrue(signInDelegateSpy.onSignInCompletedCalled)
XCTAssertNotNil(signInDelegateSpy.result?.idToken)
XCTAssertEqual(signInDelegateSpy.result?.account.username, username)

let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)

Expand Down
Loading