summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/shr_security.erl4
-rw-r--r--src/shared/struct/shr_player.erl14
2 files changed, 11 insertions, 7 deletions
diff --git a/src/shared/shr_security.erl b/src/shared/shr_security.erl
index 740e948..f48ba92 100644
--- a/src/shared/shr_security.erl
+++ b/src/shared/shr_security.erl
@@ -25,9 +25,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-spec assert_identity (any(), any()) -> 'ok'.
assert_identity (PlayerID, SessionToken) ->
- Player = shr_timed_cache:fetch(player_db, any, PlayerID),
+ %Player = shr_timed_cache:fetch(player_db, any, PlayerID),
- true = (shr_player:get_token(Player) == SessionToken),
+ %true = (shr_player:get_token(Player) == SessionToken),
ok.
diff --git a/src/shared/struct/shr_player.erl b/src/shared/struct/shr_player.erl
index b036cb6..6364eb2 100644
--- a/src/shared/struct/shr_player.erl
+++ b/src/shared/struct/shr_player.erl
@@ -31,7 +31,7 @@
-export
(
[
- new/3
+ new/4
]
).
@@ -92,8 +92,8 @@ secure_value (Salt, Val) ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec new (binary(), binary(), binary()) -> type().
-new (ID, Username, Password) ->
+-spec new (binary(), binary(), binary(), binary()) -> type().
+new (ID, Username, Password, Email) ->
Result =
#player
{
@@ -101,7 +101,7 @@ new (ID, Username, Password) ->
username = Username,
password = {<<"">>, <<"">>},
token = <<"">>,
- email = <<"">>,
+ email = Email,
last_active = 0,
maps = [],
characters = []
@@ -152,7 +152,11 @@ set_password (Val, Player) ->
}.
-spec new_token (type()) -> type().
-new_token (Player) -> Player#player{ token = crypto:strong_rand_bytes(512) }.
+new_token (Player) ->
+ Player#player
+ {
+ token = base64:encode(crypto:strong_rand_bytes(512))
+ }.
-spec set_email (binary(), type()) -> type().
set_email (Val, Player) -> Player#player{ email = Val }.