updated

Author: wpcodevo

.env

@@ -10,6 +10,11 @@ JWT_ALGORITHM=RS256
 
 CLIENT_ORIGIN=http://localhost:3000
 
+EMAIL_HOST=smtp.mailtrap.io
+EMAIL_PORT=587
+EMAIL_USERNAME=90cf952fb44469
+EMAIL_PASSWORD=0524531956c552
+EMAIL_FROM=admin@admin.com
 
 JWT_PRIVATE_KEY=LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlCT2dJQkFBSkJBSSs3QnZUS0FWdHVQYzEzbEFkVk94TlVmcWxzMm1SVmlQWlJyVFpjd3l4RVhVRGpNaFZuCi9KVHRsd3h2a281T0pBQ1k3dVE0T09wODdiM3NOU3ZNd2xNQ0F3RUFBUUpBYm5LaENOQ0dOSFZGaHJPQ0RCU0IKdmZ2ckRWUzVpZXAwd2h2SGlBUEdjeWV6bjd0U2RweUZ0NEU0QTNXT3VQOXhqenNjTFZyb1pzRmVMUWlqT1JhUwp3UUloQU84MWl2b21iVGhjRkltTFZPbU16Vk52TGxWTW02WE5iS3B4bGh4TlpUTmhBaUVBbWRISlpGM3haWFE0Cm15QnNCeEhLQ3JqOTF6bVFxU0E4bHUvT1ZNTDNSak1DSVFEbDJxOUdtN0lMbS85b0EyaCtXdnZabGxZUlJPR3oKT21lV2lEclR5MUxaUVFJZ2ZGYUlaUWxMU0tkWjJvdXF4MHdwOWVEejBEWklLVzVWaSt6czdMZHRDdUVDSUVGYwo3d21VZ3pPblpzbnU1clBsTDJjZldLTGhFbWwrUVFzOCtkMFBGdXlnCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t
 JWT_PUBLIC_KEY=LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZ3d0RRWUpLb1pJaHZjTkFRRUJCUUFEU3dBd1NBSkJBSSs3QnZUS0FWdHVQYzEzbEFkVk94TlVmcWxzMm1SVgppUFpSclRaY3d5eEVYVURqTWhWbi9KVHRsd3h2a281T0pBQ1k3dVE0T09wODdiM3NOU3ZNd2xNQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQ==

app/config.py

@@ -1,4 +1,4 @@
-from pydantic import BaseSettings
+from pydantic import BaseSettings, EmailStr
 
 
 class Settings(BaseSettings):
@@ -13,6 +13,12 @@ class Settings(BaseSettings):
 
     CLIENT_ORIGIN: str
 
+    EMAIL_HOST: str
+    EMAIL_PORT: int
+    EMAIL_USERNAME: str
+    EMAIL_PASSWORD: str
+    EMAIL_FROM: EmailStr
+
     class Config:
         env_file = './.env'
 

app/email.py

@@ -0,0 +1,61 @@
+from typing import List
+from fastapi_mail import FastMail, MessageSchema, ConnectionConfig
+from pydantic import EmailStr, BaseModel
+from .config import settings
+from jinja2 import Environment, select_autoescape, PackageLoader
+
+
+env = Environment(
+    loader=PackageLoader('app', 'templates'),
+    autoescape=select_autoescape(['html', 'xml'])
+)
+
+
+class EmailSchema(BaseModel):
+    email: List[EmailStr]
+
+
+class Email:
+    def __init__(self, user: dict, url: str, email: List[EmailStr]):
+        self.name = user['name']
+        self.sender = 'Codevo <admin@admin.com>'
+        self.email = email
+        self.url = url
+        pass
+
+    async def sendMail(self, subject, template):
+        # Define the config
+        conf = ConnectionConfig(
+            MAIL_USERNAME=settings.EMAIL_USERNAME,
+            MAIL_PASSWORD=settings.EMAIL_PASSWORD,
+            MAIL_FROM=settings.EMAIL_FROM,
+            MAIL_PORT=settings.EMAIL_PORT,
+            MAIL_SERVER=settings.EMAIL_HOST,
+            MAIL_TLS=True,
+            MAIL_SSL=False,
+            USE_CREDENTIALS=True,
+            VALIDATE_CERTS=True
+        )
+        # Generate the HTML template base on the template name
+        template = env.get_template(f'{template}.html')
+
+        html = template.render(
+            url=self.url,
+            first_name=self.name,
+            subject=subject
+        )
+
+        # Define the message options
+        message = MessageSchema(
+            subject=subject,
+            recipients=self.email,
+            body=html,
+            subtype="html"
+        )
+
+        # Send the email
+        fm = FastMail(conf)
+        await fm.send_message(message)
+
+    async def sendVerificationCode(self):
+        await self.sendMail('Your verification code (Valid for 10min)', 'verification')

app/routers/auth.py

@@ -1,11 +1,14 @@
 from datetime import datetime, timedelta
+import hashlib
+from random import randbytes
 from bson.objectid import ObjectId
 from fastapi import APIRouter, Request, Response, status, Depends, HTTPException
 from pydantic import EmailStr
 
 from app import oauth2
 from app.database import User
-from app.serializers import userEntity, userResponseEntity
+from app.email import Email
+from app.serializers import userEntity
 from .. import schemas, utils
 from app.oauth2 import AuthJWT
 from ..config import settings
@@ -16,8 +19,8 @@
 REFRESH_TOKEN_EXPIRES_IN = settings.REFRESH_TOKEN_EXPIRES_IN
 
 
-@router.post('/register', status_code=status.HTTP_201_CREATED, response_model=schemas.UserResponse)
-async def create_user(payload: schemas.CreateUserSchema):
+@router.post('/register', status_code=status.HTTP_201_CREATED)
+async def create_user(payload: schemas.CreateUserSchema, request: Request):
     # Check if user already exist
     user = User.find_one({'email': payload.email.lower()})
     if user:
@@ -31,13 +34,29 @@ async def create_user(payload: schemas.CreateUserSchema):
     payload.password = utils.hash_password(payload.password)
     del payload.passwordConfirm
     payload.role = 'user'
-    payload.verified = True
+    payload.verified = False
     payload.email = payload.email.lower()
     payload.created_at = datetime.utcnow()
     payload.updated_at = payload.created_at
+
     result = User.insert_one(payload.dict())
-    new_user = userResponseEntity(User.find_one({'_id': result.inserted_id}))
-    return {"status": "success", "user": new_user}
+    new_user = User.find_one({'_id': result.inserted_id})
+    try:
+        token = randbytes(10)
+        hashedCode = hashlib.sha256()
+        hashedCode.update(token)
+        verification_code = hashedCode.hexdigest()
+        User.find_one_and_update({"_id": result.inserted_id}, {
+            "$set": {"verification_code": verification_code, "updated_at": datetime.utcnow()}})
+
+        url = f"{request.url.scheme}://{request.client.host}:{request.url.port}/api/auth/verifyemail/{token.hex()}"
+        await Email(userEntity(new_user), url, [EmailStr(payload.email)]).sendVerificationCode()
+    except Exception as error:
+        User.find_one_and_update({"_id": result.inserted_id}, {
+            "$set": {"verification_code": None, "updated_at": datetime.utcnow()}})
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                            detail='There was an error sending email')
+    return {'status': 'success', 'message': 'Verification token successfully sent to your email'}
 
 
 @router.post('/login')
@@ -114,3 +133,19 @@ def logout(response: Response, Authorize: AuthJWT = Depends(), user_id: str = De
     response.set_cookie('logged_in', '', -1)
 
     return {'status': 'success'}
+
+
+@router.get('/verifyemail/{token}')
+def verify_me(token: str):
+    hashedCode = hashlib.sha256()
+    hashedCode.update(bytes.fromhex(token))
+    verification_code = hashedCode.hexdigest()
+    result = User.find_one_and_update({"verification_code": verification_code}, {
+        "$set": {"verification_code": None, "verified": True, "updated_at": datetime.utcnow()}}, new=True)
+    if not result:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail='Invalid verification code or account already verified')
+    return {
+        "status": "success",
+        "message": "Account verified successfully"
+    }

app/schemas.py

@@ -3,7 +3,6 @@
 
 
 class UserBaseSchema(BaseModel):
-    id: str | None = None
     name: str
     email: str
     photo: str
@@ -26,6 +25,11 @@ class LoginUserSchema(BaseModel):
     password: constr(min_length=8)
 
 
+class UserResponseSchema(UserBaseSchema):
+    id: str
+    pass
+
+
 class UserResponse(BaseModel):
     status: str
-    user: UserBaseSchema
+    user: UserResponseSchema