Skip to content

Commit d3c1285

Browse files
harsh62harsh62
authored
feat(auth): remove support for token query param (#5519)
1 parent c972635 commit d3c1285

File tree

8 files changed

+5
-34
lines changed

8 files changed

+5
-34
lines changed

‎AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClient.swift‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ final public class AWSMobileClient: _AWSMobileClient {
3333
internal var customRoleArnInternal: String? = nil
3434

3535
internal var signInURIQueryParameters: [String: String]? = nil
36-
internal var tokenURIQueryParameters: [String: String]? = nil
3736
internal var signOutURIQueryParameters: [String: String]? = nil
3837
internal var scopes: [String]? = nil
3938

@@ -353,9 +352,6 @@ final public class AWSMobileClient: _AWSMobileClient {
353352
}
354353

355354
let tokensURI = infoDictionary?["TokenURI"] as? String
356-
if self.tokenURIQueryParameters == nil {
357-
self.tokenURIQueryParameters = infoDictionary?["TokenURIQueryParameters"] as? [String: String]
358-
}
359355

360356
guard
361357
let clientId = clientId,
@@ -381,7 +377,6 @@ final public class AWSMobileClient: _AWSMobileClient {
381377
tokensUri: tokensURI,
382378
signInUriQueryParameters: self.signInURIQueryParameters,
383379
signOutUriQueryParameters: self.signOutURIQueryParameters,
384-
tokenUriQueryParameters: self.tokenURIQueryParameters,
385380
userPoolServiceConfiguration: AWSMobileClient.serviceConfiguration?.userPoolServiceConfiguration,
386381
signInPrivateSession: false)
387382

‎AWSAuthSDK/Sources/AWSMobileClient/AWSMobileClientOperations/AWSMobileClient+SignInUI.swift‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,7 @@ extension AWSMobileClient {
216216
}
217217

218218
let tokensURI = infoDictionary?["TokenURI"] as? String
219-
if self.tokenURIQueryParameters == nil {
220-
self.tokenURIQueryParameters = infoDictionary?["TokenURIQueryParameters"] as? [String: String]
221-
}
222-
219+
223220
let identityProvider = hostedUIOptions.identityProvider
224221
let idpIdentifier = hostedUIOptions.idpIdentifier
225222

@@ -234,10 +231,6 @@ extension AWSMobileClient {
234231
self.signInURIQueryParameters = hostedUIOptions.signInURIQueryParameters
235232
}
236233

237-
if hostedUIOptions.tokenURIQueryParameters != nil {
238-
self.tokenURIQueryParameters = hostedUIOptions.tokenURIQueryParameters
239-
}
240-
241234
if hostedUIOptions.signOutURIQueryParameters != nil {
242235
self.signOutURIQueryParameters = hostedUIOptions.signOutURIQueryParameters
243236
}
@@ -261,7 +254,6 @@ extension AWSMobileClient {
261254
tokensUri: tokensURI,
262255
signInUriQueryParameters: self.signInURIQueryParameters,
263256
signOutUriQueryParameters: self.signOutURIQueryParameters,
264-
tokenUriQueryParameters: self.tokenURIQueryParameters,
265257
userPoolServiceConfiguration: AWSMobileClient.serviceConfiguration?.userPoolServiceConfiguration,
266258
signInPrivateSession: hostedUIOptions.signInPrivateSession)
267259

‎AWSAuthSDK/Sources/AWSMobileClient/Helpers/AWSMobileClientConstants.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ struct AWSMobileClientConstants {
2525
static let LoginsMapKey = "loginsMap"
2626
static let FederationProviderKey = "federationProvider"
2727
static let SignInURIQueryParametersKey = "signInURIQueryParameters"
28-
static let TokenURIQueryParametersKey = "tokenURIQueryParameters"
2928
static let SignOutURIQueryParametersKey = "signOutURIQueryParameters"
3029
static let CustomRoleArnKey = "customRoleArn"
3130
static let FederationDisabledKey = "federationDisabled"

‎AWSAuthSDK/Sources/AWSMobileClient/Helpers/KeyChain/AWSMobileClient+Keychain.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ extension AWSMobileClient {
3737

3838
internal func saveOAuthURIQueryParametersInKeychain() {
3939
self.keychain.setData(JSONHelper.dataFromDictionary(self.signInURIQueryParameters), forKey: AWSMobileClientConstants.SignInURIQueryParametersKey)
40-
self.keychain.setData(JSONHelper.dataFromDictionary(self.tokenURIQueryParameters), forKey: AWSMobileClientConstants.TokenURIQueryParametersKey)
4140
self.keychain.setData(JSONHelper.dataFromDictionary(self.signOutURIQueryParameters), forKey: AWSMobileClientConstants.SignOutURIQueryParametersKey)
4241
}
4342

4443
internal func loadOAuthURIQueryParametersFromKeychain() {
4544
self.signInURIQueryParameters = JSONHelper.dictionaryFromData(self.keychain.data(forKey: AWSMobileClientConstants.SignInURIQueryParametersKey))
46-
self.tokenURIQueryParameters = JSONHelper.dictionaryFromData(self.keychain.data(forKey: AWSMobileClientConstants.TokenURIQueryParametersKey))
4745
self.signOutURIQueryParameters = JSONHelper.dictionaryFromData(self.keychain.data(forKey: AWSMobileClientConstants.SignOutURIQueryParametersKey))
4846
}
4947

‎AWSAuthSDK/Sources/AWSMobileClient/Internal/AWSCognitoAuth+Extensions.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
3131
tokensUri:(nullable NSString *) tokensUri
3232
signInUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) signInUriQueryParameters
3333
signOutUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) signOutUriQueryParameters
34-
tokenUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) tokenUriQueryParameters
3534
userPoolServiceConfiguration:(nullable AWSServiceConfiguration *)serviceConfiguration
3635
signInPrivateSession:(BOOL)signInPrivateSession;
3736

‎AWSAuthSDK/Sources/AWSMobileClient/Internal/AWSCognitoAuth+Extensions.m‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ - (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
3838
tokensUri:(NSString *) tokensUri
3939
signInUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signInUriQueryParameters
4040
signOutUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signOutUriQueryParameters
41-
tokenUriQueryParameters:(NSDictionary<NSString *, NSString *> *) tokenUriQueryParameters
4241
isProviderExternal:(BOOL) isProviderExternal
4342
cognitoUserPoolServiceConfig:(nullable AWSServiceConfiguration *) serviceConfig
4443
signInPrivateSession:(BOOL)isSignInPrivateSession;
@@ -60,7 +59,6 @@ - (instancetype)initWithAppClientId:(NSString *) appClientId
6059
tokensUri:(nullable NSString *) tokensUri
6160
signInUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) signInUriQueryParameters
6261
signOutUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) signOutUriQueryParameters
63-
tokenUriQueryParameters:(nullable NSDictionary<NSString *, NSString *> *) tokenUriQueryParameters
6462
userPoolServiceConfiguration:(nullable AWSServiceConfiguration *)serviceConfiguration
6563
signInPrivateSession:(BOOL)signInPrivateSession {
6664
BOOL isProviderExternal = YES;
@@ -83,7 +81,6 @@ - (instancetype)initWithAppClientId:(NSString *) appClientId
8381
tokensUri:tokensUri
8482
signInUriQueryParameters:signInUriQueryParameters
8583
signOutUriQueryParameters:signOutUriQueryParameters
86-
tokenUriQueryParameters:tokenUriQueryParameters
8784
isProviderExternal:isProviderExternal
8885
cognitoUserPoolServiceConfig:serviceConfiguration
8986
signInPrivateSession:signInPrivateSession];

‎AWSAuthSDK/Sources/AWSMobileClient/Models/HostedUIOptions.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public struct HostedUIOptions {
2929
let federationProviderName: String?
3030

3131
let signInURIQueryParameters: [String: String]?
32-
let tokenURIQueryParameters: [String: String]?
3332
let signOutURIQueryParameters: [String: String]?
3433

3534
let signInPrivateSession: Bool
@@ -43,15 +42,13 @@ public struct HostedUIOptions {
4342
/// - idpIdentifier: The IdentityProvider identifier if using multiple instances of same identity provider.
4443
/// - federationProviderName: If federating with Cognito Identity and using a provider like Auth0 specify the provider name, e.g. <your_domain>.auth0.com.
4544
/// - signInURIQueryParameters: The additional query parameters apart from standard OAuth w/ open id connect parameters for signInURI. If specified here, the signInURIQueryParameters specified in `awsconfiguration.json` would be over-ridden.
46-
/// - tokenURIQueryParameters: The additional query parameters apart from standard OAuth w/ open id connect parameters for tokenURI. If specified here, the tokenURIQueryParameters specified in `awsconfiguration.json` would be over-ridden.
4745
/// - signOutURIQueryParameters: The additional query parameters apart from standard OAuth w/ open id connect parameters for signOutURI. If specified here, the signOutURIQueryParameters specified in `awsconfiguration.json` would be over-ridden.
4846
public init(disableFederation: Bool = false,
4947
scopes: [String]? = nil,
5048
identityProvider: String? = nil,
5149
idpIdentifier: String? = nil,
5250
federationProviderName: String? = nil,
5351
signInURIQueryParameters: [String: String]? = nil,
54-
tokenURIQueryParameters: [String: String]? = nil,
5552
signOutURIQueryParameters: [String: String]? = nil,
5653
signInPrivateSession: Bool = false) {
5754
self.disableFederation = disableFederation
@@ -69,7 +66,6 @@ public struct HostedUIOptions {
6966
self.idpIdentifier = idpIdentifier
7067
self.federationProviderName = federationProviderName
7168
self.signInURIQueryParameters = signInURIQueryParameters
72-
self.tokenURIQueryParameters = tokenURIQueryParameters
7369
self.signOutURIQueryParameters = signOutURIQueryParameters
7470
self.signInPrivateSession = signInPrivateSession
7571
}

‎AWSCognitoAuth/AWSCognitoAuth.m‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,6 @@ - (instancetype)initWithAppClientId:(NSString *) appClientId
13341334
tokensUri:[NSString stringWithFormat:@"%@/oauth2/token",webDomain]
13351335
signInUriQueryParameters:@{}
13361336
signOutUriQueryParameters:@{@"client_id": appClientId, @"logout_uri": signOutRedirectUri}
1337-
tokenUriQueryParameters:@{}
13381337
isProviderExternal:NO];
13391338
}
13401339

@@ -1353,7 +1352,6 @@ - (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
13531352
tokensUri:(NSString *) tokensUri
13541353
signInUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signInUriQueryParameters
13551354
signOutUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signOutUriQueryParameters
1356-
tokenUriQueryParameters:(NSDictionary<NSString *, NSString *> *) tokenUriQueryParameters
13571355
isProviderExternal:(BOOL) isProviderExternal {
13581356

13591357
return [self initWithAppClientIdInternal:appClientId
@@ -1371,10 +1369,9 @@ - (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
13711369
tokensUri:tokensUri
13721370
signInUriQueryParameters:signInUriQueryParameters
13731371
signOutUriQueryParameters:signOutUriQueryParameters
1374-
tokenUriQueryParameters:tokenUriQueryParameters
1375-
isProviderExternal:isProviderExternal
1376-
cognitoUserPoolServiceConfig:nil
1377-
signInPrivateSession:NO];
1372+
isProviderExternal:isProviderExternal
1373+
cognitoUserPoolServiceConfig:nil
1374+
signInPrivateSession:NO];
13781375
}
13791376

13801377
- (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
@@ -1392,7 +1389,6 @@ - (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
13921389
tokensUri:(NSString *) tokensUri
13931390
signInUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signInUriQueryParameters
13941391
signOutUriQueryParameters:(NSDictionary<NSString *, NSString *> *) signOutUriQueryParameters
1395-
tokenUriQueryParameters:(NSDictionary<NSString *, NSString *> *) tokenUriQueryParameters
13961392
isProviderExternal:(BOOL) isProviderExternal
13971393
cognitoUserPoolServiceConfig:(nullable AWSServiceConfiguration *) serviceConfig
13981394
signInPrivateSession:(BOOL)isSignInPrivateSession {
@@ -1421,7 +1417,7 @@ - (instancetype)initWithAppClientIdInternal:(NSString *) appClientId
14211417
_userPoolId = userPoolIdForEnablingASF;
14221418
_isSFAuthenticationSessionEnabled = enableSFAuthSession;
14231419
_signInUriQueryParameters = signInUriQueryParameters;
1424-
_tokensUriQueryParameters = tokenUriQueryParameters;
1420+
_tokensUriQueryParameters = @{};
14251421
_isAuthProviderExternal = isProviderExternal;
14261422
_userPoolConfig = serviceConfig;
14271423
_isSignInPrivateSession = isSignInPrivateSession;
@@ -1448,7 +1444,6 @@ - (id)copyWithZone:(NSZone *)zone {
14481444
tokensUri:self.tokensUri
14491445
signInUriQueryParameters:self.signInUriQueryParameters
14501446
signOutUriQueryParameters:self.signOutUriQueryParameters
1451-
tokenUriQueryParameters:self.tokensUriQueryParameters
14521447
isProviderExternal:self.isAuthProviderExternal
14531448
cognitoUserPoolServiceConfig:self.userPoolConfig
14541449
signInPrivateSession:self.isSignInPrivateSession];

0 commit comments

Comments
 (0)