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.

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

Merge Hotfix/1.7.44 #1456

Merged
merged 6 commits into from
Dec 20, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Support web_page_uri.
antrix1989 committed Dec 11, 2024
commit d0b8cf8c06e595fc125621b16883af9fb1882344
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable) MSIDClaimsRequest *claimsRequest;
@property (nonatomic) NSDate *requestSentDate;
@property (nonatomic) NSString *nonce;
@property (nonatomic) NSString *webPageUri;
@property (nonatomic, nullable) NSString *accountHomeTenantId;
@property (nonatomic, nullable) NSString *clientSku;
@property (nonatomic) BOOL skipValidateResultAccount;
Original file line number Diff line number Diff line change
@@ -61,6 +61,7 @@ + (BOOL)fillRequest:(MSIDBrokerOperationTokenRequest *)request
request.claimsRequest = parameters.claimsRequest;
request.requestSentDate = requestSentDate;
request.nonce = parameters.nonce;
request.webPageUri = parameters.webPageUri;
request.clientSku = parameters.clientSku;
request.skipValidateResultAccount = parameters.skipValidateResultAccount;
request.forceRefresh = parameters.forceRefresh;
@@ -81,6 +82,8 @@ - (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError *__au
_configuration = [[MSIDConfiguration alloc] initWithJSONDictionary:json error:error];
if (!_configuration) return nil;

_webPageUri = [json msidStringObjectForKey:@"web_page_uri"];

_providerType = MSIDProviderTypeFromString([json msidStringObjectForKey:MSID_PROVIDER_TYPE_JSON_KEY]);

_oidcScope = [json msidStringObjectForKey:MSID_BROKER_EXTRA_OIDC_SCOPES_KEY];
@@ -137,6 +140,7 @@ - (NSDictionary *)jsonDictionary
}

[json addEntriesFromDictionary:configurationJson];
json[@"web_page_uri"] = self.webPageUri;
json[MSID_PROVIDER_TYPE_JSON_KEY] = MSIDProviderTypeToString(self.providerType);
json[MSID_BROKER_EXTRA_OIDC_SCOPES_KEY] = self.oidcScope;
json[MSID_BROKER_EXTRA_QUERY_PARAM_KEY] = [self.extraQueryParameters msidWWWFormURLEncode];
1 change: 1 addition & 0 deletions IdentityCore/src/parameters/MSIDRequestParameters.h
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@
@property (nonatomic) MSIDAuthority *providedAuthority;
@property (nonatomic) MSIDAuthority *cloudAuthority;
@property (nonatomic) NSString *redirectUri;
@property (nonatomic) NSString *webPageUri;
@property (nonatomic) NSString *clientId;
@property (nonatomic) NSString *target;
@property (nonatomic) NSString *oidcScope;