summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorImre Farkas <ifarkas@gitlab.com>2018-10-29 16:06:45 +0000
committerJan Provaznik <jprovaznik@gitlab.com>2018-10-29 16:06:45 +0000
commitb9652d8e4dc8544766c9371057be72cc26fe3a4b (patch)
treedd4c8407af4ef5d98a20f30069d3a348773dfbfa /app/models/user.rb
parentb5ca4ea15dee21b131b336d4189a75a283c8d1f1 (diff)
downloadgitlab-ce-b9652d8e4dc8544766c9371057be72cc26fe3a4b.tar.gz
[master] Persist only SHA digest of PersonalAccessToken#token
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index ca7fc3b058f..2b918ce5bd1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -28,7 +28,7 @@ class User < ActiveRecord::Base
ignore_column :email_provider
ignore_column :authentication_token
- add_authentication_token_field :incoming_email_token
+ add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) }
add_authentication_token_field :feed_token
default_value_for :admin, false
@@ -1464,15 +1464,6 @@ class User < ActiveRecord::Base
end
end
- def generate_token(token_field)
- if token_field == :incoming_email_token
- # Needs to be all lowercase and alphanumeric because it's gonna be used in an email address.
- SecureRandom.hex.to_i(16).to_s(36)
- else
- super
- end
- end
-
def self.unique_internal(scope, username, email_pattern, &block)
scope.first || create_unique_internal(scope, username, email_pattern, &block)
end