Browse Source

fix exports

Maxim Sokhatsky 11 years ago
parent
commit
b662d1b050
6 changed files with 9 additions and 4 deletions
  1. 1 0
      include/avz.hrl
  2. 3 2
      src/avz.erl
  3. 1 1
      src/facebook.erl
  4. 1 0
      src/github.erl
  5. 2 1
      src/google.erl
  6. 1 0
      src/twitter.erl

+ 1 - 0
include/avz.hrl

@@ -6,6 +6,7 @@
              login_button/0,      % HTML Button for page embedding
              login_button/0,      % HTML Button for page embedding
              event/1,             % Page Event for HTTP redirect based login methods
              event/1,             % Page Event for HTTP redirect based login methods
              api_event/3,         % Page Event for JavaScript based login methods
              api_event/3,         % Page Event for JavaScript based login methods
+             email_prop/2,
              callback/0,          % Callback part of HTTP redirect based login methods
              callback/0,          % Callback part of HTTP redirect based login methods
              registration_data/3  % Process Parameters
              registration_data/3  % Process Parameters
             ]).
             ]).

+ 3 - 2
src/avz.erl

@@ -5,8 +5,9 @@
 -include_lib("n2o/include/wf.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/users.hrl").
 
 
-callback(Methods) -> [ M:callback() || M <- Methods].
-sdk(Methods) -> [ M:sdks() || M <- Methods].
+callbacks(Methods) -> [ M:callback() || M <- Methods].
+sdk(Methods) -> [ M:sdk() || M <- Methods].
+buttons(Methods) -> [ M:login_button() || M <- Methods].
 
 
 event(init) -> [];
 event(init) -> [];
 event(logout) -> wf:user(undefined), wf:redirect(?LOGIN_PAGE);
 event(logout) -> wf:user(undefined), wf:redirect(?LOGIN_PAGE);

+ 1 - 1
src/facebook.erl

@@ -3,8 +3,8 @@
 -include_lib("avz/include/avz.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/users.hrl").
+-compile(export_all).
 -export(?API).
 -export(?API).
-
 -define(HTTP_ADDRESS, case application:get_env(web, http_address) of {ok, A} -> A; _ -> "" end).
 -define(HTTP_ADDRESS, case application:get_env(web, http_address) of {ok, A} -> A; _ -> "" end).
 -define(FB_APP_ID, case application:get_env(web, fb_id) of {ok, Id} -> Id; _-> "" end).
 -define(FB_APP_ID, case application:get_env(web, fb_id) of {ok, Id} -> Id; _-> "" end).
 
 

+ 1 - 0
src/github.erl

@@ -3,6 +3,7 @@
 -include_lib("n2o/include/wf.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("avz/include/avz.hrl").
+-compile(export_all).
 -export(?API).
 -export(?API).
 
 
 -define(CLIENT_ID, case application:get_env(web, github_client_id) of {ok, K} -> K;_-> "" end).
 -define(CLIENT_ID, case application:get_env(web, github_client_id) of {ok, K} -> K;_-> "" end).

+ 2 - 1
src/google.erl

@@ -3,6 +3,7 @@
 -include_lib("avz/include/avz.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/users.hrl").
+-compile(export_all).
 -export(?API).
 -export(?API).
 -define(GPLUS_CLIENT_ID, case application:get_env(web, gplus_client_id) of {ok, Id} -> Id; _-> "" end).
 -define(GPLUS_CLIENT_ID, case application:get_env(web, gplus_client_id) of {ok, Id} -> Id; _-> "" end).
 -define(GPLUS_COOKIE_POLICY, case application:get_env(web, gplus_cookiepolicy) of {ok, P} -> P; _-> "" end).
 -define(GPLUS_COOKIE_POLICY, case application:get_env(web, gplus_cookiepolicy) of {ok, P} -> P; _-> "" end).
@@ -17,7 +18,7 @@ registration_data(Props, google, Ori)->
     Image = proplists:get_value(<<"image">>, Props),
     Image = proplists:get_value(<<"image">>, Props),
     {Id, Ori#user{ display_name = proplists:get_value(<<"displayName">>, Props),
     {Id, Ori#user{ display_name = proplists:get_value(<<"displayName">>, Props),
                    avatar = lists:nth(1,string:tokens(binary_to_list(proplists:get_value(<<"url">>, Image#struct.lst)), "?")),
                    avatar = lists:nth(1,string:tokens(binary_to_list(proplists:get_value(<<"url">>, Image#struct.lst)), "?")),
-                   email = email_prop(Props,googleplus_id),
+                   email = email_prop(Props,google),
                    name = GivenName,
                    name = GivenName,
                    surname = FamilyName,
                    surname = FamilyName,
                    googleplus_id = Id,
                    googleplus_id = Id,

+ 1 - 0
src/twitter.erl

@@ -3,6 +3,7 @@
 -include_lib("n2o/include/wf.hrl").
 -include_lib("n2o/include/wf.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/users.hrl").
+-compile(export_all).
 -export(?API).
 -export(?API).
 -define(CONSUMER_KEY, case application:get_env(web, tw_consumer_key) of {ok, K} -> K;_-> "" end).
 -define(CONSUMER_KEY, case application:get_env(web, tw_consumer_key) of {ok, K} -> K;_-> "" end).
 -define(CONSUMER_SECRET, case application:get_env(web, tw_consumer_secret) of {ok, S} -> S; _-> "" end).
 -define(CONSUMER_SECRET, case application:get_env(web, tw_consumer_secret) of {ok, S} -> S; _-> "" end).