Commit a34f544d authored by Alex Gleason's avatar Alex Gleason

Merge branch 'unique-emails' into 'develop'

Unique emails

See merge request gab/social/gab-social!46
parents fadc08fb c3bc1c08
......@@ -39,6 +39,7 @@
# created_by_application_id :bigint(8)
# approved :boolean default(TRUE), not null
# last_read_notification :bigint(8)
# unique_email :string
#
class User < ApplicationRecord
......@@ -79,6 +80,7 @@ class User < ApplicationRecord
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? }
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
validates :unique_email, uniqueness: true
validates_with BlacklistedEmailValidator, on: :create
validates_with EmailMxValidator, if: :validate_email_dns?
validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
......@@ -94,6 +96,7 @@ class User < ApplicationRecord
scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
before_validation :sanitize_languages
before_validation :set_unique_email
before_create :set_approved
# This avoids a deprecation warning from Rails 5.1
......@@ -217,7 +220,7 @@ class User < ApplicationRecord
def allows_group_in_home_feed?
settings.group_in_home_feed
end
def token_for_app(a)
return nil if a.nil? || a.owner != self
Doorkeeper::AccessToken
......@@ -346,4 +349,10 @@ class User < ApplicationRecord
end
end
def set_unique_email
user, domain = self.email.split('@')
user = user.split('+').first
user = user.gsub('.', '') if domain == 'gmail.com'
self.unique_email = "#{user}@#{domain}"
end
end
class AddUniqueEmailToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :unique_email, :string
end
end
class AddIndexUniqueEmailOnUsers < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
def change
add_index :users, :unique_email, algorithm: :concurrently
end
end
......@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2019_12_02_004114) do
ActiveRecord::Schema.define(version: 2020_03_10_224203) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......@@ -824,11 +824,13 @@ ActiveRecord::Schema.define(version: 2019_12_02_004114) do
t.bigint "created_by_application_id"
t.boolean "approved", default: true, null: false
t.bigint "last_read_notification"
t.string "unique_email"
t.index ["account_id"], name: "index_users_on_account_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id"
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
t.index ["unique_email"], name: "index_users_on_unique_email"
end
create_table "web_push_subscriptions", force: :cascade do |t|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment