Merge pull request #16 from fycth/master

Moving from mochi-json to jsone/jsonx

include/avz.hrl

@@ -10,3 +10,6 @@
              callback/0,          % Callback part of HTTP redirect based login methods
              registration_data/3  % Process Parameters
             ]).
+-ifndef(AVZ_JSON).
+-define(AVZ_JSON, (application:get_env(avz,json,jsone))).
+-endif.

src/facebook.erl

@@ -13,7 +13,7 @@
 
 callback() -> ok.
 event({facebook,_Event}) -> wf:wire("fb_login();"), ok.
-api_event(fbLogin, Args, _Term) -> JSArgs = n2o_json:decode(Args), avz:login(facebook, JSArgs#struct.lst).
+api_event(fbLogin, Args, _Term) -> {JSArgs} = ?AVZ_JSON:decode(list_to_binary(Args)), avz:login(facebook, JSArgs).
 
 registration_data(Props, facebook, Ori)->
     Id = proplists:get_value(<<"id">>, Props),
@@ -22,7 +22,7 @@ registration_data(Props, facebook, Ori)->
         BD -> list_to_tuple([list_to_integer(X) || X <- string:tokens(binary_to_list(BD), "/")]) end,
     Email = email_prop(Props, facebook),
     [UserName|_] = string:tokens(binary_to_list(Email),"@"),
-    Cover = case proplists:get_value(<<"cover">>,Props) of undefined -> ""; P -> case proplists:get_value(<<"source">>,P#struct.lst) of undefined -> ""; C -> binary_to_list(C) end end,
+    Cover = case proplists:get_value(<<"cover">>,Props) of undefined -> ""; {P} -> case proplists:get_value(<<"source">>,P) of undefined -> ""; C -> binary_to_list(C) end end,
     Ori#user{   id = Email,
                 display_name = UserName,
                 images = avz:update({fb_cover,Cover},avz:update({fb_avatar,"https://graph.facebook.com/" ++ binary_to_list(Id) ++ "/picture?type=large"},Ori#user.images)),

src/github.erl

@@ -34,7 +34,7 @@ api_call(Name, Props) ->
     case httpc:request(get, {oauth:uri(?API_URI++Name, Token), ?REQ_HEADER}, [], []) of
          {error, reason} -> api_error;
          {ok, {HttpResponse, _, Body}} -> 
-                case HttpResponse of {"HTTP/1.1", 200, "OK"} -> n2o_json:decode(Body); _ -> error end;
+                case HttpResponse of {"HTTP/1.1", 200, "OK"} -> {Res} = ?AVZ_JSON:decode(list_to_binary(Body)), Res; _ -> error end;
          {ok, _} -> api_error end.
 
 sdk() -> [].
@@ -45,7 +45,7 @@ callback() ->
          undefined when Code =/= undefined andalso State == <<"state">> ->
             case github:get_access_token(Code) of
                  not_authorized -> skip;
-                 Props -> UserData = github:user(Props), avz:login(github, UserData#struct.lst) end;
+                 Props -> UserData = github:user(Props), avz:login(github, UserData) end;
          _ -> skip end.
 
 registration_data(Props, github, Ori) ->

src/google.erl

@@ -9,7 +9,7 @@
 -define(GPLUS_CLIENT_ID,     application:get_env(web, gplus_client_id,    [])).
 -define(GPLUS_COOKIE_POLICY, application:get_env(web, gplus_cookiepolicy, [])).
 
-api_event(plusLogin, Args, _)-> JSArgs = n2o_json:decode(Args), avz:login(google, JSArgs#struct.lst).
+api_event(plusLogin, Args, _)-> {JSArgs} = ?AVZ_JSON:decode(list_to_binary(Args)), avz:login(google, JSArgs).
 
 registration_data(Props, google, Ori)->
     Id = proplists:get_value(<<"id">>, Props),

src/microsoft.erl

@@ -15,8 +15,8 @@ api_event(_, Args, _)->
     [_|K1] = J,
     [_|K2] = lists:reverse(K1),
     K = lists:reverse(K2),
-    Struct = n2o_json:decode(K),
-    avz:login(microsoft, Struct#struct.lst).
+    {D} = ?AVZ_JSON:decode(list_to_binary(K)),
+    avz:login(microsoft, D).
 
 registration_data(Props, microsoft, Ori)->
     wf:info(?MODULE,"Microsoft Login: ~p",[Props]),

src/twitter.erl

@@ -35,7 +35,7 @@ callback() ->
              if (Token /= undefined) andalso ( Verifier/= undefined) ->
                    case get_access_token(binary_to_list(Token), binary_to_list(Verifier)) of
                         not_authorized -> skip;
-                        Props -> UserData = show(Props), avz:login(twitter, UserData#struct.lst) end;
+                        Props -> UserData = show(Props), avz:login(twitter, UserData) end;
                  true -> skip  end;
          _ -> skip end.
 
@@ -95,7 +95,7 @@ show(Props)->
                             ?CONSUMER, oauth:token(Props), oauth:token_secret(Props)),
   case Response of
     {HttpResponse, _, Body} -> case HttpResponse of
-                                    {"HTTP/1.1", 200, "OK"} ->  n2o_json:decode(Body);
+                                    {"HTTP/1.1", 200, "OK"} ->  {Res} = ?AVZ_JSON:decode(list_to_binary(Body)), Res;
                                     _-> error end;
     _ -> error
   end.