4 files changed, 15 insertions, 88 deletions

diff --git a/src/login/lgn_shim.erl b/src/login/lgn_shim.erl
deleted file mode 100644
index df35d97..0000000
--- a/src/login/lgn_shim.erl
+++ /dev/null
@@ -1,77 +0,0 @@
--module(lgn_shim).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate_random_player/4]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec add_ref_to_event
-   (
-      binary(),
-      binary(),
-      boolean(),
-      shr_player:type()
-   )
-   -> shr_player:type().
-add_ref_to_event (BattleID, EventName, IsPlayersTurn, Player) ->
-   Event =
-      shr_battle_summary:new(BattleID, EventName, <<"Never">>, IsPlayersTurn),
-
-   Result = shr_player:set_event_summaries([Event], Player),
-
-   Result.
-
--spec add_ref_to_map
-   (
-      binary(),
-      binary(),
-      shr_player:type()
-   )
-   -> shr_player:type().
-add_ref_to_map (MapID, EventName, Player) ->
-   MapRef = shr_map_summary:new(MapID, EventName),
-
-   Result = shr_player:set_map_summaries([MapRef], Player),
-
-   Result.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate_random_player
-   (
-      binary(),
-      binary(),
-      binary(),
-      binary()
-   )
-   -> shr_player:type().
-generate_random_player (ID, Username, Password, Email) ->
-   Result = shr_player:new(ID, Username, Password, Email),
-
-   S0Result =
-      case ID of
-         <<"0">> ->
-            S0 = add_ref_to_event(<<"0">>, <<"Test Battle">>, true, Result),
-            S1 = shr_player:set_roster_id(<<"0">>, S0),
-            S2 = add_ref_to_map(<<"0">>, <<"Test Map 0">>, S1),
-            S2;
-
-         <<"1">> ->
-            S0 = add_ref_to_event(<<"0">>, <<"Test Battle">>, false, Result),
-            S1 = shr_player:set_roster_id(<<"1">>, S0),
-            S2 = add_ref_to_map(<<"1">>, <<"Test Map 1">>, S1),
-
-            S2;
-
-         _ -> Result
-      end,
-
-   S0Result.
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index 6d4892d..c1db8f6 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -18,7 +18,7 @@
 (
    query_state,
    {
-      player_id :: binary(),
+      player_id :: shr_player:id(),
       player :: shr_player:type()
    }
 ).
@@ -122,8 +122,9 @@ commit_update (QueryState) ->
 -spec generate_reply(query_state()) -> binary().
 generate_reply (QueryState) ->
    Player = QueryState#query_state.player,
+   PlayerID = QueryState#query_state.player_id,
 
-   SetSession = lgn_set_session:generate(Player),
+   SetSession = lgn_set_session:generate(PlayerID, Player),
    Output = jiffy:encode([SetSession]),
 
    Output.
diff --git a/src/login/query/lgn_sign_up.erl b/src/login/query/lgn_sign_up.erl
index 0d974ff..2ab8ef3 100644
--- a/src/login/query/lgn_sign_up.erl
+++ b/src/login/query/lgn_sign_up.erl
@@ -19,7 +19,8 @@
 (
    query_state,
    {
-      player :: shr_player:type()
+      player :: shr_player:type(),
+      player_id :: shr_player:id()
    }
 ).
 
@@ -54,18 +55,21 @@ register_user (Input) ->
    Password = Input#input.password,
    Email = Input#input.email,
 
-   GeneratedPlayer = bnt_generate_player:attempt(Username, Password, Email),
+   {GeneratedPlayerID, GeneratedPlayer} =
+      bnt_generate_player:attempt(Username, Password, Email),
 
    #query_state
    {
-      player = GeneratedPlayer
+      player = GeneratedPlayer,
+      player_id = GeneratedPlayerID
    }.
 
 -spec generate_reply(query_state()) -> binary().
 generate_reply (QueryState) ->
    Player = QueryState#query_state.player,
+   PlayerID = QueryState#query_state.player_id,
 
-   SetSession = lgn_set_session:generate(Player),
+   SetSession = lgn_set_session:generate(PlayerID, Player),
    Output = jiffy:encode([SetSession]),
 
    Output.
diff --git a/src/login/reply/lgn_set_session.erl b/src/login/reply/lgn_set_session.erl
index f033d91..233f8db 100644
--- a/src/login/reply/lgn_set_session.erl
+++ b/src/login/reply/lgn_set_session.erl
@@ -7,7 +7,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([generate/2]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,15 +16,14 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (shr_player:type()) -> {list(any())}.
-generate (Player) ->
-   PID = shr_player:get_id(Player),
+-spec generate (shr_player:id(), shr_player:type()) -> {list(any())}.
+generate (PlayerID, Player) ->
    SessionToken = shr_player:get_token(Player),
 
    {
       [
          {<<"msg">>, <<"sse">>},
-         {<<"pid">>, PID},
+         {<<"pid">>, PlayerID},
          {<<"stk">>, SessionToken}
       ]
    }.