Merge pull request #313 from zooniverse/email-verification-2

Email verification: Require confirmation to invoke message & conversation workers

app/controllers/concerns/action_rescuing.rb

@@ -29,6 +29,7 @@ module ActionRescuing
     rescue_from Talk::BannedUserError, with: :forbidden
     rescue_from Talk::BlockedUserError, with: :forbidden
     rescue_from Talk::UserBlockedError, with: :forbidden
+    rescue_from Talk::UserUnconfirmedError, with: :forbidden
     rescue_from OauthAccessToken::ExpiredError, with: :unauthorized
     rescue_from OauthAccessToken::RevokedError, with: :unauthorized
   end

app/services/conversation_service.rb

@@ -13,6 +13,7 @@ def build_user_conversations_for(conversation)
 
     raise Talk::BlockedUserError.new if blocked?
     raise Talk::UserBlockedError.new if blocking?
+    raise Talk::UserUnconfirmedError.new if unconfirmed?
     recipient_ids.each do |recipient_id|
       conversation.user_conversations.build user_id: recipient_id, is_unread: true
     end
@@ -48,4 +49,8 @@ def blocked?
   def blocking?
     BlockedUser.blocked_by(current_user.id).blocking(recipient_ids).exists?
   end
+
+  def unconfirmed?
+    current_user.confirmed_at.nil?
+  end
 end

app/services/message_service.rb

@@ -6,6 +6,7 @@ def build
       built.user_ip = user_ip
       raise Talk::BlockedUserError.new if blocked?
       raise Talk::UserBlockedError.new if blocking?
+      raise Talk::UserUnconfirmedError.new if unconfirmed?
     end
   end
 
@@ -19,6 +20,11 @@ def blocking?
     BlockedUser.blocked_by(current_user.id).blocking(recipient_ids).exists?
   end
 
+  def unconfirmed?
+    return false unless resource.conversation
+    current_user.confirmed_at.nil?
+  end
+
   def recipient_ids
     resource.conversation.participant_ids - [current_user.id]
   end

config/application.rb

@@ -31,6 +31,13 @@ def message
     alias_method :to_s, :message
   end
 
+  class UserUnconfirmedError < StandardError
+    def message
+      'You must confirm your account'
+    end
+    alias_method :to_s, :message
+  end
+
   class InvalidParameterError < StandardError
     def initialize(param, expected, actual)
       @param = param

spec/services/conversation_service_spec.rb

@@ -69,6 +69,13 @@
           expect{ service.build }.to raise_error Talk::UserBlockedError
         end
       end
+
+      context 'when the sender is unconfirmed' do
+        it 'should fail' do
+          current_user.confirmed_at = nil
+          expect{ service.build }.to raise_error Talk::UserUnconfirmedError
+        end
+      end
     end
   end
 end

spec/services/message_service_spec.rb

@@ -33,6 +33,13 @@
           expect{ service.build }.to raise_error Talk::UserBlockedError
         end
       end
+
+      context 'when the user is unconfirmed' do
+        it 'should fail' do
+          current_user.confirmed_at = nil
+          expect{ service.build }.to raise_error Talk::UserUnconfirmedError
+        end
+      end
     end
 
     context 'creating the message' do