Spaces:

CaffeineCrew
/

Techdocs

Runtime error

App Files Files Community

mayureshagashe2105 commited on Oct 31, 2023

Commit

b60b60f

1 Parent(s): e2f0611

Update email client to yagmail

Browse files

Files changed (4) hide show

TechdocsAPI/backend/__init__.py +11 -0
TechdocsAPI/backend/services/auth/ops.py +9 -3
TechdocsAPI/backend/templates/email_verification.html +1 -68
TechdocsAPI/requirements.txt +1 -0

TechdocsAPI/backend/__init__.py CHANGED Viewed

@@ -13,6 +13,9 @@ from langchain.chains import LLMChain
 from langchain.prompts import PromptTemplate
 from fastapi_mail import ConnectionConfig, FastMail
 app = FastAPI(title="Techdocs",
               version="V0.0.1",
@@ -65,6 +68,14 @@ try:
     app.state.mail_client = FastMail(conf)
     app.state.templates = Jinja2Templates(directory="./backend/templates")
 except mysql.connector.Error as err:

 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",
     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/services/auth/ops.py CHANGED Viewed

@@ -47,8 +47,13 @@ async def ops_signup(bgtasks: BackgroundTasks, response_result: GeneralResponse,
         template_body=email_body_params,
         subtype=MessageType.html
     )
-    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")
     DBQueries.insert_to_database('auth', (data.username, Auth.get_password_hash(data.password), "", 0),
@@ -143,6 +148,7 @@ def ops_verify_email(request: Request, response_result: GeneralResponse, token:s
         payload = jwt.decode(
             token, config.JWT_VERIFICATION_SECRET_KEY, algorithms=[config.ALGORITHM]
         )
         token_data = TokenPayload(**payload)
         if datetime.fromtimestamp(token_data.exp)< datetime.now():
             return app.state.templates.TemplateResponse("verification_failure.html", context={"request": request})
@@ -155,7 +161,7 @@ def ops_verify_email(request: Request, response_result: GeneralResponse, token:s
         print(registered_email[0][0])
         if registered_email[0][0]:
             return app.state.templates.TemplateResponse("verification_failure.html", context={"request": request})
         DBQueries.update_data_in_database('auth','is_verified',f"username='{username}'", (True,))
         DBQueries.update_data_in_database('auth','email',f"username='{username}'", email)

         template_body=email_body_params,
         subtype=MessageType.html
     )
+     # username=adghasjd, verify_link=asdasd
+    # 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)
     # await app.state.mail_client.send_message(message=message, template_name="email_verification.html")
     DBQueries.insert_to_database('auth', (data.username, Auth.get_password_hash(data.password), "", 0),
         payload = jwt.decode(
             token, config.JWT_VERIFICATION_SECRET_KEY, algorithms=[config.ALGORITHM]
         )
         token_data = TokenPayload(**payload)
         if datetime.fromtimestamp(token_data.exp)< datetime.now():
             return app.state.templates.TemplateResponse("verification_failure.html", context={"request": request})
         print(registered_email[0][0])
         if registered_email[0][0]:
             return app.state.templates.TemplateResponse("verification_failure.html", context={"request": request})
+        print("after")
         DBQueries.update_data_in_database('auth','is_verified',f"username='{username}'", (True,))
         DBQueries.update_data_in_database('auth','email',f"username='{username}'", email)

TechdocsAPI/backend/templates/email_verification.html CHANGED Viewed

@@ -1,68 +1 @@
-<!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>


1	+ <!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 CHANGED Viewed

@@ -10,3 +10,4 @@ langchain
 clarifai
 Pillow
 fastapi_mail==1.3.1

 clarifai
 Pillow
 fastapi_mail==1.3.1
+yagmail