Merge branch 'bvl-display-username-instead-of-fullname' into 'master'v7.1.3

Display the username instead of fullname

Closes #131

See merge request gitlab-org/gitlab-shell!204

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index b38fefe..9644cf4 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -18,7 +18,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
   API_COMMANDS = %w(2fa_recovery_codes).freeze
   GL_PROTOCOL = 'ssh'.freeze
 
-  attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access, :username
+  attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access
   attr_reader :repo_path
 
   def initialize(key_id)
@@ -196,8 +196,14 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
     end
   end
 
+  def username_from_discover
+    return nil unless user && user['username']
+
+    "@#{user['username']}"
+  end
+
   def username
-    user && user['name'] || 'Anonymous'
+    @username ||= username_from_discover || 'Anonymous'
   end
 
   # User identifier to be used in log messages.