diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb index fe691314b73e28ce9e57e450531c33a2095f91ab..f6de47eaa7dc245b8cd0d49fd86cd11847ea7c71 100644 --- a/app/controllers/concerns/authentication.rb +++ b/app/controllers/concerns/authentication.rb @@ -11,9 +11,9 @@ module Authentication end def authenticate_user! - # user_dict = { "labs_user_id" => decrypt_header(request.headers["X-Auth-Newseye-Token"])[0], - # "labs_user_name" => decrypt_header(request.headers["X-Auth-Newseye-Token"])[1] } - user_dict = { "labs_user_id" => "42", "labs_user_name" => "dummyuser" } + user_dict = { "labs_user_id" => decrypt_header(request.headers["X-Auth-Newseye-Token"])[0], + "labs_user_name" => decrypt_header(request.headers["X-Auth-Newseye-Token"])[1] } + # user_dict = { "labs_user_id" => "42", "labs_user_name" => "dummyuser" } @user = User.find_by(labs_user_id: user_dict["labs_user_id"]) if @user if !session[:current_user_id] @@ -37,8 +37,8 @@ module Authentication private def current_user - # Current.user ||= User.find_by(labs_user_id: decrypt_header(request.headers["X-Auth-Newseye-Token"])[0]) - Current.user ||= User.find_by(labs_user_id: "42") + Current.user ||= User.find_by(labs_user_id: decrypt_header(request.headers["X-Auth-Newseye-Token"])[0]) + # Current.user ||= User.find_by(labs_user_id: "42") end def decrypt_header(token)