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

update common core submodule that has more string extension methods. #1417

Merged
merged 6 commits into from
Dec 3, 2021
Merged

update common core submodule that has more string extension methods. #1417

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69c2fd1
Allow to pass eqp to the /token endpoint.
antrix1989 Nov 4, 2021
68b88c5
Merge branch 'dev' into sedemche/silent_eqp
antrix1989 Nov 8, 2021
10e96e7
Update changelog.
antrix1989 Nov 8, 2021
0b96cc4
..
Dec 2, 2021
45e0126
merge with dev
Dec 3, 2021
c261ac7
updated changelog
Dec 3, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
TBD:
* Added public API to pass EQP to the /token endpoint (#1406)

## [1.1.24]
* Use base64URLEncoding for RSA modules (#1399)

Expand Down
2 changes: 1 addition & 1 deletion MSAL/IdentityCore
Open in desktop
Submodule IdentityCore updated 2 files
+2 −0 IdentityCore/src/util/NSString+MSIDExtensions.h
+10 −0 IdentityCore/src/util/NSString+MSIDExtensions.m
22 changes: 16 additions & 6 deletions MSAL/src/MSALPublicClientApplication.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,14 @@ - (void)acquireTokenSilentWithParameters:(MSALSilentTokenParameters *)parameters
msidParams.validateAuthority = shouldValidate;
msidParams.extendedLifetimeEnabled = self.internalConfig.extendedLifetimeEnabled;
msidParams.clientCapabilities = self.internalConfig.clientApplicationCapabilities;
msidParams.extraURLQueryParameters = self.internalConfig.extraQueryParameters.extraURLQueryParameters;

// Extra parameters to be added to the /token endpoint.
msidParams.extraTokenRequestParameters = self.internalConfig.extraQueryParameters.extraTokenURLParameters;

NSMutableDictionary *extraURLQueryParameters = [self.internalConfig.extraQueryParameters.extraURLQueryParameters mutableCopy];
[extraURLQueryParameters addEntriesFromDictionary:parameters.extraQueryParameters];
msidParams.extraURLQueryParameters = extraURLQueryParameters;

msidParams.tokenExpirationBuffer = self.internalConfig.tokenExpirationBuffer;
msidParams.claimsRequest = parameters.claimsRequest.msidClaimsRequest;
msidParams.providedAuthority = providedAuthority;
Expand Down Expand Up @@ -1163,14 +1169,18 @@ - (void)acquireTokenWithParameters:(MSALInteractiveTokenParameters *)parameters

msidParams.promptType = MSIDPromptTypeForPromptType(parameters.promptType);
msidParams.loginHint = parameters.loginHint;
msidParams.extraAuthorizeURLQueryParameters = parameters.extraQueryParameters;
msidParams.extraURLQueryParameters = self.internalConfig.extraQueryParameters.extraURLQueryParameters;

NSMutableDictionary *extraAuthorizeURLQueryParameters = [self.internalConfig.extraQueryParameters.extraAuthorizeURLQueryParameters mutableCopy];
[extraAuthorizeURLQueryParameters addEntriesFromDictionary:parameters.extraQueryParameters];
msidParams.extraAuthorizeURLQueryParameters = extraAuthorizeURLQueryParameters;
// Extra parameters to be added to the /authorize endpoint.
msidParams.extraAuthorizeURLQueryParameters = self.internalConfig.extraQueryParameters.extraAuthorizeURLQueryParameters;

// Extra parameters to be added to the /token endpoint.
msidParams.extraTokenRequestParameters = self.internalConfig.extraQueryParameters.extraTokenURLParameters;

// Extra parameters to be added to both: /authorize and /token endpoints.
NSMutableDictionary *extraURLQueryParameters = [self.internalConfig.extraQueryParameters.extraURLQueryParameters mutableCopy];
[extraURLQueryParameters addEntriesFromDictionary:parameters.extraQueryParameters];
msidParams.extraURLQueryParameters = extraURLQueryParameters;

msidParams.tokenExpirationBuffer = self.internalConfig.tokenExpirationBuffer;
msidParams.extendedLifetimeEnabled = self.internalConfig.extendedLifetimeEnabled;
msidParams.clientCapabilities = self.internalConfig.clientApplicationCapabilities;
Expand Down
6 changes: 0 additions & 6 deletions MSAL/src/public/MSALInteractiveTokenParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property (nonatomic, nullable) NSString *loginHint;

/**
Key-value pairs to pass to the authentication server during
the interactive authentication flow. This should not be url-encoded value.
*/
@property (nonatomic, nullable) NSDictionary <NSString *, NSString *> *extraQueryParameters;

/**
Permissions you want the account to consent to in the same
authentication flow, but won't be included in the returned
Expand Down
5 changes: 5 additions & 0 deletions MSAL/src/public/MSALTokenParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property (nonatomic, nullable) MSALClaimsRequest *claimsRequest;

/**
Key-value pairs to pass to the /authorize and /token endpoints. This should not be url-encoded value.
*/
@property (nonatomic, nullable) NSDictionary <NSString *, NSString *> *extraQueryParameters;

/**
UUID to correlate this request with the server.
*/
Expand Down