1 files changed, 78 insertions, 3 deletions

diff --git a/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
index c94f962ee93..8c50b2acac6 100644
--- a/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb
@@ -2,14 +2,19 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::OAuth::AuthHash do
+RSpec.describe Gitlab::Auth::OAuth::AuthHash, feature_category: :user_management do
   let(:provider) { 'ldap' }
   let(:auth_hash) do
     described_class.new(
       OmniAuth::AuthHash.new(
         provider: provider,
         uid: uid_ascii,
-        info: info_hash
+        info: info_hash,
+        extra: {
+          raw_info: {
+            'https://example.com/claims/username': username_claim_utf8
+          }
+        }
       )
     )
   end
@@ -24,6 +29,7 @@ RSpec.describe Gitlab::Auth::OAuth::AuthHash do
   let(:first_name_raw) { +'Onur' }
   let(:last_name_raw) { +"K\xC3\xBC\xC3\xA7\xC3\xBCk" }
   let(:name_raw) { +"Onur K\xC3\xBC\xC3\xA7\xC3\xBCk" }
+  let(:username_claim_raw) { +'onur.partner' }
 
   let(:uid_ascii) { uid_raw.force_encoding(Encoding::ASCII_8BIT) }
   let(:email_ascii) { email_raw.force_encoding(Encoding::ASCII_8BIT) }
@@ -37,6 +43,7 @@ RSpec.describe Gitlab::Auth::OAuth::AuthHash do
   let(:nickname_utf8) { nickname_ascii.force_encoding(Encoding::UTF_8) }
   let(:name_utf8) { name_ascii.force_encoding(Encoding::UTF_8) }
   let(:first_name_utf8) { first_name_ascii.force_encoding(Encoding::UTF_8) }
+  let(:username_claim_utf8) { username_claim_raw.force_encoding(Encoding::ASCII_8BIT) }
 
   let(:info_hash) do
     {
@@ -98,10 +105,16 @@ RSpec.describe Gitlab::Auth::OAuth::AuthHash do
       allow(Gitlab::Auth::OAuth::Provider).to receive(:config_for).and_return(provider_config)
     end
 
-    it 'uses the custom field for the username' do
+    it 'uses the custom field for the username within info' do
       expect(auth_hash.username).to eql first_name_utf8
     end
 
+    it 'uses the custom field for the username within extra.raw_info' do
+      provider_config['args']['gitlab_username_claim'] = 'https://example.com/claims/username'
+
+      expect(auth_hash.username).to eql username_claim_utf8
+    end
+
     it 'uses the default claim for the username when the custom claim is not found' do
       provider_config['args']['gitlab_username_claim'] = 'nonexistent'
 
@@ -146,4 +159,66 @@ RSpec.describe Gitlab::Auth::OAuth::AuthHash do
       expect(auth_hash.password.encoding).to eql Encoding::UTF_8
     end
   end
+
+  describe '#get_from_auth_hash_or_info' do
+    context 'for a key not within auth_hash' do
+      let(:auth_hash) do
+        described_class.new(
+          OmniAuth::AuthHash.new(
+            provider: provider,
+            uid: uid_ascii,
+            info: info_hash
+          )
+        )
+      end
+
+      let(:info_hash) { { nickname: nickname_ascii } }
+
+      it 'provides username from info_hash' do
+        expect(auth_hash.username).to eql nickname_utf8
+      end
+    end
+
+    context 'for a key within auth_hash' do
+      let(:auth_hash) do
+        described_class.new(
+          OmniAuth::AuthHash.new(
+            provider: provider,
+            uid: uid_ascii,
+            info: info_hash,
+            username: nickname_ascii
+          )
+        )
+      end
+
+      let(:info_hash) { { something: nickname_ascii } }
+
+      it 'provides username from auth_hash' do
+        expect(auth_hash.username).to eql nickname_utf8
+      end
+    end
+
+    context 'for a key within auth_hash extra' do
+      let(:auth_hash) do
+        described_class.new(
+          OmniAuth::AuthHash.new(
+            provider: provider,
+            uid: uid_ascii,
+            info: info_hash,
+            extra: {
+              raw_info: {
+                nickname: nickname_ascii
+              }
+            }
+          )
+        )
+      end
+
+      let(:info_hash) { { something: nickname_ascii } }
+
+      it 'provides username from auth_hash extra' do
+        expect(auth_hash.username).to eql nickname_utf8
+      end
+    end
+  end
 end