From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 19 Mar 2021 16:15:36 +0000 (+0100)
Subject: WIP (#15222)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=af8fe6e1e9d728a4af39941e1bde918b0ca7d204;p=mastodon.git

WIP (#15222)
---

diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 79d671d10..791a94911 100644
--- 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: {
diff --git a/app/models/user.rb b/app/models/user.rb
index b4508c2eb..5a149f573 100644
--- 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?