social_stream-presence 0.0.16 → 0.0.17

data/ejabberd/conf/ssconfig_example.cfg

@@ -16,6 +16,7 @@ scripts_path=/my_scripts_path
 #API REST
 auth_api=http://localhost/users/sign_in
 auth_by_cookie_api=http://localhost/api/me
+cookie_name=_rails_server_cookie
 set_connection_api=http://localhost/xmpp/setConnection
 unset_connection_api=http://localhost/xmpp/unsetConnection
 reset_connection_api=http://localhost/xmpp/resetConnection

data/ejabberd/ejabberd_scripts/authentication_script

@@ -33,6 +33,7 @@ end
 
 $accessUrl = getOption("auth_api=")
 $accessByCookieUrl = getOption("auth_by_cookie_api=")
+$cookie_name = getOption("cookie_name=")
 $sslogin = getOption("ss_login=")
 $sspass = getOption("ss_password=")
 
@@ -80,7 +81,7 @@ end
 
 def authByCookie(username, cookie)
   begin
-    response = RestClient.get $accessByCookieUrl, :cookies => {:_global_session => cookie}
+    response = RestClient.get $accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
     doc = REXML::Document.new(response.body)
 
     slug = ""
@@ -149,6 +150,7 @@ loop do
 	authByCookie(data[0], cookie)
       else
 	$logger.info "#{Process.pid}: With username #{data[0]} and password ******"
+	#$logger.info "#{Process.pid}: With username #{data[0]} and password #{data[2]}"
       	auth(data[0], data[2])
       end
       

data/lib/social_stream/presence/models/buddy_manager.rb

@@ -17,6 +17,10 @@ module SocialStream
               return
             end
             
+            unless self.receiver and self.sender
+              return
+            end
+            
             unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
               return
             end
@@ -50,6 +54,10 @@ module SocialStream
               return
             end
             
+            unless self.receiver and self.sender
+              return
+            end
+            
             unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
               return
             end

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Aldo Gordillo