Browse Source

can't perform facebook autologin due to broken game context

SRV1 11 years ago
parent
commit
29ffafb10c

+ 1 - 1
apps/web/priv/static/app/index.htm

@@ -15,7 +15,7 @@
 
 
     <script src="js/n2o/bert.js?v=7"></script>
     <script src="js/n2o/bert.js?v=7"></script>
     <script src="js/n2o/bullet.js?v=7"></script>
     <script src="js/n2o/bullet.js?v=7"></script>
-    <script src="js/n2o/facebook.js?v=7"></script>
+    <script src="js/n2o/facebook.js?v=8"></script>
 
 
     <script src="js/selector.js?v=7"></script>
     <script src="js/selector.js?v=7"></script>
     <script src="js/controller.js?v=7"></script>
     <script src="js/controller.js?v=7"></script>

+ 10 - 11
apps/web/priv/static/app/js/n2o/facebook.js

@@ -3,24 +3,23 @@
 
 
 utf8 = { toByteArray: utf8toByteArray };
 utf8 = { toByteArray: utf8toByteArray };
 
 
-  window.fbAsyncInit = function() {
-  FB.init({ appId: /* "559978657446014" */ "154227314626053",
+window.fbAsyncInit = function() {
+
+   FB.init({ appId: /* "559978657446014" */ "154227314626053",
             channelUrl: 'http://kakaranet.com/channel.html',
             channelUrl: 'http://kakaranet.com/channel.html',
             status: true, cookie: true, xfbml: true, oauth: true });
             status: true, cookie: true, xfbml: true, oauth: true });
 
 
-  FB.getLoginStatus(function(response) {
-    if(typeof setFbIframe == "function"){
-      var inIframe= top!=self;
-      setFbIframe(inIframe);
-      if(inIframe && response.status == 'connected' && fbLogin)
-        FB.api("/me?fields=id,username,first_name,gender,last_name,email,birthday", 
-          function(response){ fbLogin(response);});
-    }
-  });
+//  FB.getLoginStatus(function(response){
+//    if(response.status == 'connected' && fbLogin) 
+//        FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", 
+//           function(response){ response.facebook = true; fbLogin(response);});
+//  });
+
 };
 };
 
 
 function fb_login(){
 function fb_login(){
   FB.getLoginStatus(function(response){
   FB.getLoginStatus(function(response){
+    console.log("Login Status: "+response.status);
     if(response.status == 'connected'){
     if(response.status == 'connected'){
       if(fbLogin) 
       if(fbLogin) 
         FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", 
         FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", 

+ 5 - 0
apps/web/priv/static/app/js/okey/okey.js

@@ -324,6 +324,11 @@ function PostLoad()
         if ("pause" == what) pause({who:who}); else unpause({});
         if ("pause" == what) pause({who:who}); else unpause({});
     });
     });
 
 
+    scope.apiProvider.on("logout", function(x) {
+        console.log("Logout");
+        scope.ended = !0;
+    });
+
 
 
     $("#Table-Oval").droppable({
     $("#Table-Oval").droppable({
         accept: function(target) {
         accept: function(target) {

+ 6 - 0
apps/web/src/okey.erl

@@ -158,6 +158,9 @@ event(attach) ->
     end),
     end),
     ok;
     ok;
 
 
+event(logout) ->
+    wf:wire(protocol:logout());
+
 event({client,{message,From,Name,To,Message}}) ->
 event({client,{message,From,Name,To,Message}}) ->
     wf:info(?MODULE,"Online Chat Message from ~p(~p) to ~p:~n ~p~n",[From,Name,To,Message]),
     wf:info(?MODULE,"Online Chat Message from ~p(~p) to ~p:~n ~p~n",[From,Name,To,Message]),
     wf:send(To,{server,{chat_message,{From,Name},To,wf:to_binary(Message)}}),
     wf:send(To,{server,{chat_message,{From,Name},To,wf:to_binary(Message)}}),
@@ -206,6 +209,9 @@ event({login,User}) ->
     wf:info(?MODULE,"Login: ~p",[User]),
     wf:info(?MODULE,"Login: ~p",[User]),
     wf:send(broadcast,{user_offline,user()}),
     wf:send(broadcast,{user_offline,user()}),
     send_auth_cookies(User),
     send_auth_cookies(User),
+%    event(logout),
+%    event(attach),
+%    event(join),
     wf:wire("window.location='https://kakaranet.com'");
     wf:wire("window.location='https://kakaranet.com'");
 
 
 event(_Event) -> wf:info(?MODULE,"Unknown Event: ~p", [_Event]).
 event(_Event) -> wf:info(?MODULE,"Unknown Event: ~p", [_Event]).