diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-02-13 14:39:11 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-02-13 14:39:11 +0300 |
commit | 161d15541a65ba167830f9a9bf5d181d0c5f4d77 (patch) | |
tree | d1dc93fd8fedb71219e54d0da1d70f68e1ca9f0d /app | |
parent | 529188e4788991961796b1b6131389072ee61efb (diff) |
Prevent autogenerated OAuth username to clash with existing namespace.
Diffstat (limited to 'app')
-rw-r--r-- | app/models/namespace.rb | 4 | ||||
-rw-r--r-- | app/models/user.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index ba0b2b71cf9..2c7ed376265 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -44,6 +44,10 @@ class Namespace < ActiveRecord::Base scope :root, -> { where('type IS NULL') } + def self.by_path(path) + where('lower(path) = :value', value: path.downcase).first + end + def self.search(query) where("name LIKE :query OR path LIKE :query", query: "%#{query}%") end diff --git a/app/models/user.rb b/app/models/user.rb index d7f688ec138..a97678999bc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -252,7 +252,7 @@ class User < ActiveRecord::Base counter = 0 base = username - while by_login(username).present? + while User.by_login(username).present? || Namespace.by_path(username).present? counter += 1 username = "#{base}#{counter}" end @@ -290,7 +290,8 @@ class User < ActiveRecord::Base def namespace_uniq namespace_name = self.username - if Namespace.find_by(path: namespace_name) + existing_namespace = Namespace.by_path(namespace_name) + if existing_namespace && existing_namespace != self.namespace self.errors.add :username, "already exists" end end |