Add email microservice

TechdocsAPI/backend/__init__.py

@@ -12,11 +12,6 @@ from langchain.llms import Clarifai
 from langchain.chains import LLMChain
 from langchain.prompts import PromptTemplate 
 
-from fastapi_mail import ConnectionConfig, FastMail
-import yagmail
-from jinja2 import Environment, FileSystemLoader
-import os
-
 app = FastAPI(title="Techdocs",
               version="V0.0.1",
               description="API for automatic code documentation generation!"
@@ -49,33 +44,8 @@ try:
     app.state.llmchain = llmchain
 
 
-    conf = ConnectionConfig(
-        MAIL_USERNAME=config.MAIL_USERNAME,
-        MAIL_PASSWORD=config.MAIL_PASSWORD,
-        MAIL_FROM=config.MAIL_FROM,
-        MAIL_PORT=8080,
-        MAIL_SERVER="smtp.gmail.com",
-        MAIL_STARTTLS=False,
-        MAIL_SSL_TLS=True,
-        TEMPLATE_FOLDER="backend/templates",
-        USE_CREDENTIALS = True,
-        VALIDATE_CERTS = True
-        
-        # MAIL_TLS=True,
-        # MAIL_SSL=False
-    )
-
-    app.state.mail_client = FastMail(conf)
     app.state.templates = Jinja2Templates(directory="./backend/templates")
 
-    #testing yagmail
-    yag = yagmail.SMTP(config.MAIL_USERNAME, config.MAIL_PASSWORD)
-    app.state.yagmail = yag
-    env = Environment(
-    loader=FileSystemLoader('./backend/templates/'))
-    app.state.jinjaenv = env
-
-
 
 
 except mysql.connector.Error as err:

TechdocsAPI/backend/core/ConfigEnv.py

@@ -21,9 +21,7 @@ class Settings(BaseSettings):
     CLARIFAI_PAT:str
     MODEL_VERSION_ID:str
 
-    MAIL_USERNAME:str
-    MAIL_PASSWORD:str
-    MAIL_FROM:str
+    MAIL_SERVER_URL:str
     
     class Config:
         env_file = ".env"

TechdocsAPI/backend/core/ExceptionHandlers.py

@@ -19,6 +19,12 @@ async def email_not_verified(request: Request, exec: EmailNotVerifiedException):
                         content=repr(exec)
                         )
 
+@app.exception_handler(EmailNotSentException)
+async def email_not_sent(request: Request, exec: EmailNotSentException):
+    return JSONResponse(status_code=status.HTTP_403_FORBIDDEN,
+                        content=repr(exec)
+                        )
+
 @app.exception_handler(InvalidCredentialsException)
 async def handle_login_failed(request: Request, exec: InvalidCredentialsException):
     return JSONResponse(status_code=status.HTTP_403_FORBIDDEN,

TechdocsAPI/backend/core/Exceptions.py

@@ -54,4 +54,16 @@ class EmailNotVerifiedException(Exception):
         self.status = 'EmailNotVerifiedException'
 
     def __repr__(self):
-        return "exception.EmailNotVerifiedException()"
+        return "exception.EmailNotVerifiedException()"
+
+
+class EmailNotSentException(Exception):
+    def __init__(self):
+        self.set_statuses()
+        super(EmailNotSentException, self).__init__()
+
+    def set_statuses(self):
+        self.status = 'EmailNotSentException'
+
+    def __repr__(self):
+        return "exception.EmailNotSentException()"

TechdocsAPI/backend/services/auth/__init__.py

@@ -1,2 +1,3 @@
 from .ops import *
-from .utils.JWTBearer import *
+from .utils.JWTBearer import *
+from .utils.functools import *

TechdocsAPI/backend/services/auth/ops.py

@@ -1,4 +1,5 @@
 from .utils.auth_funcs import *
+from .utils.functools import *
 from .utils.JWTBearer import *
 from backend.models import *
 from backend.services.db.utils.DBQueries import DBQueries
@@ -11,11 +12,6 @@ from fastapi import HTTPException, BackgroundTasks
 from pydantic import ValidationError
 from jose import jwt
 
-from fastapi_mail import MessageSchema, MessageType
-
-# import openai
-# from transformers import RobertaTokenizer, T5ForConditionalGeneration
-
 async def ops_signup(bgtasks: BackgroundTasks, response_result: GeneralResponse, data: UserAuth):
     """Wrapper method to handle signup process.
 
@@ -41,30 +37,26 @@ async def ops_signup(bgtasks: BackgroundTasks, response_result: GeneralResponse,
         "verify_link": verification_link
     }
 
-    message = MessageSchema(
-        subject="Welcome to Techdocs:[Account Verification]",
-        recipients=[data.email],  # List of recipients, as many as you can pass
-        template_body=email_body_params,
-        subtype=MessageType.html
-    )
-
-    # template = app.state.jinjaenv.get_template("email_verification.html")
-    # output = template.render(data=email_body_params)
-    # email = "Hi {username} 👋\n\nWelcome to Techdocs! Please click on the link below to verify your account.\n\n<a href='{verify_link}'>Click Here</a>\n\nThanks,\nTechdocs Team".format(**email_body_params)
-    # bgtasks.add_task(app.state.mail_client.send_message, message=message, template_name="email_verification.html")
-    # bgtasks.add_task(app.state.yagmail.send, to=data.email, subject="Welcome to Techdocs:[Account Verification]",
-    #                  contents=email)
-
-    # bgtasks.add_task(app.state.mail_client.send_message, message=message, template_name="email_verification.html")
-    # await app.state.mail_client.send_message(message=message, template_name="email_verification.html")
+    details = {
+        "recipient": [data.email],
+        "subject": "Welcome to Techdocs:[Account Verification]",
+        "template_name": "email_verification.html",
+        "template_kwargs": email_body_params
+    }
+
+    status = post_request(url=config.MAIL_SERVER_URL, data=details, headers=None)
+    if status != 200:
+        raise EmailNotSentException()
+
+
     
-    DBQueries.insert_to_database('auth', (data.username, Auth.get_password_hash(data.password), data.email, 1), 
+    DBQueries.insert_to_database('auth', (data.username, Auth.get_password_hash(data.password), "", 0), 
                                  ['username', 'password', 'email', 'is_verified'])
     
     
     
     response_result.status = 'success'
-    # response_result.message = [f'Activate your account by clicking on the link sent to {data.email}.\nMake sure to check your spam folder.']
+    response_result.message = [f'Activate your account by clicking on the link sent to {data.email}.\nMake sure to check your spam folder.']
 
 def ops_login(data:LoginCreds):
     """Wrapper method to handle login process.
@@ -93,8 +85,8 @@ def ops_login(data:LoginCreds):
         # password is incorrect
         raise InvalidCredentialsException(response_result)
     
-    # if not user[2]:
-    #     raise EmailNotVerifiedException()
+    if not user[2]:
+        raise EmailNotVerifiedException()
     
     # password is correct
     return TokenSchema(access_token=Auth.create_access_token(data.username), 

TechdocsAPI/backend/services/auth/utils/functools.py

@@ -0,0 +1,9 @@
+import requests
+from typing import Any, Dict
+import json
+
+def post_request(url: str, data: Dict[str, Any], headers: Dict[str, str]=None):
+    json_data = json.dumps(data)
+    headers = headers or {'Content-type': 'application/json', 'Accept': 'application/json'}
+    response = requests.post(url, data=data, headers=headers)
+    return response.status_code

TechdocsAPI/backend/templates/email_verification.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html><head><title>Verify Email</title><style>body { font-family: Arial, sans-serif;background-color: #f4f4f4;margin: 0;padding: 0; } .container { width: 80%;    margin: 0 auto; padding: 20px; background-color: #fff; border-radius: 8px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); } h3 { color: #333; text-align: center; } p { color: #555; text-align: center; margin-bottom: 20px; } a.button { display: block; width: 50%; margin: 20px auto; padding: 12px; border-radius: 5px; text-align: center; text-decoration: none; background-color: #0275d8; color: #fff; font-size: 1rem; transition: background-color 0.3s; } a.button:hover { background-color: #025aa5; } .disclaimer { color: #777; text-align: center; } </style> </head> <body> <div class="container"> <h3>Account Verification</h3> <p>Hi, {{username}}👋. Thank you for registering with Techdocs. Please click the button below to verify your account:</p> <a class="button" href="{{verify_link}}" target="_blank">Verify your email</a> <p class="disclaimer">Please disregard this email if you did not register with Techdocs. Thank you.</p> </div> </body> </html>

TechdocsAPI/requirements.txt

@@ -9,5 +9,3 @@ pydantic[email]
 langchain
 clarifai
 Pillow
-fastapi_mail==1.3.1
-yagmail