Merge pull request #127 from hooktstudios/bugfix/resend-unconfirmed-email

Allow resend of confirmation with unconfirmed email

Author: 00dav00

app/models/graphql_devise/concerns/model.rb

@@ -11,8 +11,6 @@ def update_with_email(attributes = {})
         GraphqlDevise::Model::WithEmailUpdater.new(self, attributes).call
       end
 
-      private
-
       def pending_reconfirmation?
         devise_modules.include?(:confirmable) && try(:unconfirmed_email).present?
       end

lib/graphql_devise/mutations/resend_confirmation.rb

@@ -9,15 +9,14 @@ class ResendConfirmation < Base
       field :message, String, null: false
 
       def resolve(email:, redirect_url:)
-        resource = find_resource(
-          :email,
-          get_case_insensitive_field(:email, email)
-        )
+        resource = find_confirmable_resource(email)
 
         if resource
           yield resource if block_given?
 
-          raise_user_error(I18n.t('graphql_devise.confirmations.already_confirmed')) if resource.confirmed?
+          if resource.confirmed? && !resource.pending_reconfirmation?
+            raise_user_error(I18n.t('graphql_devise.confirmations.already_confirmed'))
+          end
 
           resource.send_confirmation_instructions(
             redirect_url:  redirect_url,
@@ -30,6 +29,15 @@ def resolve(email:, redirect_url:)
           raise_user_error(I18n.t('graphql_devise.confirmations.user_not_found', email: email))
         end
       end
+
+      private
+
+      def find_confirmable_resource(email)
+        email_insensitive = get_case_insensitive_field(:email, email)
+        resource = find_resource(:unconfirmed_email, email_insensitive) if resource_class.reconfirmable
+        resource ||= find_resource(:email, email_insensitive)
+        resource
+      end
     end
   end
 end

spec/requests/mutations/resend_confirmation_spec.rb

@@ -98,6 +98,29 @@
     end
   end
 
+  context 'when the email was changed' do
+    let(:email) { 'new-email@wallaceinc.com' }
+    let(:new_email) { email }
+
+    before do
+      user.class.reconfirmable = true
+      user.confirm
+      user.update_with_email(
+        email:                    new_email,
+        schema_url:               'http://localhost/test',
+        confirmation_success_url: 'https://google.com'
+      )
+    end
+
+    it 'sends new confirmation email' do
+      expect { post_request }.to change(ActionMailer::Base.deliveries, :count).by(1)
+      expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(new_email)
+      expect(json_response[:data][:userResendConfirmation]).to include(
+        message: 'You will receive an email with instructions for how to confirm your email address in a few minutes.'
+      )
+    end
+  end
+
   context "when the email isn't in the system" do
     let(:email) { 'nothere@gmail.com' }