@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base

 	def require_login

 		if authenticated?

-			create_new_authentification()

+			create_new_authentication()

             unless controller_name == 'chat'

                 redirect_to chat_template_path

@@ -19,16 +19,32 @@ class ApplicationController < ActionController::Base

 	protected

 	def authenticated?

-		!! Token.authenticate(session)

+        @token = Token.authenticate(session)

 	end

-	def create_new_authentification

-		Token.remove_old_session(session[:token])

+	def create_new_authentication(jid = nil)

+        if @token

+            user_id = @token.user_id

+            @token.delete

+        else

+            user_id = jid.nil? ? nil : create_new_user(jid)

+        end

-		session[:token] = Token.generate_token()

-		session[:created_at] = Time.now

-		session[:ip] = request.remote_ip

+        @token = Token.new

-		Token.save_session(session)

-	end

+        save_session(user_id)

+    end

+

+    def save_session(user_id)

+        session[:token] = Token.generate_token()

+        session[:created_at] = Time.now

+        session[:ip] = request.remote_ip

+

+        @token.save_session(session, user_id)

+    end

+

+    def create_new_user(jid)

+        user = User.new(jid: jid)

+        user.id if user.save

+    end

 end

@@ -13,7 +13,7 @@ class SessionsController < ApplicationController

 			return render 'new'

 		end

-        create_new_authentification()

+        create_new_authentication(params[:jid].downcase)

         redirect_to chat_template_path, flash: {notice: I18n.t('login.success')}

 	end

@@ -9,9 +9,12 @@ class Token

 	field :token, type: String

 	field :date_expiring, type: DateTime

 	field :ip, type: Integer

+    field :user_id, type: Moped::BSON::ObjectId

+    ##

+    # @return [Token]

 	def self.authenticate(session)

-		if session[:created_at] == nil

+		if session[:created_at].nil?

 			return false

 		end

@@ -24,18 +27,19 @@ class Token

 		matched_token

 	end

-	def self.save_session(session)

-		date_expiring = session[:created_at] + Rails.application.config.max_lifetime

+	def save_session(session, user)

+        self.token         = session[:token]

+        self.date_expiring = session[:created_at] + Rails.application.config.max_lifetime

+        self.created_at    = session[:created_at]

+        self.ip			   = IPAddr.new(session[:ip]).to_i

+        self.user_id       = user

-		self.create!(:token 		=> session[:token],

-					 :date_expiring	=> date_expiring,

-					 :created_at	=> session[:created_at],

-					 :ip			=> IPAddr.new(session[:ip]).to_i)

-	end

+        save

+    end

-	def self.remove_old_session(token)

-		self.delete_all(token: token)

-	end

+	#def self.remove_old_session(token)

+	#	self.delete_all(token: token)

+	#end

 	private

@@ -1,5 +1,6 @@

 class User

 	include Mongoid::Document

+    field :id, type: Moped::BSON::ObjectId

 	field :jid, type: String

 end

\ No newline at end of file