Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CognitoIDP: Use default values for unspecified settings in update_user_pool (#6866)

Browse Source
This commit is contained in:
komada 2023-09-30 16:36:16 +09:00 committed by GitHub
parent 6fe4999de2
commit ad2d77a59c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
moto/cognitoidp/models.py
View File

@ -399,22 +399,7 @@ class CognitoIdpUserPool(BaseModel):
self.name = name
self.status = None
self.extended_config = DEFAULT_USER_POOL_CONFIG.copy()
self.extended_config.update(extended_config or {})
message_template = self.extended_config.get("VerificationMessageTemplate")
if message_template and "SmsVerificationMessage" not in extended_config:
self.extended_config["SmsVerificationMessage"] = message_template.get(
"SmsMessage"
)
if message_template and "EmailVerificationSubject" not in extended_config:
self.extended_config["EmailVerificationSubject"] = message_template.get(
"EmailSubject"
)
if message_template and "EmailVerificationMessage" not in extended_config:
self.extended_config["EmailVerificationMessage"] = message_template.get(
"EmailMessage"
)
self.update_extended_config(extended_config)
self.creation_date = utcnow()
self.last_modified_date = utcnow()
@ -472,6 +457,24 @@ class CognitoIdpUserPool(BaseModel):
None,
)
def update_extended_config(self, extended_config: Dict[str, Any]) -> None:
self.extended_config = DEFAULT_USER_POOL_CONFIG.copy()
self.extended_config.update(extended_config or {})
message_template = self.extended_config.get("VerificationMessageTemplate")
if message_template and "SmsVerificationMessage" not in extended_config:
self.extended_config["SmsVerificationMessage"] = message_template.get(
"SmsMessage"
)
if message_template and "EmailVerificationSubject" not in extended_config:
self.extended_config["EmailVerificationSubject"] = message_template.get(
"EmailSubject"
)
if message_template and "EmailVerificationMessage" not in extended_config:
self.extended_config["EmailVerificationMessage"] = message_template.get(
"EmailMessage"
)
def _base_json(self) -> Dict[str, Any]:
return {
"Id": self.id,
@ -978,7 +981,7 @@ class CognitoIdpBackend(BaseBackend):
self, user_pool_id: str, extended_config: Dict[str, Any]
) -> None:
user_pool = self.describe_user_pool(user_pool_id)
user_pool.extended_config = extended_config
user_pool.update_extended_config(extended_config)
def delete_user_pool(self, user_pool_id: str) -> None:
self.describe_user_pool(user_pool_id)

6
tests/test_cognitoidp/test_cognitoidp.py
View File

@ -885,6 +885,12 @@ def test_update_user_pool():
UserPoolId=user_pool_details["UserPool"]["Id"]
)
assert updated_user_pool_details["UserPool"]["Policies"] == new_policies
assert updated_user_pool_details["UserPool"]["AdminCreateUserConfig"] is not None
assert updated_user_pool_details["UserPool"]["EmailConfiguration"] is not None
assert (
updated_user_pool_details["UserPool"]["VerificationMessageTemplate"] is not None
)
assert updated_user_pool_details["UserPool"]["AccountRecoverySetting"] is not None
@mock_cognitoidp