Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert egs_accounts from a gen_server to a functions module.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-12 17:19:39 +01:00
parent bd4a296b0a
commit 4171f2eba4
2 changed files with 16 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/egs_accounts.erl
View File

@ -18,51 +18,18 @@
%% along with EGS. If not, see <http://www.gnu.org/licenses/>.
-module(egs_accounts).
-behavior(gen_server).
-export([start_link/0, stop/0, get_folder/1, key_auth/2, key_auth_init/1, login_auth/2]). %% API.
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). %% gen_server.
-export([get_folder/1, key_auth/2, key_auth_init/1, key_auth_timeout/1, login_auth/2]).
%% Use the module name for the server's name.
-define(SERVER, ?MODULE).
-define(TABLE, accounts).
-include("include/records.hrl").
%% API.
%% @spec start_link() -> {ok,Pid::pid()}
start_link() ->
gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
%% @spec stop() -> stopped
stop() ->
gen_server:call(?SERVER, stop).
%% @todo Temporary code until we properly save the player data.
get_folder(GID) ->
gen_server:call(?SERVER, {get_folder, GID}).
{atomic, [#accounts{username=Username, password=Password}]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
<< Username/binary, "-", Password/binary >>.
key_auth(GID, AuthKey) ->
gen_server:call(?SERVER, {key_auth, GID, AuthKey}).
key_auth_init(GID) ->
gen_server:call(?SERVER, {key_auth_init, GID}).
%% @todo Properly handle login authentication when accounts are saved.
login_auth(Username, Password) ->
gen_server:call(?SERVER, {login_auth, Username, Password}).
%% gen_server.
init([]) ->
error_logger:info_report("egs_accounts started"),
{ok, undefined}.
handle_call({get_folder, GID}, _From, State) ->
{atomic, [#accounts{username=Username, password=Password}]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
{reply, << Username/binary, "-", Password/binary >>, State};
handle_call({key_auth, GID, AuthKey}, _From, State) ->
{atomic, [#accounts{auth_state=AuthState}]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
case AuthState of
{wait_for_authentication, AuthKey, TRef} ->
@ -71,46 +38,28 @@ handle_call({key_auth, GID, AuthKey}, _From, State) ->
Account = mnesia:read({?TABLE, GID}),
mnesia:write(Account#accounts{auth_state=undefined})
end),
{reply, ok, State};
ok;
_Any ->
{reply, {error, badarg}, State}
end;
{error, badarg}
end.
handle_call({key_auth_init, GID}, _From, State) ->
key_auth_init(GID) ->
AuthKey = crypto:rand_bytes(4),
TRef = timer:send_after(10000, {key_auth_timeout, GID}),
TRef = timer:apply_after(10000, ?MODULE, key_auth_timeout, [GID]),
mnesia:transaction(fun() ->
[Account] = mnesia:read({?TABLE, GID}),
mnesia:write(Account#accounts{auth_state={wait_for_authentication, AuthKey, TRef}})
end),
{reply, {ok, AuthKey}, State};
{ok, AuthKey}.
handle_call({login_auth, Username, Password}, _From, State) ->
GID = 10000000 + mnesia:dirty_update_counter(counters, gid, 1),
mnesia:transaction(fun() -> mnesia:write(#accounts{gid=GID, username=Username, password=Password}) end),
{reply, {ok, GID}, State};
handle_call(stop, _From, State) ->
{stop, normal, stopped, State};
handle_call(_Request, _From, State) ->
{reply, ignored, State}.
handle_cast(_Msg, State) ->
{noreply, State}.
handle_info({key_auth_timeout, GID}, State) ->
key_auth_timeout(GID) ->
mnesia:transaction(fun() ->
Account = mnesia:read({?TABLE, GID}),
mnesia:write(Account#accounts{auth_state=undefined})
end),
{noreply, State};
end).
handle_info(_Info, State) ->
{noreply, State}.
terminate(_Reason, _State) ->
ok.
code_change(_OldVsn, State, _Extra) ->
{ok, State}.
%% @todo Properly handle login authentication when accounts are saved.
login_auth(Username, Password) ->
GID = 10000000 + mnesia:dirty_update_counter(counters, gid, 1),
mnesia:transaction(fun() -> mnesia:write(#accounts{gid=GID, username=Username, password=Password}) end),
{ok, GID}.

1
src/egs_sup.erl
View File

@ -61,7 +61,6 @@ init([]) ->
{egs_patch_files_db, {egs_patch_files_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_quests_db, {egs_quests_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_shops_db, {egs_shops_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_accounts, {egs_accounts, start_link, []}, permanent, 5000, worker, dynamic},
{egs_universes, {egs_universes, start_link, []}, permanent, 5000, worker, dynamic},
{egs_user_model, {egs_user_model, start_link, []}, permanent, 5000, worker, dynamic},
{egs_game_server, {egs_game_server, start_link, [GamePort]}, permanent, 5000, worker, dynamic}