From 292e69e7089972414bc51363d22369e9a4c8ea60 Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Wed, 22 Sep 2021 14:00:34 +0200 Subject: [PATCH] B #5546: Fix Zendesk login (#1473) (cherry picked from commit f75718f2f4ea893776b78e7cf31130b019755e4a) --- src/sunstone/public/app/tabs/support-tab.js | 2 +- src/sunstone/routes/support.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/app/tabs/support-tab.js b/src/sunstone/public/app/tabs/support-tab.js index 7f3944981b..e5a6bd2915 100644 --- a/src/sunstone/public/app/tabs/support-tab.js +++ b/src/sunstone/public/app/tabs/support-tab.js @@ -83,7 +83,7 @@ define(function(require) { $(".submit_support_credentials_button", context).html(""); var data = { email : $("#support_email", this).val(), - password : $("#support_password", this).val() + password : btoa($("#support_password", this).val()) }; $.ajax({ url: "support/credentials", diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 42c89025c1..6cd047483c 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -355,7 +355,7 @@ post '/support/credentials' do end session['zendesk_email'] = body_hash['email'] - session['zendesk_password'] = body_hash['password'] + session['zendesk_password'] = Base64.decode64(body_hash['password']) zendesk_client