summaryrefslogtreecommitdiff |
diff options
-rw-r--r-- | src/login/lgn_handler.erl | 27 | ||||
-rw-r--r-- | src/login/query/lgn_sign_in.erl | 2 | ||||
-rw-r--r-- | src/login/query/lgn_sign_up.erl | 15 |
3 files changed, 17 insertions, 27 deletions
diff --git a/src/login/lgn_handler.erl b/src/login/lgn_handler.erl index fe87bc6..d2a6ee2 100644 --- a/src/login/lgn_handler.erl +++ b/src/login/lgn_handler.erl @@ -27,30 +27,17 @@ ensure_player_exists (ID, Username, Password, Email) -> ) end, - case shr_database:fetch(login_db, Username, admin) of + UsernameLC = string:lowercase(Username), + EmailLC = string:lowercase(Email), + + case shr_database:fetch(login_db, UsernameLC, admin) of {ok, _} -> ok; - not_found -> - shr_database:insert_at - ( - login_db, - Username, - any, - any, - ID - ) + not_found -> shr_database:insert_at(login_db, UsernameLC, any, any, ID) end, - case shr_database:fetch(login_db, Email, admin) of + case shr_database:fetch(login_db, EmailLC, admin) of {ok, _} -> ok; - not_found -> - shr_database:insert_at - ( - login_db, - Email, - any, - any, - ID - ) + not_found -> shr_database:insert_at(login_db, EmailLC, any, any, ID) end, ok. diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl index 1ded595..0dee17a 100644 --- a/src/login/query/lgn_sign_in.erl +++ b/src/login/query/lgn_sign_in.erl @@ -42,7 +42,7 @@ parse_input (Req) -> #input { - username = Username, + username = string:lowercase(Username), password = Password }. diff --git a/src/login/query/lgn_sign_up.erl b/src/login/query/lgn_sign_up.erl index ce35557..6a2b3d5 100644 --- a/src/login/query/lgn_sign_up.erl +++ b/src/login/query/lgn_sign_up.erl @@ -54,11 +54,14 @@ register_user (Input) -> Password = Input#input.password, Email = Input#input.email, - shr_janitor:new(login_db, Username), - shr_janitor:new(login_db, Email), + UsernameLC = string:lowercase(Username), + EmailLC = string:lowercase(Email), - ok = shr_database:reserve(login_db, Username, janitor), - ok = shr_database:reserve(login_db, Email, janitor), + shr_janitor:new(login_db, UsernameLC), + shr_janitor:new(login_db, EmailLC), + + ok = shr_database:reserve(login_db, UsernameLC, janitor), + ok = shr_database:reserve(login_db, EmailLC, janitor), Player = shr_player:new(<<"">>, Username, Password, Email), @@ -83,13 +86,13 @@ register_user (Input) -> ok = shr_database:commit ( - shr_db_query:new(login_db, Username, janitor, LoginUpdateQueryOps) + shr_db_query:new(login_db, UsernameLC, janitor, LoginUpdateQueryOps) ), ok = shr_database:commit ( - shr_db_query:new(login_db, Email, janitor, LoginUpdateQueryOps) + shr_db_query:new(login_db, EmailLC, janitor, LoginUpdateQueryOps) ), ok = |