Merge pull request #7422 from VitaliySerov/master

Change gem login message to clear up that username can be also used

(cherry picked from commit 0721762)

Author: deivid-rodriguez

lib/rubygems/gemcutter_utilities.rb

@@ -130,12 +130,12 @@ def update_scope(scope)
 
     say "The existing key doesn't have access of #{scope} on #{pretty_host}. Please sign in to update access."
 
-    email    = ask "   Email: "
-    password = ask_for_password "Password: "
+    identifier = ask "Username/email: "
+    password   = ask_for_password "      Password: "
 
     response = rubygems_api_request(:put, "api/v1/api_key",
                                     sign_in_host, scope: scope) do |request|
-      request.basic_auth email, password
+      request.basic_auth identifier, password
       request["OTP"] = otp if otp
       request.body = Gem::URI.encode_www_form({ api_key: api_key }.merge(update_scope_params))
     end
@@ -159,23 +159,23 @@ def sign_in(sign_in_host = nil, scope: nil)
     say "Don't have an account yet? " \
         "Create one at #{sign_in_host}/sign_up"
 
-    email = ask "   Email: "
-    password = ask_for_password "Password: "
+    identifier = ask "Username/email: "
+    password   = ask_for_password "      Password: "
     say "\n"
 
     key_name     = get_key_name(scope)
     scope_params = get_scope_params(scope)
-    profile      = get_user_profile(email, password)
+    profile      = get_user_profile(identifier, password)
     mfa_params   = get_mfa_params(profile)
     all_params   = scope_params.merge(mfa_params)
     warning      = profile["warning"]
-    credentials  = { email: email, password: password }
+    credentials  = { identifier: identifier, password: password }
 
     say "#{warning}\n" if warning
 
     response = rubygems_api_request(:post, "api/v1/api_key",
                                     sign_in_host, credentials: credentials, scope: scope) do |request|
-      request.basic_auth email, password
+      request.basic_auth identifier, password
       request["OTP"] = otp if otp
       request.body = Gem::URI.encode_www_form({ name: key_name }.merge(all_params))
     end
@@ -295,7 +295,7 @@ def webauthn_verification_url(credentials)
       if credentials.empty?
         request.add_field "Authorization", api_key
       else
-        request.basic_auth credentials[:email], credentials[:password]
+        request.basic_auth credentials[:identifier], credentials[:password]
       end
     end
     response.is_a?(Gem::Net::HTTPSuccess) ? response.body : nil
@@ -346,11 +346,11 @@ def default_host?
     host == Gem::DEFAULT_HOST
   end
 
-  def get_user_profile(email, password)
+  def get_user_profile(identifier, password)
     return {} unless default_host?
 
     response = rubygems_api_request(:get, "api/v1/profile/me.yaml") do |request|
-      request.basic_auth email, password
+      request.basic_auth identifier, password
     end
 
     with_response response do |resp|

test/rubygems/test_gem_commands_owner_command.rb

@@ -471,7 +471,7 @@ def test_remove_owners_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of remove_owner on RubyGems.org. Please sign in to update access."
     assert_match access_notice, @stub_ui.output
-    assert_match "Email:", @stub_ui.output
+    assert_match "Username/email:", @stub_ui.output
     assert_match "Password:", @stub_ui.output
     assert_match "Added remove_owner scope to the existing API key", @stub_ui.output
     assert_match response_success, @stub_ui.output
@@ -495,7 +495,7 @@ def test_add_owners_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of add_owner on RubyGems.org. Please sign in to update access."
     assert_match access_notice, @stub_ui.output
-    assert_match "Email:", @stub_ui.output
+    assert_match "Username/email:", @stub_ui.output
     assert_match "Password:", @stub_ui.output
     assert_match "Added add_owner scope to the existing API key", @stub_ui.output
     assert_match response_success, @stub_ui.output

test/rubygems/test_gem_commands_push_command.rb

@@ -547,7 +547,7 @@ def test_sending_gem_unathorized_api_key_with_mfa_enabled
     access_notice = "The existing key doesn't have access of push_rubygem on https://rubygems.example. Please sign in to update access."
     assert_match mfa_notice, @ui.output
     assert_match access_notice, @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Added push_rubygem scope to the existing API key", @ui.output
     assert_match response_success, @ui.output
@@ -588,7 +588,7 @@ def test_sending_gem_with_no_local_creds
     mfa_notice = "You have enabled multi-factor authentication. Please enter OTP code."
     assert_match mfa_notice, @ui.output
     assert_match "Enter your https://rubygems.example credentials.", @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Signed in with API key:", @ui.output
     assert_match response_success, @ui.output

test/rubygems/test_gem_commands_yank_command.rb

@@ -291,7 +291,7 @@ def test_yank_gem_unathorized_api_key
 
     access_notice = "The existing key doesn't have access of yank_rubygem on http://example. Please sign in to update access."
     assert_match access_notice, @ui.output
-    assert_match "Email:", @ui.output
+    assert_match "Username/email:", @ui.output
     assert_match "Password:", @ui.output
     assert_match "Added yank_rubygem scope to the existing API key", @ui.output
     assert_match response_success, @ui.output