Fixed bug where dev-provided certificate was not being attached to client assertion #7088
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Robbie-Microsoft
commented
May 9, 2024
| }); | ||
|
|
||
| test("acquireTokenByClientCredential handles AuthErrors as expected", async () => { |
There was a problem hiding this comment.
Deleted the test acquireTokenByClientCredential handles AuthErrors as expected.
This test doesn't accomplish anything
Robbie-Microsoft
commented
May 9, 2024
Comment on lines
358
to
391
| test("ensures that developer-provided certificate is attached to client assertion", async () => { | ||
| const getClientAssertionSpy: jest.SpyInstance = jest.spyOn( | ||
| ClientApplication.prototype, | ||
| <any>"getClientAssertion" | ||
| ); | ||
| }; | ||
|
|
||
| const appConfig: Configuration = { | ||
| auth: { | ||
| clientId: TEST_CONSTANTS.CLIENT_ID, | ||
| authority: TEST_CONSTANTS.DEFAULT_AUTHORITY, // contains "common" | ||
| clientAssertion: "testAssertion", | ||
| }, | ||
| }; | ||
| const cryptoKeys: CryptoKeys = new CryptoKeys(); | ||
| config.auth.clientCertificate = { | ||
| thumbprint: cryptoKeys.thumbprint, | ||
| privateKey: cryptoKeys.privateKey, | ||
| }; | ||
| delete config.auth.clientSecret; | ||
| const client: ConfidentialClientApplication = | ||
| new ConfidentialClientApplication(config); | ||
|
|
||
| const request: ClientCredentialRequest = { | ||
| scopes: TEST_CONSTANTS.DEFAULT_GRAPH_SCOPE, | ||
| skipCache: false, | ||
| }; | ||
| const request: ClientCredentialRequest = { | ||
| scopes: TEST_CONSTANTS.DEFAULT_GRAPH_SCOPE, | ||
| skipCache: false, | ||
| }; | ||
|
|
||
| const authApp = new ConfidentialClientApplication(appConfig); | ||
| authApp.SetAppTokenProvider(testProvider); | ||
| const authResult = (await client.acquireTokenByClientCredential( | ||
| request | ||
| )) as AuthenticationResult; | ||
| expect(authResult.accessToken).toEqual( | ||
| CONFIDENTIAL_CLIENT_AUTHENTICATION_RESULT.body.access_token | ||
| ); | ||
|
|
||
| await expect( | ||
| authApp.acquireTokenByClientCredential(request) | ||
| ).rejects.toMatchObject( | ||
| createClientAuthError(ClientAuthErrorCodes.missingTenantIdError) | ||
| ); | ||
| const clientAssertion: ClientAssertion = await getClientAssertionSpy | ||
| .mock.results[0].value; | ||
| expect(clientAssertion.assertion.length).toBeGreaterThan(1); | ||
| expect(clientAssertion.assertionType).toBe( | ||
| Constants.JWT_BEARER_ASSERTION_TYPE | ||
| ); | ||
| }); |
There was a problem hiding this comment.
This is the relevant unit test I added for the bug fix
Robbie-Microsoft
requested review from
sameerag,
tnorling,
hectormmg,
peterzenz,
bgavrilMS,
trwalke,
pmaytak,
gladjohn,
neha-bhargava,
rayluo and
Avery-Dunn
as code owners
bgavrilMS
reviewed
May 10, 2024
bgavrilMS
reviewed
May 10, 2024
bgavrilMS
approved these changes
May 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes acquireTokenByClientCredential broken for clientCertificate #7082
Applied boy-scout-rule to
ConfidentialClientApplication.spec.ts(contains unit tests). I've been waiting for a good opportunity to do this. The ConfidentialClientApplication tests are now in line with the other test files: All Managed Identity sources, ClientCredentialClient, OnBehalfOfClient and UsernamePasswordClient.