Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	users/app/controllers/sessions_controller.rb

2 files changed, 11 insertions, 2 deletions

diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index f79b069..7852e5c 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -8,8 +8,8 @@ class SessionsController < ApplicationController
   def create
     @user = User.find_by_param(params[:login])
     session[:handshake] = @user.initialize_auth(params['A'].hex)
-    render :json => { :B => session[:handshake].bb.to_s(16),
-      :salt => @user.password_salt }
+    User.current = @user #?
+    render :json => { :B => session[:handshake].bb.to_s(16), :salt => @user.password_salt }
   rescue RECORD_NOT_FOUND
     render :json => {:errors => {:login => ["unknown user"]}}
   end
@@ -18,6 +18,7 @@ class SessionsController < ApplicationController
     @user = User.find_by_param(params[:id])
     @server_auth = @user.authenticate!(params[:client_auth].hex, session.delete(:handshake))
     session[:user_id] = @user.id
+    User.current = @user #?
     render :json => {:M2 => @server_auth}
   rescue WRONG_PASSWORD
     session[:handshake] = nil
@@ -26,6 +27,7 @@ class SessionsController < ApplicationController
 
   def destroy
     session[:user_id] = nil
+    User.current = nil #?
     redirect_to root_path
   end
 end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index fa64f42..95ee810 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -46,4 +46,11 @@ class User < CouchRest::Model::Base
     password_verifier.hex
   end
 
+  def self.current
+    Thread.current[:user]
+  end
+  def self.current=(user)
+    Thread.current[:user] = user
+  end
+
 end