Browse Source

simplify auth

Maxim Sokhatsky 11 years ago
parent
commit
f81923722e
2 changed files with 2 additions and 3 deletions
  1. 1 2
      apps/face/src/index.erl
  2. 1 1
      apps/server/src/auth_server.erl

+ 1 - 2
apps/face/src/index.erl

@@ -72,8 +72,7 @@ event(init) ->
 event(combo)  -> wf:info("Combo: ~p",[wf:q(dddiscard)]);
 event(join)   -> wf:wire(join("1000001"));
 event(attach) -> 
-    Token = auth_server:generate_token(),
-    auth_server:store_token(1000001,Token,"maxim"),
+    Token = auth_server:generate_token(1000001,"maxim"),
     wf:wire(attach(wf:f("'~s'",[Token])));
 
 event(take)   -> wf:wire(take("1000001", wf:q(ddtake)));

+ 1 - 1
apps/server/src/auth_server.erl

@@ -45,7 +45,7 @@ get_user_info_by_user_id(UserId) when is_list(UserId) -> get_user_info_by_user_i
 get_user_info_by_user_id(UserId) -> user_info(UserId).
 fake_credentials() -> gen_server:call(?SERVER, {fake_credentials}).
 robot_credentials() -> gen_server:call(?SERVER, {robot_credentials}).
-generate_token() -> base64:encode(crypto:rand_bytes(100)).
+generate_token(Game,User) -> T = base64:encode(crypto:rand_bytes(100)), store_token(Game,T,User).
 
 init([]) ->
     Tokens = ets:new(tokens, [private, ordered_set, {keypos, #authtoken.token}]),