Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'10-0-stable-prepare-rc3

Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider

Closes #37845

See merge request gitlab-org/gitlab-ce!14263

2 files changed, 4 insertions, 5 deletions

diff --git a/lib/gitlab/o_auth/auth_hash.rb b/lib/gitlab/o_auth/auth_hash.rb
index 1f331b1e91d..5b5ed449f94 100644
--- a/lib/gitlab/o_auth/auth_hash.rb
+++ b/lib/gitlab/o_auth/auth_hash.rb
@@ -13,7 +13,7 @@ module Gitlab
       end
 
       def provider
-        @provider ||= Gitlab::Utils.force_utf8(auth_hash.provider.to_s)
+        @provider ||= auth_hash.provider.to_s
       end
 
       def name
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
index d5f4da3ce36..dbcc200b90b 100644
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe Gitlab::OAuth::AuthHash do
+  let(:provider) { 'ldap'.freeze }
   let(:auth_hash) do
     described_class.new(
       OmniAuth::AuthHash.new(
-        provider: provider_ascii,
+        provider: provider,
         uid: uid_ascii,
         info: info_hash
       )
@@ -20,7 +21,6 @@ describe Gitlab::OAuth::AuthHash do
   let(:last_name_raw) { "K\xC3\xBC\xC3\xA7\xC3\xBCk" }
   let(:name_raw) { "Onur K\xC3\xBC\xC3\xA7\xC3\xBCk" }
 
-  let(:provider_ascii) { 'ldap'.force_encoding(Encoding::ASCII_8BIT) }
   let(:uid_ascii) { uid_raw.force_encoding(Encoding::ASCII_8BIT) }
   let(:email_ascii) { email_raw.force_encoding(Encoding::ASCII_8BIT) }
   let(:nickname_ascii) { nickname_raw.force_encoding(Encoding::ASCII_8BIT) }
@@ -28,7 +28,6 @@ describe Gitlab::OAuth::AuthHash do
   let(:last_name_ascii) { last_name_raw.force_encoding(Encoding::ASCII_8BIT) }
   let(:name_ascii) { name_raw.force_encoding(Encoding::ASCII_8BIT) }
 
-  let(:provider_utf8) { provider_ascii.force_encoding(Encoding::UTF_8) }
   let(:uid_utf8) { uid_ascii.force_encoding(Encoding::UTF_8) }
   let(:email_utf8) { email_ascii.force_encoding(Encoding::UTF_8) }
   let(:nickname_utf8) { nickname_ascii.force_encoding(Encoding::UTF_8) }
@@ -46,7 +45,7 @@ describe Gitlab::OAuth::AuthHash do
   end
 
   context 'defaults' do
-    it { expect(auth_hash.provider).to eql provider_utf8 }
+    it { expect(auth_hash.provider).to eq provider }
     it { expect(auth_hash.uid).to eql uid_utf8 }
     it { expect(auth_hash.email).to eql email_utf8 }
     it { expect(auth_hash.username).to eql nickname_utf8 }