From baa4f989e0483cd22f61dcdaf59315b6b3dd63de Mon Sep 17 00:00:00 2001 From: smayer <simon.mayer@onb.ac.at> Date: Mon, 21 Nov 2022 15:45:11 +0000 Subject: [PATCH] Update authentication.rb for proper authentication on main onb branch --- app/controllers/concerns/authentication.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb index fe69131..f6de47e 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) -- GitLab