Formatted everything with black
This commit is contained in:
@@ -1,6 +1,17 @@
|
||||
from datetime import datetime, timedelta
|
||||
from classes.exceptions import UserAlreadyExists, UserCredentialsInvalid, UserEmailCodeInvalid
|
||||
from modules.database import col_users, col_albums, col_photos, col_emails, col_videos, col_emails
|
||||
from classes.exceptions import (
|
||||
UserAlreadyExists,
|
||||
UserCredentialsInvalid,
|
||||
UserEmailCodeInvalid,
|
||||
)
|
||||
from modules.database import (
|
||||
col_users,
|
||||
col_albums,
|
||||
col_photos,
|
||||
col_emails,
|
||||
col_videos,
|
||||
col_emails,
|
||||
)
|
||||
from modules.app import app
|
||||
from modules.utils import configGet, logWrite
|
||||
from modules.scheduler import scheduler
|
||||
@@ -16,7 +27,7 @@ from modules.security import (
|
||||
get_current_active_user,
|
||||
get_password_hash,
|
||||
get_user,
|
||||
verify_password
|
||||
verify_password,
|
||||
)
|
||||
|
||||
|
||||
@@ -26,9 +37,17 @@ async def send_confirmation(user: str, email: str):
|
||||
mail_sender.sendmail(
|
||||
from_addr=configGet("sender", "mailer", "smtp"),
|
||||
to_addrs=email,
|
||||
msg=f'From: {configGet("sender", "mailer", "smtp")}\nSubject: Email confirmation\n\n'+configGet("message", "mailer", "messages", "registration_confirmation").format(configGet("external_address")+f"/users/{user}/confirm?code={confirmation_code}")
|
||||
msg=f'From: {configGet("sender", "mailer", "smtp")}\nSubject: Email confirmation\n\n'
|
||||
+ configGet(
|
||||
"message", "mailer", "messages", "registration_confirmation"
|
||||
).format(
|
||||
configGet("external_address")
|
||||
+ f"/users/{user}/confirm?code={confirmation_code}"
|
||||
),
|
||||
)
|
||||
col_emails.insert_one(
|
||||
{"user": user, "email": email, "used": False, "code": confirmation_code}
|
||||
)
|
||||
col_emails.insert_one( {"user": user, "email": email, "used": False, "code": confirmation_code} )
|
||||
logWrite(f"Sent confirmation email to '{email}' with code {confirmation_code}")
|
||||
except Exception as exp:
|
||||
logWrite(f"Could not send confirmation email to '{email}' due to: {exp}")
|
||||
@@ -44,51 +63,85 @@ user_confirm_responses = {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"example": {
|
||||
"detail": configGet("email_confirmed", "messages")
|
||||
}
|
||||
"example": {"detail": configGet("email_confirmed", "messages")}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
400: UserEmailCodeInvalid().openapi
|
||||
400: UserEmailCodeInvalid().openapi,
|
||||
}
|
||||
if configGet("registration_requires_confirmation") is True:
|
||||
@app.get("/users/{user}/confirm", response_class=UJSONResponse, responses=user_confirm_responses)
|
||||
@app.patch("/users/{user}/confirm", response_class=UJSONResponse, responses=user_confirm_responses)
|
||||
|
||||
@app.get(
|
||||
"/users/{user}/confirm",
|
||||
response_class=UJSONResponse,
|
||||
responses=user_confirm_responses,
|
||||
)
|
||||
@app.patch(
|
||||
"/users/{user}/confirm",
|
||||
response_class=UJSONResponse,
|
||||
responses=user_confirm_responses,
|
||||
)
|
||||
async def user_confirm(user: str, code: str):
|
||||
confirm_record = col_emails.find_one( {"user": user, "code": code, "used": False} )
|
||||
confirm_record = col_emails.find_one(
|
||||
{"user": user, "code": code, "used": False}
|
||||
)
|
||||
if confirm_record is None:
|
||||
raise UserEmailCodeInvalid()
|
||||
col_emails.find_one_and_update( {"_id": confirm_record["_id"]}, {"$set": {"used": True}} )
|
||||
col_users.find_one_and_update( {"user": confirm_record["user"]}, {"$set": {"disabled": False}} )
|
||||
return UJSONResponse( {"detail": configGet("email_confirmed", "messages")} )
|
||||
col_emails.find_one_and_update(
|
||||
{"_id": confirm_record["_id"]}, {"$set": {"used": True}}
|
||||
)
|
||||
col_users.find_one_and_update(
|
||||
{"user": confirm_record["user"]}, {"$set": {"disabled": False}}
|
||||
)
|
||||
return UJSONResponse({"detail": configGet("email_confirmed", "messages")})
|
||||
|
||||
user_create_responses = {
|
||||
409: UserAlreadyExists().openapi
|
||||
}
|
||||
|
||||
user_create_responses = {409: UserAlreadyExists().openapi}
|
||||
if configGet("registration_enabled") is True:
|
||||
@app.post("/users", status_code=HTTP_204_NO_CONTENT, responses=user_create_responses)
|
||||
async def user_create(user: str = Form(), email: str = Form(), password: str = Form()):
|
||||
if col_users.find_one( {"user": user} ) is not None:
|
||||
|
||||
@app.post(
|
||||
"/users", status_code=HTTP_204_NO_CONTENT, responses=user_create_responses
|
||||
)
|
||||
async def user_create(
|
||||
user: str = Form(), email: str = Form(), password: str = Form()
|
||||
):
|
||||
if col_users.find_one({"user": user}) is not None:
|
||||
raise UserAlreadyExists()
|
||||
col_users.insert_one( {"user": user, "email": email, "hash": get_password_hash(password), "disabled": configGet("registration_requires_confirmation")} )
|
||||
col_users.insert_one(
|
||||
{
|
||||
"user": user,
|
||||
"email": email,
|
||||
"hash": get_password_hash(password),
|
||||
"disabled": configGet("registration_requires_confirmation"),
|
||||
}
|
||||
)
|
||||
if configGet("registration_requires_confirmation") is True:
|
||||
scheduler.add_job( send_confirmation, trigger="date", run_date=datetime.now()+timedelta(seconds=1), kwargs={"user": user, "email": email} )
|
||||
scheduler.add_job(
|
||||
send_confirmation,
|
||||
trigger="date",
|
||||
run_date=datetime.now() + timedelta(seconds=1),
|
||||
kwargs={"user": user, "email": email},
|
||||
)
|
||||
return Response(status_code=HTTP_204_NO_CONTENT)
|
||||
|
||||
user_delete_responses = {
|
||||
401: UserCredentialsInvalid().openapi
|
||||
}
|
||||
@app.delete("/users/me/", status_code=HTTP_204_NO_CONTENT, responses=user_delete_responses)
|
||||
async def user_delete(password: str = Form(), current_user: User = Depends(get_current_active_user)):
|
||||
|
||||
user_delete_responses = {401: UserCredentialsInvalid().openapi}
|
||||
|
||||
|
||||
@app.delete(
|
||||
"/users/me/", status_code=HTTP_204_NO_CONTENT, responses=user_delete_responses
|
||||
)
|
||||
async def user_delete(
|
||||
password: str = Form(), current_user: User = Depends(get_current_active_user)
|
||||
):
|
||||
user = get_user(current_user.user)
|
||||
if not user:
|
||||
return False
|
||||
if not verify_password(password, user.hash):
|
||||
raise UserCredentialsInvalid()
|
||||
col_users.delete_many( {"user": current_user.user} )
|
||||
col_emails.delete_many( {"user": current_user.user} )
|
||||
col_photos.delete_many( {"user": current_user.user} )
|
||||
col_videos.delete_many( {"user": current_user.user} )
|
||||
col_albums.delete_many( {"user": current_user.user} )
|
||||
return Response(status_code=HTTP_204_NO_CONTENT)
|
||||
col_users.delete_many({"user": current_user.user})
|
||||
col_emails.delete_many({"user": current_user.user})
|
||||
col_photos.delete_many({"user": current_user.user})
|
||||
col_videos.delete_many({"user": current_user.user})
|
||||
col_albums.delete_many({"user": current_user.user})
|
||||
return Response(status_code=HTTP_204_NO_CONTENT)
|
||||
|
Reference in New Issue
Block a user