Skip to content

Commit 14048bb

Browse files
wpcodevowpcodevo
committed
updated
1 parent 667b971 commit 14048bb

File tree

6 files changed

+27
-130
lines changed

6 files changed

+27
-130
lines changed

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ VERIFICATION_SECRET=my-email-verification-secret
1515

1616
EMAIL_HOST=smtp.mailtrap.io
1717
EMAIL_PORT=587
18-
EMAIL_USERNAME=4aeca0c9318dd2
19-
EMAIL_PASSWORD=a987a0e0eac00d
18+
EMAIL_USERNAME=90cf952fb44469
19+
EMAIL_PASSWORD=0524531956c552
2020
EMAIL_FROM=[email protected]
2121

2222
JWT_PRIVATE_KEY=LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlCT2dJQkFBSkJBSSs3QnZUS0FWdHVQYzEzbEFkVk94TlVmcWxzMm1SVmlQWlJyVFpjd3l4RVhVRGpNaFZuCi9KVHRsd3h2a281T0pBQ1k3dVE0T09wODdiM3NOU3ZNd2xNQ0F3RUFBUUpBYm5LaENOQ0dOSFZGaHJPQ0RCU0IKdmZ2ckRWUzVpZXAwd2h2SGlBUEdjeWV6bjd0U2RweUZ0NEU0QTNXT3VQOXhqenNjTFZyb1pzRmVMUWlqT1JhUwp3UUloQU84MWl2b21iVGhjRkltTFZPbU16Vk52TGxWTW02WE5iS3B4bGh4TlpUTmhBaUVBbWRISlpGM3haWFE0Cm15QnNCeEhLQ3JqOTF6bVFxU0E4bHUvT1ZNTDNSak1DSVFEbDJxOUdtN0lMbS85b0EyaCtXdnZabGxZUlJPR3oKT21lV2lEclR5MUxaUVFJZ2ZGYUlaUWxMU0tkWjJvdXF4MHdwOWVEejBEWklLVzVWaSt6czdMZHRDdUVDSUVGYwo3d21VZ3pPblpzbnU1clBsTDJjZldLTGhFbWwrUVFzOCtkMFBGdXlnCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t

‎alembic/versions/15770e820938_created_users_table.py‎

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

‎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/4917da928a79_added_post_table.py renamed to alembic/versions/61055af0da89_added_crud_entities.py

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,38 @@
1-
"""added post table
1+
"""added-crud-entities
22
3-
Revision ID: 4917da928a79
4-
Revises: 39256113e8e5
5-
Create Date: 2022-07-14 09:05:17.444518
3+
Revision ID: 61055af0da89
4+
Revises:
5+
Create Date: 2022-08-26 20:52:17.830383
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 = '4917da928a79'
14-
down_revision = '39256113e8e5'
13+
revision = '61055af0da89'
14+
down_revision = None
1515
branch_labels = None
1616
depends_on = None
1717

1818

1919
def upgrade() -> None:
2020
# ### commands auto generated by Alembic - please adjust! ###
21+
op.create_table('users',
22+
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
23+
sa.Column('name', sa.String(), nullable=False),
24+
sa.Column('email', sa.String(), nullable=False),
25+
sa.Column('password', sa.String(), nullable=False),
26+
sa.Column('photo', sa.String(), nullable=True),
27+
sa.Column('verified', sa.Boolean(), server_default='False', nullable=False),
28+
sa.Column('verification_code', sa.String(), nullable=True),
29+
sa.Column('role', sa.String(), server_default='user', nullable=False),
30+
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
31+
sa.Column('updated_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False),
32+
sa.PrimaryKeyConstraint('id'),
33+
sa.UniqueConstraint('email'),
34+
sa.UniqueConstraint('verification_code')
35+
)
2136
op.create_table('posts',
2237
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
2338
sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False),
@@ -36,4 +51,5 @@ def upgrade() -> None:
3651
def downgrade() -> None:
3752
# ### commands auto generated by Alembic - please adjust! ###
3853
op.drop_table('posts')
54+
op.drop_table('users')
3955
# ### end Alembic commands ###

‎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)