From cbae439196de8382d5218f11e7a3afd812a5ae52 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Fri, 10 Aug 2018 10:20:09 +0200 Subject: Got login to work. --- src/player/plr_handler.erl | 40 ----------- src/player/plr_shim.erl | 23 ------ src/player/query/plr_sign_in.erl | 131 ----------------------------------- src/player/reply/plr_set_session.erl | 30 -------- 4 files changed, 224 deletions(-) delete mode 100644 src/player/plr_handler.erl delete mode 100644 src/player/plr_shim.erl delete mode 100644 src/player/query/plr_sign_in.erl delete mode 100644 src/player/reply/plr_set_session.erl (limited to 'src/player') diff --git a/src/player/plr_handler.erl b/src/player/plr_handler.erl deleted file mode 100644 index e1cabe3..0000000 --- a/src/player/plr_handler.erl +++ /dev/null @@ -1,40 +0,0 @@ --module(plr_handler). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --export([start/1]). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec ensure_player_exists (binary()) -> 'ok'. -ensure_player_exists (ID) -> - case shr_database:fetch(player_db, ID, admin) of - {ok, _} -> ok; - not_found -> - shr_database:insert - ( - player_db, - ID, - any, - any, - plr_shim:generate_random_player(ID) - ) - end, - - ok. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec start (pid()) -> 'ok'. -start (TimedCachesManagerPid) -> - ensure_player_exists(<<"0">>), - ensure_player_exists(<<"1">>), - shr_timed_caches_manager:new_cache(TimedCachesManagerPid, player_db, none), - ok. diff --git a/src/player/plr_shim.erl b/src/player/plr_shim.erl deleted file mode 100644 index c5da825..0000000 --- a/src/player/plr_shim.erl +++ /dev/null @@ -1,23 +0,0 @@ --module(plr_shim). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --export([generate_random_player/1]). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec generate_random_player (binary()) -> shr_player:type(). -generate_random_player (ID) -> - Result = shr_player:new(ID, ID, <<"kalimero">>), - - Result. diff --git a/src/player/query/plr_sign_in.erl b/src/player/query/plr_sign_in.erl deleted file mode 100644 index e872a55..0000000 --- a/src/player/query/plr_sign_in.erl +++ /dev/null @@ -1,131 +0,0 @@ --module(plr_sign_in). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). - --record -( - input, - { - username :: binary(), - password :: binary() - } -). - --record -( - query_state, - { - player :: shr_player:type() - } -). - --type input() :: #input{}. --type query_state() :: #query_state{}. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --export([out/1]). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec parse_input (binary()) -> input(). -parse_input (Req) -> - JSONReqMap = jiffy:decode(Req, [return_maps]), - Username = maps:get(<<"usr">>, JSONReqMap), - Password = maps:get(<<"pwd">>, JSONReqMap), - - #input - { - username = Username, - password = Password - }. - --spec fetch_data (input()) -> query_state(). -fetch_data (Input) -> - PlayerID = Input#input.username, - - Player = shr_timed_cache:fetch(player_db, any, PlayerID), - - #query_state - { - player = Player - }. - --spec update_data (query_state(), input()) -> query_state(). -update_data (QueryState, Input) -> - InputPassword = Input#input.password, - Player = QueryState#query_state.player, - - true = (shr_player:password_is(InputPassword, Player)), - - S0Player = shr_player:new_token(Player), - S1Player = shr_player:refresh_active(S0Player), - - QueryState#query_state - { - player = S1Player - }. - --spec commit_update (query_state(), input()) -> 'ok'. -commit_update (QueryState, Input) -> - PlayerID = Input#input.username, - UpdatedPlayer = QueryState#query_state.player, - NewToken = shr_player:get_token(UpdatedPlayer), - NewActiveTime = shr_player:get_last_active(UpdatedPlayer), - - Query = - shr_db_query:new - ( - player_db, - PlayerID, - {user, PlayerID}, - [ - shr_db_query:set_field - ( - shr_player:get_token_field(), - NewToken - ), - shr_db_query:set_field - ( - shr_player:get_last_active_field(), - NewActiveTime - ) - ] - ), - - shr_database:commit(Query), - shr_timed_cache:update(player_db, PlayerID, PlayerID, UpdatedPlayer), - - 'ok'. - --spec generate_reply(query_state()) -> binary(). -generate_reply (QueryState) -> - Player = QueryState#query_state.player, - - SetSession = plr_set_session:generate(Player), - Output = jiffy:encode([SetSession]), - - Output. - --spec handle (binary()) -> binary(). -handle (Req) -> - Input = parse_input(Req), - QueryState = fetch_data(Input), - Update = update_data(QueryState, Input), - commit_update(Update, Input), - generate_reply(QueryState). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -out(A) -> - { - content, - "application/json; charset=UTF-8", - handle(A#arg.clidata) - }. diff --git a/src/player/reply/plr_set_session.erl b/src/player/reply/plr_set_session.erl deleted file mode 100644 index 8b38fd7..0000000 --- a/src/player/reply/plr_set_session.erl +++ /dev/null @@ -1,30 +0,0 @@ --module(plr_set_session). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --export([generate/1]). - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec generate (shr_player:type()) -> {list(any())}. -generate (Player) -> - PID = shr_player:get_id(Player), - SessionToken = shr_player:get_token(Player), - - { - [ - {<<"msg">>, <<"sse">>}, - {<<"pid">>, PID}, - {<<"stk">>, SessionToken} - ] - }. -- cgit v1.2.3-70-g09d2