remove nsm_auth -> fake_users

apps/db/include/transaction.hrl

@@ -2,6 +2,8 @@
 -ifndef(TRANSACTION_HRL).
 -define(TRANSACTION_HRL, "transaction_hrl").
 
+-include_lib("kvs/include/kvs.hrl").
+
 -type currency() :: kakaush | quota | game_point | money.
 
 -record(transaction, {?ITERATOR(feed),

apps/db/include/user_info.hrl

@@ -1,16 +0,0 @@
--ifndef(USER_INFO_HRL).
--define(USER_INFO_HRL, "user_info.hrl").
-
--include("../../server/include/types.hrl").
-
--record(user_info,
-        {username :: username_type(),
-         name,
-         surname,
-         age,
-         avatar_url,
-         sex,
-         skill = 0 :: integer(),
-         score = 0 :: integer()}).
-
--endif.

apps/server/src/auth_server.erl

@@ -5,6 +5,7 @@
 -include_lib("server/include/log.hrl").
 -include_lib("server/include/authtoken.hrl").
 -include_lib("server/include/requests.hrl").
+-include_lib("kvs/include/user.hrl").
 
 -behaviour(gen_server).
 -compile(export_all).
@@ -114,16 +115,16 @@ store_token(GameId, E, Token, UserId) ->
     ets:insert(E, Data).
 
 user_info(UserId) ->
-    case nsm_auth:get_user_info(UserId) of
+    case kvs:get(user,UserId) of
         {ok, UserData} ->
             gs:info("User Data: ~p",[UserData]),
-            {ok, #'PlayerInfo'{id = list_to_binary(UserData#user_info.username),
-                               login = list_to_binary(UserData#user_info.username),
-                               name = wf:to_binary(UserData#user_info.name),
-                               avatar_url = wf:to_binary(UserData#user_info.avatar_url),
-                               skill = UserData#user_info.skill,
-                               score = UserData#user_info.score,
-                               surname = wf:to_binary(UserData#user_info.surname)}};
+            {ok, #'PlayerInfo'{id = wf:to_binary(UserData#user.id),
+                               login = wf:to_binary(UserData#user.username),
+                               name = wf:to_binary(UserData#user.id),
+                               avatar_url = wf:to_binary(UserData#user.avatar),
+                               skill = 0,
+                               score = 0,
+                               surname = wf:to_binary(UserData#user.surnames)}};
         Error ->
             Error
     end.

apps/server/src/fake_users.erl

@@ -0,0 +1,28 @@
+-module(fake_users).
+-compile(export_all).
+-include_lib("db/include/config.hrl").
+-include_lib("kvs/include/user.hrl").
+-include_lib("server/include/log.hrl").
+
+names() ->
+   ["pinar","betul","eda","lale","ilgin","alp","ayberk","vural","ozan","doruk",
+    "duman","boran","dursun","taner","uzay","ali","musa","halit","yusuf","isa",
+    "asena","aysu","konca","ceren","oylum","filiz","ezgi","ece","sevil","damla",
+    "bahar","arzu","dilara","esra","leyla","jale","fatma","irem","yasmin","zeynep",
+    "magnolia","jenifer","roksolana","tsering","suomi"].
+
+surnames() ->
+   ["ozcelik","acar","ozgur","ozkan","tez","ustel",
+    "mehmet","akbulut","arslan","avci","ayhan","basturk","caglar","celik","cetinkaya","demir",
+    "dikmen","acar","dogan","ekinci","elmas","erdem","erdogan","guler","gunes","ilhan",
+    "inan","karaca","karadag","kaya","kemal","keskin","koc","korkmaz","mestafa","osman",
+    "ozbek","ozcan","ozdemir","ozden","ozturk","pasa","polat","sezer","sahin","sen",
+    "simsek","tekin","tosun","tunc","turan","unal","yalcin","yazici","yildirim","yilmaz"].
+
+ima_gio(N) -> {MD5,Name} = lists:nth(N,imagionary_users()), Name.
+ima_gio(N,L) -> {MD5,Name} = lists:nth(N,L), Name.
+
+imagionary_users() ->
+    List = [{crypto:md5(X++Y),X++"_"++Y}||X<-names(),Y<-surnames()],
+    lists:keysort(1,List).
+

apps/server/src/game_manager.erl

@@ -438,7 +438,7 @@ start_tournament(TrnId,NumberOfTournaments,NumberOfPlayers,_Quota,_Tours,_Speed,
                 game_type = GameType,
                 game_mode = GameMode,
                 speed = Speed} = Tournament,
-%%    ImagioUsers = nsm_auth:imagionary_users2(),
+
     RealPlayersPR = lists:keysort(#play_record.other, RealPlayersUnsorted),
     ?INFO("Head: ~p",[hd(RealPlayersPR)]),
     RealPlayers = [list_to_binary(Who)||#play_record{who=Who}<-RealPlayersPR, Who /= undefined],
@@ -446,10 +446,11 @@ start_tournament(TrnId,NumberOfTournaments,NumberOfPlayers,_Quota,_Tours,_Speed,
 %%     Registrants = case NumberOfPlayers > length(RealPlayers) of
 %%                        true -> nsm_db:put(Tournament#tournament{status=canceled}), RealPlayers;
 %%                        false -> [lists:nth(N,RealPlayers)||N<-lists:seq(1,NumberOfPlayers)] end,
+
     RealPlayersNumber = length(RealPlayers),
     Registrants = if NumberOfPlayers == RealPlayersNumber -> RealPlayers;
                      NumberOfPlayers > RealPlayersNumber ->
-                         RealPlayers ++ [list_to_binary(nsm_auth:ima_gio2(N)) ||
+                         RealPlayers ++ [list_to_binary(fake_users:ima_gio(N)) ||
                                             N <- lists:seq(1, NumberOfPlayers-RealPlayersNumber)];
                      true -> lists:sublist(RealPlayers, NumberOfPlayers)
                   end,

apps/server/src/nsg_crowd_lib.erl

@@ -11,9 +11,9 @@
 -compile(export_all).
 
 create_users(A,B) ->
-    ImagioUsers = nsm_auth:imagionary_users(),
-    [ begin U = #user{username = nsm_auth:ima_gio(N,ImagioUsers),
-                            id = nsm_auth:ima_gio(N,ImagioUsers),
+    ImagioUsers = fake_users:imagionary_users(),
+    [ begin U = #user{username = fake_users:ima_gio(N,ImagioUsers),
+                            id = fake_users:ima_gio(N,ImagioUsers),
                             birth={1981,9,29}
                            }, kvs:put(U) end || N <- lists:seq(A, B) ].
 
@@ -23,7 +23,7 @@ virtual_users() ->
                 create_users(1,100), kvs:put(#user{id="maxim@synrc.com"});
         {ok,_} -> skip end,
 
-    {_, AllUsers} = lists:unzip(nsm_auth:imagionary_users()),
+    {_, AllUsers} = lists:unzip(fake_users:imagionary_users()),
     F = fun(UserId, Acc) ->
         User = auth_server:get_user_info_by_user_id(UserId),
         case User of

apps/server/src/nsm_auth.erl

@@ -1,102 +0,0 @@
--module(nsm_auth).
--compile(export_all).
--include_lib("db/include/config.hrl").
--include_lib("kvs/include/user.hrl").
--include_lib("db/include/user_info.hrl").
--include_lib("server/include/log.hrl").
-
-login(Data) ->
-    UserName = proplists:get_value(username, Data),
-    Password = proplists:get_value(password, Data),
-    HashedPassword = utils:sha(Password),
-
-    Reply =
-        case kvs:get(user,UserName) of
-            {ok, #user{password = HashedPassword, username = U} = User } ->
-                case User#user.status of
-                    ok ->
-%                        nsm_users:init_mq_for_user(UserName),
-%                        nsx_msg:notify([user, init], User),
-                        {ok, U};
-                    not_verified ->
-                        {error, not_verified};
-                    banned ->
-                        {error, banned};
-                    _ ->
-                        {error, unknown}
-                end;
-            {ok, _} ->
-                {error, incorrect_password};
-            {error, not_found} ->
-                {error, user_not_found};
-            {error, notfound} ->
-                {error, user_not_found}
-        end,
-    Reply.
-
-get_user_info(UserId) ->
-    Reply =
-        case kvs:get(user,UserId) of
-            {ok, User} ->
-                UserInfo = build_user_info(User),
-                {ok, UserInfo};
-            {error, not_found} ->
-                {error, user_not_found};
-            {error, notfound} ->
-                {error, user_not_found};
-            {aborted, _} ->
-                {error, user_not_found}
-        end,
-    Reply.
-
-get_all_user() -> {ok, kvs:all(user)}.
-
-generate_token(User) ->
-    Token = generate_token0(),
-    Res = auth_server:store_token(0, Token, User),
-    gs:info("with result :~p~n", [Res]),
-    Token.
-
-generate_token0() -> T0 = crypto:rand_bytes(100), T = base64:encode(T0), T.
-
-build_user_info(#user{username = UserName,
-                      id = Name,
-                      surnames = Surname,
-                      birth = Age,
-                      sex = Sex} = User) ->
-    #user_info{username = Name,
-               name = Name,
-               surname = Surname,
-               age = Age,
-               avatar_url = get_avatar(User, small),
-               sex = Sex}.
-
-get_avatar(#user{avatar = Avatar}, Size) -> get_avatar(Avatar, Size);
-get_avatar(Avatar, Size) ->
-    case Size of
-         big -> "/images/no_avatar_big.jpg";
-         small -> "/images/no_avatar_small.jpg";
-         tiny -> "/images/no_avatar_tiny.jpg" end.
-
-names() ->
-   ["pinar","betul","eda","lale","ilgin","alp","ayberk","vural","ozan","doruk",
-    "duman","boran","dursun","taner","uzay","ali","musa","halit","yusuf","isa",
-    "asena","aysu","konca","ceren","oylum","filiz","ezgi","ece","sevil","damla",
-    "bahar","arzu","dilara","esra","leyla","jale","fatma","irem","yasmin","zeynep",
-    "magnolia","jenifer","roksolana","tsering","suomi"].
-
-surnames() ->
-   ["ozcelik","acar","ozgur","ozkan","tez","ustel",
-    "mehmet","akbulut","arslan","avci","ayhan","basturk","caglar","celik","cetinkaya","demir",
-    "dikmen","acar","dogan","ekinci","elmas","erdem","erdogan","guler","gunes","ilhan",
-    "inan","karaca","karadag","kaya","kemal","keskin","koc","korkmaz","mestafa","osman",
-    "ozbek","ozcan","ozdemir","ozden","ozturk","pasa","polat","sezer","sahin","sen",
-    "simsek","tekin","tosun","tunc","turan","unal","yalcin","yazici","yildirim","yilmaz"].
-
-ima_gio(N) -> {MD5,Name} = lists:nth(N,imagionary_users()), Name.
-ima_gio(N,L) -> {MD5,Name} = lists:nth(N,L), Name.
-
-imagionary_users() ->
-    List = [{crypto:md5(X++Y),X++"_"++Y}||X<-names(),Y<-surnames()],
-    lists:keysort(1,List).
-

apps/server/src/okey/game_okey_scoring.erl

@@ -21,7 +21,7 @@
 -include_lib("server/include/game_okey.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("db/include/config.hrl").
--include_lib("db/include/accounts.hrl").
+-include_lib("db/include/scoring.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("server/include/game_tavla.hrl").