social_stream-presence 0.8.0 → 0.8.2

data/app/assets/javascripts/chat_persistence.js

@@ -10,11 +10,20 @@ function storeChatData(){
     return
   }
 	
+	storeChatStatus();
 	storeUserChatStatus();
-  storeChatConnectionParametres();
 	storeConversations();
 }
 
+function storeChatStatus(){
+	//Status of the mainChatBoxWindow
+  if(mainChatBox!=null){
+    sessionStorage.setItem("chat_mainChatBox_status", $(mainChatBox).is(":visible"));
+  } else {
+    sessionStorage.setItem("chat_mainChatBox_status", null);
+  } 
+}
+
 function storeConversations() {
 
   var chatboxes = getAllChatBoxes();
@@ -23,8 +32,6 @@ function storeConversations() {
 	var visibleMaxSlugs = [];
 	var visibleMinSlugs = [];
 	
-	//window[getChatVariableFromSlug("eric-white")].is(":visible")
-	
 	//Stored all conversations
 	for (var i=0;i<chatboxes.length;i++){
 	  var slug = chatboxes[i].id
@@ -62,35 +69,13 @@ function storeConversations() {
   }
 }
 
-
-function storeChatConnectionParametres() {
-	if ((sessionStorage.getItem("cookie") == null)||(sessionStorage.getItem("chat_user_name") == null)){
-		if ((typeof cookie != 'undefined')&&(cookie!=null)){
-			sessionStorage.setItem("cookie", cookie);
-		}
-    if ((typeof user_name != 'undefined') && (user_name != null)) {
-			sessionStorage.setItem("chat_user_name", user_name);
-	  }
-		if ((typeof user_slug != 'undefined') && (user_slug != null)) {
-			sessionStorage.setItem("chat_user_slug", user_slug);
-	  }
-		if ((typeof user_jid != 'undefined') && (user_jid != null)) {
-			sessionStorage.setItem("chat_user_jid", user_jid);
-	  }
-	}	
-}
-
 function storeUserChatStatus(){
 	sessionStorage.setItem("chat_user_status", userStatus);
 }
 
 function removeAllDataStored(){
-	sessionStorage.removeItem("cookie");
-  sessionStorage.removeItem("chat_user_name");
-  sessionStorage.removeItem("chat_user_slug");
-  sessionStorage.removeItem("chat_user_jid");
-	
 	sessionStorage.removeItem("chat_user_status");
+	sessionStorage.removeItem("chat_mainChatBox_status");
 	
 	sessionStorage.removeItem("slugs_with_stored_log");
 	sessionStorage.removeItem("slugs_with_visible_max_chatbox");
@@ -117,9 +102,23 @@ function restoreChatData(){
   if (! window.sessionStorage){
     return
   }
+	
   restoreConversations();
 }
 
+
+function getRestoreMainChatBoxStatus(){
+	if (!window.sessionStorage) {
+    return false;
+  } else {
+		if(sessionStorage.getItem("chat_mainChatBox_status") == "true"){
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
+
 function restoreConversations() {
 	
 	  //Get Stored slugs

data/app/assets/javascripts/chat_window_manager.js

@@ -405,7 +405,7 @@ function createMainChatBox(){
       $(mainChatBox).css('overflow-y','hidden')
 			
 			//Minimize
-			mainChatBox.parent().toggle(false);
+			mainChatBox.parent().toggle(getRestoreMainChatBoxStatus());
 			
 			//Header title
 			updateConnectedUsersOfMainChatBox();

data/app/controllers/xmpp_controller.rb

@@ -98,9 +98,9 @@ class XmppController < ApplicationController
       return
     end
     
-    #Actual connected users
-    user_slugs = params[:name].split(",")
-    SocialStream::Presence::XmppServerOrder::synchronizePresenceForSlugs(user_slugs)
+    #Actual connected jids
+    user_jids = params[:name].split(",")
+    SocialStream::Presence::XmppServerOrder::synchronizePresenceForJids(user_jids)
     render :text => "Ok"
   end
   

data/ejabberd/conf/ssconfig_example.cfg

@@ -13,15 +13,16 @@ scripts_path=/my_scripts_path
 #Source path: uncomment to compile ejabberd social stream module
 #source_path=/.../ejabberd_source/src
 
+#Web Domains for REST API
+web_domains=[webDomain1,webDomain2,...,webDomainN]
 
-#Web Domain for REST API
-web_domain=ssdomain.example.com
+#Specify Web Domains URL
+web_domain_name=ssdomain.example.com
 
 #Rails Web Server Cookie name
 #Check this line in your app/config/initializers/session_store.rb: Global::Application.config.session_store :cookie_store, :key => '_rails_server_cookie'
 cookie_name=_rails_server_cookie
 
-
 #Ejabberd Server Password
 ejabberd_password=password
 #True to enable REST API Security

data/ejabberd/ejabberd_scripts/authentication_script

@@ -31,12 +31,10 @@ def getOption(option)
   return "Undefined"
 end
 
-$accessByPasswordUrl = "http://" + getOption("web_domain=") + "/users/sign_in"
-$accessByCookieUrl = "http://" + getOption("web_domain=") + "/api/me"
 $cookie_name = getOption("cookie_name=")
 
 
-def auth(username, password)
+def auth(username,domain,password)
 
   #[TEST ONLY] Allow everybody
   #return true
@@ -46,9 +44,10 @@ def auth(username, password)
   #  return true
   #end
 
+  accessByPasswordUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
 
   begin
-    response = RestClient.post $accessByPasswordUrl, :user => { :email => username , :password => password }
+    response = RestClient.post accessByPasswordUrl, :user => { :email => username , :password => password }
 
     if response.code == 201
       return true
@@ -69,9 +68,10 @@ def auth(username, password)
 end
 
 
-def authByCookie(username, cookie)
+def authByCookie(username, domain, cookie)
   begin
-    response = RestClient.get $accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
+    accessByCookieUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/api/me"
+    response = RestClient.get accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
     doc = REXML::Document.new(response.body)
 
     slug = ""
@@ -108,6 +108,16 @@ def validateParameters(username,domain,password)
 end
 
 
+def getWebDomainUrlFromDomain(domain)
+	web_domain = getOption(domain + "=");
+	if (web_domain != "Undefined")
+		return web_domain
+	else
+		return domain
+	end
+end
+
+
 loop do
   begin
     $stdin.eof? # wait for input
@@ -136,17 +146,17 @@ loop do
       password = data[2]	
       if password.split(">>")[0]=="AuthenticationByCookie"
 	cookie = password.split(">>")[1]
-	$logger.info "#{Process.pid}: With username #{data[0]} and cookie #{cookie}"      	
-	authByCookie(data[0], cookie)
+	$logger.info "#{Process.pid}: With userJid #{data[0]}@#{data[1]} and cookie #{cookie}"      	
+	authByCookie(data[0], data[1], 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])
+	$logger.info "#{Process.pid}: With userJid #{data[0]}@#{data[1]} and password ******"
+	#$logger.info "#{Process.pid}: With userJid #{data[0]}@#{data[1]} and password #{data[2]}"
+      	auth(data[0], data[1], data[2])
       end
       
     when "isuser"
      
-      $logger.info "#{Process.pid}: Isuser #{data[0]}@#{data[1]}"
+      $logger.info "#{Process.pid}: Isuser with userJid: #{data[0]}@#{data[1]}"
 
       #Authorization condition for ISUSER (Add buddys)
       true

data/ejabberd/ejabberd_scripts/development_scripts/show_config.sh

@@ -17,20 +17,19 @@ end
 puts ""
 puts "############### Ejabberd Configuration ###############"
 puts "Config file for Social Stream Presence: /etc/ejabberd/ssconfig.cfg"
-puts "Xmpp Server domain: #{getOption("server_domain=")}"
 puts "Scripts Path: #{getOption("scripts_path=")}"
 puts "mod_sspresence Path: #{getOption("source_path=")}"
-puts "Web Domain for REST API: #{getOption("web_domain=")}"
+puts "Web Server domains: #{getOption("web_domains=")}"
 puts "##############################"
 puts "REST API"
-puts "Authentication by password: http://#{getOption("web_domain=")}/users/sign_in"
-puts "Authentication by cookie: http://#{getOption("web_domain=")}/api/me"
-puts "onRegisterConnection: http://#{getOption("web_domain=")}/xmpp/setConnection"
-puts "onRemoveConnection: http://#{getOption("web_domain=")}/xmpp/unsetConnection"
-puts "onPresence: http://#{getOption("web_domain=")}/xmpp/setPresence"
-puts "onUnsetPresence: http://#{getOption("web_domain=")}/xmpp/unsetPresence"
-puts "ResetConnection: http://#{getOption("web_domain=")}/xmpp/resetConnection"
-puts "SynchronizePresence: http://#{getOption("web_domain=")}/xmpp/synchronizePresence"
+puts "Authentication by password: http://domainURL/users/sign_in"
+puts "Authentication by cookie: http://domainURL/api/me"
+puts "onRegisterConnection: http://domainURL/xmpp/setConnection"
+puts "onRemoveConnection: http://domainURL/xmpp/unsetConnection"
+puts "onPresence: http://domainURL/xmpp/setPresence"
+puts "onUnsetPresence: http://domainURL/xmpp/unsetPresence"
+puts "ResetConnection: http://domainURL/xmpp/resetConnection"
+puts "SynchronizePresence: http://domainURL/xmpp/synchronizePresence"
 puts "##############################"
 puts "Social Stream Presence logs in var/log/ejabberd/"
 puts "######################################################"