Skip to content

fix(auth): allow removing and adding identity pool for an already deployed app #4022

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

Merged
merged 1 commit into from
Jul 16, 2025
Merged

fix(auth): allow removing and adding identity pool for an already deployed app #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion ...s/Auth/Sources/AWSCognitoAuthPlugin/CredentialStorage/AWSCognitoAuthCredentialStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ struct AWSCognitoAuthCredentialStore {
let oldUserPoolConfiguration = oldAuthConfigData.getUserPoolConfiguration()
let oldIdentityPoolConfiguration = oldAuthConfigData.getIdentityPoolConfiguration()
let newIdentityConfigData = currentAuthConfig.getIdentityPoolConfiguration()
let newUserPoolConfiguration = currentAuthConfig.getUserPoolConfiguration()

/// Only migrate if
/// Migrate if
/// - Old User Pool Config didn't exist
/// - New Identity Config Data exists
/// - Old Identity Pool Config == New Identity Pool Config
Expand All @@ -95,6 +96,19 @@ struct AWSCognitoAuthCredentialStore {
if let oldCognitoCredentialsData = try? keychain._getData(oldNameSpace) {
try? keychain._set(oldCognitoCredentialsData, key: newNameSpace)
}
/// Migrate if
/// - Old config and new config are different
/// - Old Userpool Existed
/// - Old and new user pool namespacing is the same
} else if oldAuthConfigData != currentAuthConfig &&
oldUserPoolConfiguration != nil &&
UserPoolConfigurationData.isNamespacingEqual(
lhs: oldUserPoolConfiguration,
rhs: newUserPoolConfiguration) {
// retrieve data from the old namespace and save with the new namespace
if let oldCognitoCredentialsData = try? keychain._getData(oldNameSpace) {
try? keychain._set(oldCognitoCredentialsData, key: newNameSpace)
}
} else if oldAuthConfigData != currentAuthConfig &&
oldNameSpace != newNameSpace {
// Clear the old credentials
Expand Down
8 changes: 8 additions & 0 deletions ...th/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/UserPoolConfigurationData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ struct UserPoolConfigurationData: Equatable {
func getIdentityProviderName() -> String {
return "cognito-idp.\(region).amazonaws.com/\(poolId)"
}

static func isNamespacingEqual(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably good to have a test for this method

lhs: UserPoolConfigurationData?,
rhs: UserPoolConfigurationData?) -> Bool {
return lhs?.poolId == rhs?.poolId
&& lhs?.clientId == rhs?.clientId
&& lhs?.region == rhs?.region
}
}

extension UserPoolConfigurationData: Codable { }
Expand Down
Loading