Browse Source

facebook login back to stack

SRV1 11 years ago
parent
commit
2669915df4
2 changed files with 6 additions and 5 deletions
  1. 2 2
      apps/server/src/auth/anonymous.erl
  2. 4 3
      apps/web/src/okey.erl

+ 2 - 2
apps/server/src/auth/anonymous.erl

@@ -48,9 +48,9 @@ create_users(A,B) ->
                     birth={1981,9,29} }, kvs:put(U) end || N <- lists:seq(A, B) ].
 
 virtual_users() ->
-    case kvs:get(user,"maxim@synrc.com") of
+    case kvs:get(user,<<"maxim@synrc.com">>) of
         {aborted,_} -> kvs:join(), kvs:init_db(),
-                create_users(1,100), kvs:put(#user{id="maxim@synrc.com"});
+                create_users(1,100), kvs:put(#user{id= <<"maxim@synrc.com">>});
         {ok,_} -> skip end,
 
     AllUsers = imagionary_users(),

+ 4 - 3
apps/web/src/okey.erl

@@ -34,7 +34,7 @@ new_user() ->
         surnames = Surname},
     wf:wire(wf:f("document.cookie='~s=~s; path=/; expires=~s';",
         ["n2o-name",wf:to_list(FakeId),js_session:cookie_expire(js_session:ttl())])),
-    kvs:add(X),
+    kvs:put(X),
     X.
 
 new_facebook_user(User) ->
@@ -183,7 +183,7 @@ event(init) ->
     okey:update(games_ids,#dropdown{id = games_ids, value = ?GAMEID, options = 
       [#option{label = wf:to_list(GameId), value = wf:to_list(GameId)} || GameId <- GamesIds]}),
 
-    wf:info(?MODULE,"Istaka on Started:"),
+    wf:info(?MODULE,"Istaka on Started:",[]),
     event(attach),
     event(join);
 
@@ -220,7 +220,8 @@ event(attach) ->
     wf:info(?MODULE,"Session User: ~p",[User]),
     GameId = case wf:q(games_ids) of undefined -> ?GAMEID; Res -> Res end,
     put(okey_game_id, GameId),
-    Token = auth_server:generate_token(GameId,User),
+    Token = auth_server:generate_token(GameId,User#user.id),
+    wf:info(?MODULE,"Game Token: ~p",[Token]),
     wf:wire(protocol:attach(wf:f("'~s'",[Token]))),
     Pid = self(),
     spawn(fun() ->