put user on hold if there is no email or phone identity yet

steemit · Jun 26, 2017 · 2d38de9 · 2d38de9
1 parent 9dcb220
commit 2d38de9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/admin/user.rb b/app/admin/user.rb
@@ -221,9 +221,11 @@ def auto_approve_everyone
         next unless user.account_status == 'waiting'
         next unless user.account
         eid = user.email_identity
-        next unless eid
         pid = user.phone_identity
-        next unless pid
+        if !eid or !pid
+            user.putonhold!
+            next
+        end
         if eid.verified and pid.verified
           result = user.approve
           if result[:error]

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -159,8 +159,8 @@ def approve
           },
           "template_id": "#{ENV['SDC_SENDGRID_APPROVETEMPLATE']}"
         }})
-        sg = SendGrid::API.new(api_key: ENV['SDC_SENDGRID_API_KEY'])
         if Rails.env.production?
+          sg = SendGrid::API.new(api_key: ENV['SDC_SENDGRID_API_KEY'])        
           response = sg.client.mail._("send").post(request_body: data)
           if response.status_code.to_i >= 300
             logger.error 'SendGrid error', response.inspect