clean code
This commit is contained in:
parent
5ec03d06c2
commit
ee626ccd61
24 changed files with 99 additions and 894 deletions
20
src/user.ml
20
src/user.ml
|
|
@ -107,8 +107,8 @@ let login ~login ~password request =
|
|||
let* nick = get_nick user_id in
|
||||
let _unit_lwt = Dream.put_session "nick" nick request in
|
||||
Ok ()
|
||||
else if is_banished login then Error "YOU ARE BANISHED"
|
||||
else Error "wrong password"
|
||||
else if is_banished login then Error (`Forbidden, "YOU ARE BANISHED")
|
||||
else Error (`Forbidden, "wrong password")
|
||||
in
|
||||
|
||||
let id_from_nick = get_id_from_nick login in
|
||||
|
|
@ -120,7 +120,7 @@ let login ~login ~password request =
|
|||
List.iter
|
||||
(fun id -> if Result.is_ok @@ try_password id then raise Exit)
|
||||
user_id_list;
|
||||
Error "invalid login"
|
||||
Error (`Forbidden, "invalid login")
|
||||
with Exit -> Ok ()
|
||||
|
||||
let valid_nick nick =
|
||||
|
|
@ -141,13 +141,13 @@ let register ~email ~nick ~password =
|
|||
let password = Bcrypt.hash password in
|
||||
let password = Bcrypt.string_of_hash password in
|
||||
|
||||
if not valid then Error "Something is wrong"
|
||||
if not valid then Error (`Bad_Request, "invalid nick, email or password")
|
||||
else
|
||||
let* nb = Q.is_already_user (nick, email) in
|
||||
if nb = 0 then
|
||||
let user_id = Uuidm.to_string (Uuidm.v4_gen App.random_state ()) in
|
||||
Q.upload_user (user_id, nick, password, email)
|
||||
else Error "nick or email already exists"
|
||||
else Error (`Conflict, "nick or email already exists")
|
||||
|
||||
let list () =
|
||||
let* users = Q.list_nicks () in
|
||||
|
|
@ -174,20 +174,20 @@ let delete_user user_id = Q.delete_user user_id
|
|||
let update_nick nick user_id =
|
||||
if valid_nick nick then
|
||||
if not (exist_nick nick) then Q.update_nick (nick, user_id)
|
||||
else Error "nick already taken"
|
||||
else Error "invalid nick"
|
||||
else Error (`Conflict, "nick already taken")
|
||||
else Error (`Bad_Request, "invalid nick")
|
||||
|
||||
let update_email email user_id =
|
||||
if valid_email email then
|
||||
if not (exist_email email) then Q.update_email (email, user_id)
|
||||
else Error "email already taken"
|
||||
else Error "invalid email"
|
||||
else Error (`Conflict, "email already taken")
|
||||
else Error (`Bad_Request, "invalid email")
|
||||
|
||||
let update_password password user_id =
|
||||
if valid_password password then
|
||||
let password = Bcrypt.hash password |> Bcrypt.string_of_hash in
|
||||
Q.update_password (password, user_id)
|
||||
else Error "invalid password"
|
||||
else Error (`Bad_Request, "invalid password")
|
||||
|
||||
let public_profile user_id =
|
||||
let* user = get_user user_id in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue