Skip to content

Commit 8de4139

Browse files
wpcodevowpcodevo
committed
updated
1 parent 4cdf004 commit 8de4139

File tree

5 files changed

+13
-90
lines changed

5 files changed

+13
-90
lines changed

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ CLIENT_ORIGIN=http://localhost:3000
1313

1414
EMAIL_HOST=smtp.mailtrap.io
1515
EMAIL_PORT=587
16-
EMAIL_USERNAME=4aeca0c9318dd2
17-
EMAIL_PASSWORD=a987a0e0eac00d
16+
EMAIL_USERNAME=90cf952fb44469
17+
EMAIL_PASSWORD=0524531956c552
1818
EMAIL_FROM=admin@admin.com
1919

2020
JWT_PRIVATE_KEY=LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlCT2dJQkFBSkJBSSs3QnZUS0FWdHVQYzEzbEFkVk94TlVmcWxzMm1SVmlQWlJyVFpjd3l4RVhVRGpNaFZuCi9KVHRsd3h2a281T0pBQ1k3dVE0T09wODdiM3NOU3ZNd2xNQ0F3RUFBUUpBYm5LaENOQ0dOSFZGaHJPQ0RCU0IKdmZ2ckRWUzVpZXAwd2h2SGlBUEdjeWV6bjd0U2RweUZ0NEU0QTNXT3VQOXhqenNjTFZyb1pzRmVMUWlqT1JhUwp3UUloQU84MWl2b21iVGhjRkltTFZPbU16Vk52TGxWTW02WE5iS3B4bGh4TlpUTmhBaUVBbWRISlpGM3haWFE0Cm15QnNCeEhLQ3JqOTF6bVFxU0E4bHUvT1ZNTDNSak1DSVFEbDJxOUdtN0lMbS85b0EyaCtXdnZabGxZUlJPR3oKT21lV2lEclR5MUxaUVFJZ2ZGYUlaUWxMU0tkWjJvdXF4MHdwOWVEejBEWklLVzVWaSt6czdMZHRDdUVDSUVGYwo3d21VZ3pPblpzbnU1clBsTDJjZldLTGhFbWwrUVFzOCtkMFBGdXlnCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t

‎alembic/versions/1c7984990e1d_created_posts_table.py‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎alembic/versions/39256113e8e5_added_verification_code.py‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

alembic/versions/15770e820938_created_users_table.py renamed to alembic/versions/b1ec015461c4_added_verification_auth.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
"""created_users_table
1+
"""added-verification-auth
22
3-
Revision ID: 15770e820938
3+
Revision ID: b1ec015461c4
44
Revises:
5-
Create Date: 2022-07-06 15:11:26.439123
5+
Create Date: 2022-08-26 20:35:54.899416
66
77
"""
88
from alembic import op
99
import sqlalchemy as sa
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.
13-
revision = '15770e820938'
13+
revision = 'b1ec015461c4'
1414
down_revision = None
1515
branch_labels = None
1616
depends_on = None
@@ -19,17 +19,19 @@
1919
def upgrade() -> None:
2020
# ### commands auto generated by Alembic - please adjust! ###
2121
op.create_table('users',
22-
sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
22+
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
2323
sa.Column('name', sa.String(), nullable=False),
2424
sa.Column('email', sa.String(), nullable=False),
2525
sa.Column('password', sa.String(), nullable=False),
2626
sa.Column('photo', sa.String(), nullable=True),
2727
sa.Column('verified', sa.Boolean(), server_default='False', nullable=False),
28+
sa.Column('verification_code', sa.String(), nullable=True),
2829
sa.Column('role', sa.String(), server_default='user', nullable=False),
2930
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
3031
sa.Column('updated_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
3132
sa.PrimaryKeyConstraint('id'),
32-
sa.UniqueConstraint('email')
33+
sa.UniqueConstraint('email'),
34+
sa.UniqueConstraint('verification_code')
3335
)
3436
# ### end Alembic commands ###
3537

‎app/routers/auth.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ def verify_me(token: str, db: Session = Depends(get_db)):
150150
db.commit()
151151
user = user_query.first()
152152
if not user:
153+
raise HTTPException(
154+
status_code=status.HTTP_403_FORBIDDEN, detail="Invalid code or user doesn't exist")
155+
if user.verified:
153156
raise HTTPException(
154157
status_code=status.HTTP_403_FORBIDDEN, detail='Email can only be verified once')
155158
user_query.update(

0 commit comments

Comments
 (0)