WIP (mastodon#15222)

glix · Mar 19, 2021 · af8fe6e · af8fe6e
1 parent 741d095
commit af8fe6e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
@@ -68,7 +68,6 @@ def create_for_oauth(auth)
     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
@@ -468,7 +468,7 @@ def needs_feed_update?
   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?