sergio/saladeaula.digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix set email verified

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2025-11-28 21:28:13 -03:00
parent c48f289514
commit b5f3648f44
8 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api.saladeaula.digital/app/routes/orgs/users/__init__.py
View File

@@ -139,7 +139,6 @@ def _create_user(user: User, org: Org) -> bool:
'fresh_user': True,
'name': user.name,
'email': user.email,
'email_primary': True,
'org_name': org.name,
'ttl': ttl(start_dt=now_, days=30),
'created_at': now_,

42
api.saladeaula.digital/app/routes/users/emails.py
View File

@@ -8,8 +8,7 @@ from aws_lambda_powertools.event_handler.exceptions import (
)
from aws_lambda_powertools.event_handler.openapi.params import Body, Path, Query
from layercake.dateutils import now, ttl
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey
from layercake.funcs import pick
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey, TransactKey
from pydantic import EmailStr
from typing_extensions import Annotated
@@ -33,6 +32,9 @@ def get_emails(user_id: str, start_key: Annotated[str | None, Query] = None):
class UserNotFoundError(NotFoundError): ...
class EmailNotFoundError(NotFoundError): ...
class EmailConflictError(ServiceError):
def __init__(self, msg: str | dict):
super().__init__(HTTPStatus.CONFLICT, msg)
@@ -82,7 +84,6 @@ def add(
'sk': f'EMAIL_VERIFICATION#{uuid4()}',
'name': name,
'email': email,
'user_id': user_id,
'ttl': ttl(start_dt=now_, days=30),
'created_at': now_,
}
@@ -110,7 +111,6 @@ def request_verification(
'sk': f'EMAIL_VERIFICATION#{uuid4()}',
'name': name,
'email': email,
'user_id': user_id,
'ttl': ttl(start_dt=now_, days=30),
'created_at': now_,
}
@@ -121,20 +121,31 @@ def request_verification(
class EmailVerificationNotFoundError(NotFoundError): ...
@router.post('/<user_id>/emails/<hash>/verify')
def verify(user_id: str, hash: str):
verification = dyn.collection.get_item(
KeyPair(
pk=user_id,
sk=f'EMAIL_VERIFICATION#{hash}',
@router.post('/<user_id>/emails/<code>/verify')
def verify(user_id: str, code: str):
r = dyn.collection.get_items(
TransactKey(user_id)
+ SortKey(
sk='0',
rename_key='email_primary',
path_spec='email',
)
+ SortKey(
sk=f'EMAIL_VERIFICATION#{code}',
rename_key='email',
path_spec='email',
),
exc_cls=EmailVerificationNotFoundError,
flatten_top=False,
)
email, primary = pick(('email', 'email_primary'), verification, default=False)
if 'email' not in r:
raise EmailVerificationNotFoundError('Verification code not found')
email, email_primary = r['email'], r['email_primary']
with dyn.transact_writer() as transact:
transact.delete(
key=KeyPair(user_id, f'EMAIL_VERIFICATION#{hash}'),
key=KeyPair(user_id, f'EMAIL_VERIFICATION#{code}'),
)
transact.update(
# Post-migration (users): rename `emails` to `EMAIL`
@@ -144,15 +155,16 @@ def verify(user_id: str, hash: str):
':true': True,
':now': now(),
},
cond_expr='attribute_exists(sk)',
exc_cls=EmailNotFoundError,
)
if primary:
if email == email_primary:
transact.update(
key=KeyPair(user_id, '0'),
update_expr='SET email_verified = :true, \
updated_at = :now',
expr_attr_values={
':email': email,
':true': True,
':now': now(),
},

34
api.saladeaula.digital/tests/routes/users/test_emails.py
View File

@@ -76,6 +76,40 @@ def test_email_as_primary(
assert r['statusCode'] == HTTPStatus.NO_CONTENT
def test_verify_email(
app,
seeds,
http_api_proxy: HttpApiProxy,
lambda_context: LambdaContext,
):
r = app.lambda_handler(
http_api_proxy(
raw_path='/users/15bacf02-1535-4bee-9022-19d106fd7518/emails/0d29c753-55f8-42d2-908b-e4976aafc183/verify',
method=HTTPMethod.POST,
),
lambda_context,
)
assert r['statusCode'] == HTTPStatus.NO_CONTENT
def test_verify_email_notfound(
app,
seeds,
http_api_proxy: HttpApiProxy,
lambda_context: LambdaContext,
):
r = app.lambda_handler(
http_api_proxy(
raw_path='/users/15bacf02-1535-4bee-9022-19d106fd7518/emails/abc/verify',
method=HTTPMethod.POST,
),
lambda_context,
)
assert r['statusCode'] == HTTPStatus.NOT_FOUND
def test_remove_emal(
app,
seeds,

3
api.saladeaula.digital/tests/seeds.jsonl
View File

@@ -2,7 +2,8 @@
{"id": "213a6682-2c59-4404-9189-12eec0a846d4", "sk": "orgs#f6000f79-6e5c-49a0-952f-3bda330ef278", "name": "Banco do Brasil", "cnpj": "00000000000191"}
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "0", "name": "Sérgio R Siqueira", "email": "sergio@somosbeta.com.br", "cpf": "07879819908"}
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "emails#sergio@somosbeta.com.br", "email_primary": true, "mx_record_exists": true}
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "emails#osergiosiqueira@gmail.com", "mx_record_exists": true}
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "emails#osergiosiqueira@gmail.com", "email_verified": false, "mx_record_exists": true}
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "EMAIL_VERIFICATION#0d29c753-55f8-42d2-908b-e4976aafc183", "email": "osergiosiqueira@gmail.com", "name": "Sérgio Rafael de Siqueira"}
// User orgs
{"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "orgs#f6000f79-6e5c-49a0-952f-3bda330ef278", "name": "Banco do Brasil", "cnpj": "00000000000191"}