@@ -9,8 +9,7 @@ class WsRosterController < WebsocketRails::BaseController

     def initialize_storage

         @storages.each do |storage|

-            connection_store[storage] = {} if connection_store[storage].nil?

-            connection_store[storage][client_id] = []

+            connection_store[storage] = []

         end

     end

@@ -24,8 +23,8 @@ class WsRosterController < WebsocketRails::BaseController

                 client = Signin.try_login(credentials["jid"], credentials["pass"])

                 client.send(Jabber::Presence.new.set_type(:available))

-                connection_store[:clients][client_id] << client

-                connection_store[:rosters][client_id] << Jabber::Roster::Helper.new(client)

+                connection_store[:clients] << client

+                connection_store[:rosters] << Jabber::Roster::Helper.new(client)

             rescue Signin::LoginError

                 trigger_failure msg: credentials["jid"]

             end

@@ -37,7 +36,7 @@ class WsRosterController < WebsocketRails::BaseController

     def get_contacts

         all_contacts = []

-        connection_store[:rosters][client_id].each do |roster|

+        connection_store[:rosters].each do |roster|

             roster.wait_for_roster

             roster.get_roster()

@@ -52,8 +51,8 @@ class WsRosterController < WebsocketRails::BaseController

     end

     def disconnect

-        if connection_store[:clients][client_id]

-            connection_store[:clients][client_id].each do |client|

+        if connection_store[:clients]

+            connection_store[:clients].each do |client|

                 client.send(Jabber::Presence.new.set_type(:unavailable))

             end

         end