jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Use flags for email / registration correctly.

Browse Source
This commit is contained in:
Paul Makles
2020-08-30 17:48:30 +01:00
parent cbac802978
commit 7c374ec756
9 changed files with 105 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/routes/account.rs
View File

@@ -1,6 +1,7 @@
use super::Response;
use crate::database;
use crate::util::{captcha, email, gen_token};
use crate::util::variables::{DISABLE_REGISTRATION, USE_EMAIL};
use bcrypt::{hash, verify};
use chrono::prelude::*;
@@ -33,7 +34,7 @@ pub fn create(info: Json<Create>) -> Response {
return Response::BadRequest(json!({ "error": error }));
}
if true {
if *DISABLE_REGISTRATION {
return Response::BadRequest(json!({ "error": "Registration disabled." }));
}
@@ -73,30 +74,45 @@ pub fn create(info: Json<Create>) -> Response {
let access_token = gen_token(92);
let code = gen_token(48);
let email_verification = match *USE_EMAIL {
true => doc! {
"verified": false,
"target": info.email.clone(),
"expiry": Bson::DateTime(Utc::now() + chrono::Duration::days(1)),
"rate_limit": Bson::DateTime(Utc::now() + chrono::Duration::minutes(1)),
"code": code.clone(),
},
false => doc! {
"verified": true
}
};
let id = Ulid::new().to_string();
match col.insert_one(
doc! {
"_id": Ulid::new().to_string(),
"_id": &id,
"email": info.email.clone(),
"username": info.username.clone(),
"display_name": info.username.clone(),
"password": hashed,
"access_token": access_token,
"email_verification": {
"verified": false,
"target": info.email.clone(),
"expiry": Bson::DateTime(Utc::now() + chrono::Duration::days(1)),
"rate_limit": Bson::DateTime(Utc::now() + chrono::Duration::minutes(1)),
"code": code.clone(),
}
"access_token": &access_token,
"email_verification": email_verification
},
None,
) {
Ok(_) => {
let sent = email::send_verification_email(info.email.clone(), code);
if *USE_EMAIL {
let sent = email::send_verification_email(info.email.clone(), code);
Response::Success(json!({
"email_sent": sent,
}))
Response::Success(json!({
"email_sent": sent,
}))
} else {
Response::Success(json!({
"id": id,
"access_token": access_token
}))
}
}
Err(_) => {
Response::InternalServerError(json!({ "error": "Failed to create account." }))
@@ -147,8 +163,10 @@ pub fn verify_email(code: String) -> Response {
)
.expect("Failed to update user!");
if let Err(err) = email::send_welcome_email(target.to_string(), user.username) {
error!("Failed to send welcome email! {}", err);
if *USE_EMAIL {
if let Err(err) = email::send_welcome_email(target.to_string(), user.username) {
error!("Failed to send welcome email! {}", err);
}
}
Response::Redirect(super::Redirect::to("https://app.revolt.chat"))

11
src/routes/root.rs
View File

@@ -1,5 +1,5 @@
use super::Response;
use crate::util::variables::{USE_EMAIL_VERIFICATION, USE_HCAPTCHA};
use crate::util::variables::{USE_EMAIL, DISABLE_REGISTRATION, USE_HCAPTCHA};
use mongodb::bson::doc;
@@ -7,15 +7,16 @@ use mongodb::bson::doc;
#[get("/")]
pub fn root() -> Response {
Response::Success(json!({
"revolt": "0.2.9",
"revolt": "0.2.10",
"version": {
"major": 0,
"minor": 2,
"patch": 9
"patch": 10
},
"features": {
"email_verification": USE_EMAIL_VERIFICATION.clone(),
"captcha": USE_HCAPTCHA.clone(),
"registration": !*DISABLE_REGISTRATION,
"captcha": *USE_HCAPTCHA,
"email": *USE_EMAIL,
}
}))
}