WIP (#15222)

3 years ago · af8fe6e1e9
parent 741d0952b1
commit af8fe6e1e9
2 changed files with 1 additions and 2 deletions
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@ -68,7 +68,6 @@ module Omniauthable
    def user_params_from_auth(email, auth)
      {
        email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
-        password: Devise.friendly_token[0, 20],
        agreement: true,
        external: true,
        account_attributes: {
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -468,7 +468,7 @@ class User < ApplicationRecord
  end

  def validate_email_dns?
-    email_changed? && !(Rails.env.test? || Rails.env.development?)
+    email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
  end

  def invite_text_required?