From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 12 Oct 2020 19:18:32 +0000 (-0400)
Subject: 16989: Make sure username is valid before trying to create repo
X-Git-Tag: 2.1.0^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c2565be8a4af26ffe798d9d83d4f4119046f83b4

16989: Make sure username is valid before trying to create repo

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index f3cf4b38f0..34a123e724 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -224,11 +224,8 @@ SELECT target_uuid, perm_level
     group_perm = create_user_group_link
 
     # Add git repo
-    if repo_name.nil? && username && Rails.configuration.Users.AutoSetupNewUsersWithRepository
-      repo_name = "#{username}/#{username}"
-    end
-
-    repo_perm = if repo_name
+    repo_perm = if (!repo_name.nil? || Rails.configuration.Users.AutoSetupNewUsersWithRepository) and !username.nil?
+                  repo_name ||= "#{username}/#{username}"
                   create_user_repo_link repo_name
                 end