From 41f0db023cb6c1a609762b9679b3677143b3840f Mon Sep 17 00:00:00 2001 From: nsensfel Date: Wed, 23 Jan 2019 19:12:52 +0100 Subject: Isolates Yaws from the code base. --- src/login/query/lgn_sign_in.erl | 16 +++++++--------- src/login/query/lgn_sign_up.erl | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) (limited to 'src/login') diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl index c1db8f6..83d2e5f 100644 --- a/src/login/query/lgn_sign_in.erl +++ b/src/login/query/lgn_sign_in.erl @@ -3,8 +3,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). - -record ( input, @@ -34,9 +32,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec parse_input (binary()) -> input(). -parse_input (Req) -> - JSONReqMap = jiffy:decode(Req, [return_maps]), +-spec parse_input (shr_query:type()) -> input(). +parse_input (Query) -> + JSONReqMap = shr_query:get_params(Query), Username = maps:get(<<"usr">>, JSONReqMap), Password = maps:get(<<"pwd">>, JSONReqMap), @@ -129,9 +127,9 @@ generate_reply (QueryState) -> Output. --spec handle (binary()) -> binary(). -handle (Req) -> - Input = parse_input(Req), +-spec handle (shr_query:type()) -> binary(). +handle (Query) -> + Input = parse_input(Query), QueryState = fetch_data(Input), Update = update_data(QueryState, Input), commit_update(Update), @@ -144,5 +142,5 @@ out(A) -> { content, "application/json; charset=UTF-8", - handle(A#arg.clidata) + handle(shr_query:new(A)) }. diff --git a/src/login/query/lgn_sign_up.erl b/src/login/query/lgn_sign_up.erl index 2ab8ef3..5fdb27f 100644 --- a/src/login/query/lgn_sign_up.erl +++ b/src/login/query/lgn_sign_up.erl @@ -3,8 +3,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). - -record ( input, @@ -35,9 +33,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec parse_input (binary()) -> input(). -parse_input (Req) -> - JSONReqMap = jiffy:decode(Req, [return_maps]), +-spec parse_input (shr_query:type()) -> input(). +parse_input (Query) -> + JSONReqMap = shr_query:get_params(Query), Username = maps:get(<<"usr">>, JSONReqMap), Password = maps:get(<<"pwd">>, JSONReqMap), Email = maps:get(<<"eml">>, JSONReqMap), @@ -74,9 +72,9 @@ generate_reply (QueryState) -> Output. --spec handle (binary()) -> binary(). -handle (Req) -> - Input = parse_input(Req), +-spec handle (shr_query:type()) -> binary(). +handle (Query) -> + Input = parse_input(Query), %% TODO [SECURITY][LOW]: validate input size. QueryState = register_user(Input), generate_reply(QueryState). @@ -88,5 +86,5 @@ out(A) -> { content, "application/json; charset=UTF-8", - handle(A#arg.clidata) + handle(shr_query:new(A)) }. -- cgit v1.2.3-70-g09d2