Fix some warnings
parent
09dba21904
commit
fd0a363293
27
src/auth.rs
27
src/auth.rs
|
@ -5,13 +5,12 @@ use crate::user::*;
|
||||||
use rocket_contrib::json::{Json, JsonValue};
|
use rocket_contrib::json::{Json, JsonValue};
|
||||||
use random_string::generate;
|
use random_string::generate;
|
||||||
extern crate sha1;
|
extern crate sha1;
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
// Post request to register a user and pin
|
// Post request to register a user and pin
|
||||||
#[post("/register", format = "json", data = "<data>")]
|
#[post("/register", format = "json", data = "<data>")]
|
||||||
pub fn register(data: Json<RegisterEvent>) -> JsonValue {
|
pub fn register(data: Json<RegisterEvent>) -> JsonValue {
|
||||||
// check if the user exists
|
// check if the user exists
|
||||||
if let Some(user) = db_read_user(&data.name).ok().flatten() {
|
if let Some(_user) = db_read_user(&data.name).ok().flatten() {
|
||||||
warn!("Cannot create user {}! User is already in system.", data.name);
|
warn!("Cannot create user {}! User is already in system.", data.name);
|
||||||
return json!({
|
return json!({
|
||||||
"status": "fail",
|
"status": "fail",
|
||||||
|
@ -196,9 +195,6 @@ pub fn login(data: Json<LoginEvent>, mut cookies: Cookies) -> JsonValue {
|
||||||
// Change info about a user
|
// Change info about a user
|
||||||
#[post("/change", format = "json", data = "<input>")]
|
#[post("/change", format = "json", data = "<input>")]
|
||||||
pub fn change_info(input: Json<ChangeEvent>, mut cookies: Cookies) -> JsonValue {
|
pub fn change_info(input: Json<ChangeEvent>, mut cookies: Cookies) -> JsonValue {
|
||||||
// read in the users & hash the pin
|
|
||||||
let mut users: Vec<User> = db_read();
|
|
||||||
|
|
||||||
// get token from cookie
|
// get token from cookie
|
||||||
let token = match cookies.get_private("token") {
|
let token = match cookies.get_private("token") {
|
||||||
None => {
|
None => {
|
||||||
|
@ -270,33 +266,24 @@ pub fn change_info(input: Json<ChangeEvent>, mut cookies: Cookies) -> JsonValue
|
||||||
"reason": "user doesn't exist",
|
"reason": "user doesn't exist",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return json!({
|
|
||||||
"status": "fail",
|
|
||||||
"reason": "idk",
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/users/<name>")]
|
#[get("/users/<name>")]
|
||||||
pub fn get_user(name: String) -> JsonValue {
|
pub fn get_user(name: String) -> JsonValue {
|
||||||
let users: Vec<User> = db_read();
|
if let Some(user) = db_read_user(&name.to_lowercase()).ok().flatten() {
|
||||||
let found_user = users
|
return json!({
|
||||||
.iter()
|
|
||||||
.filter(|u| u.name == name.to_lowercase())
|
|
||||||
.next();
|
|
||||||
|
|
||||||
match found_user {
|
|
||||||
Some(user) => json!({
|
|
||||||
"status":"ok",
|
"status":"ok",
|
||||||
"user": {
|
"user": {
|
||||||
"name": user.name,
|
"name": user.name,
|
||||||
"pronouns": user.pronouns,
|
"pronouns": user.pronouns,
|
||||||
"role": user.role,
|
"role": user.role,
|
||||||
},
|
},
|
||||||
}),
|
});
|
||||||
None => json!({
|
} else {
|
||||||
|
return json!({
|
||||||
"status": "fail",
|
"status": "fail",
|
||||||
"reason": format!("user {} not found", name),
|
"reason": format!("user {} not found", name),
|
||||||
}),
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ pub fn fetch_messages() -> Json<Vec<Message>> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create full message object and write to file
|
// Create full message object and write to file
|
||||||
fn create_message(message: Json<MessageInput>, file: &str, user: &User) -> JsonValue {
|
fn create_message(message: Json<MessageInput>, user: &User) -> JsonValue {
|
||||||
let event_type = match message.body.chars().nth(0).unwrap() {
|
let event_type = match message.body.chars().nth(0).unwrap() {
|
||||||
'/' => MessageType::Command,
|
'/' => MessageType::Command,
|
||||||
':' => MessageType::Emote,
|
':' => MessageType::Emote,
|
||||||
|
@ -64,7 +64,7 @@ fn check_token(token: Cookie, message: Json<MessageInput<'_>>) -> JsonValue {
|
||||||
});
|
});
|
||||||
} else if i.session_token == token.value() { // if token matches
|
} else if i.session_token == token.value() { // if token matches
|
||||||
info!("user exists and given token matches");
|
info!("user exists and given token matches");
|
||||||
return create_message(message, "messages.json", i);
|
return create_message(message, i);
|
||||||
} else {
|
} else {
|
||||||
warn!("token does not match!");
|
warn!("token does not match!");
|
||||||
return json!({
|
return json!({
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
use crate::user::User;
|
|
||||||
use chrono::prelude::*;
|
use chrono::prelude::*;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
Loading…
Reference in New Issue