Added ResendConfirmation GraphQL method. (#35)

* Updated documentation for the mutation and query graphql methods.

* Added ResendConfirmation GraphQL method.

* Fixed a misspelling

* Add github templates for issues (#36)

* Merged master into resend_confirmation.

* Added ResendConfirmation GraphQL method.

* Pulled upstream master and then rebased master on send_confirmation

* Pulled upstream master and rebased master in resend_confirmation

* Removed rebased code to seperate the Resend Confirmation changes.

* Removed rebased code to seperate the Resend Confirmation changes.

* Code review fixes and test enhancements per @00dav00's request.

* Code review requests per @mcelicalderon and @00dav00

* Moved reliance for Resend Instructions from Devise to Graphql Devise.

* Some RSpec styling changes per @mcelicalderon's request.

Author: aarona

.github/ISSUE_TEMPLATE/bug_report.md

@@ -156,24 +156,23 @@ The install generator can do this for you because it executes DTA installer.
 See [Installation](#Installation) for details.
 
 ### Making Requests
-Here is a list of the available mutations and queries assuming your mounted model is `User`.
+Here is a list of the available mutations and queries assuming your mounted model
+is `User`.
 
 #### Mutations
-1. `userLogin(email: String!, password: String!): UserLoginPayload`
-1. `userLogout: UserLogoutPayload`
-1. `userSignUp(email: String!, password: String!, passwordConfirmation: String!, confirmSuccessUrl: String): UserSignUpPayload`
-
-   The parameter `confirmSuccessUrl` is optional unless you are using the `confirmable` plugin from Devise in your `resource`'s model. If you have `confirmable` set up, you will have to provide it unless you have `config.default_confirm_success_url` set in `config/initializers/devise_token_auth.rb`.
-1. `userUpdatePassword(password: String!, passwordConfirmation: String!, currentPassword: String): UserUpdatePasswordPayload`
-
-    The parameter `currentPassword` is optional if you have `config.check_current_password_before_update` set to false (disabled by default) or the `resource` model supports the `recoverable` Devise plugin and the `resource`'s `allow_password_change` attribute is set to true.
-1. `userSendResetPassword(email: String!, redirectUrl: String!): UserSendReserPasswordPayload`
-
+1. userLogin
+1. userLogout
+1. userSignUp
+1. userUpdatePassword
+1. userSendPasswordReset
+1. `userResendConfirmation(email: String!, redirectUrl: String!): UserResendConfirmationPayload`
+
+    The `UserResendConfirmationPayload` will return the `authenticable` resource that was sent the confirmation instructions but also has a `message: String!` that can be used to notify a user what to do after the instructions were sent to them and a `success: Boolean!` to indicate success.
 #### Queries
-1. `userConfirmAccount(confirmationToken: String!, redirectUrl: String!): User`
-1. `userCheckPasswordToken(resetPasswordToken: String!, redirectUrl: String): User`
+1. userConfirmAccount
+1. userCheckPasswordToken
 
-The reason for having two queries is that these two are going to be accessed when clicking on
+The reason for having 2 queries is that these 2 are going to be accessed when clicking on
 the confirmation and reset password email urls. There is no limitation for making mutation
 requests using the `GET` method on the Rails side, but looks like there might be a limitation
 on the [Apollo Client](https://www.apollographql.com/docs/apollo-server/v1/requests/#get-requests).

.github/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,32 @@
+module GraphqlDevise
+  module Mutations
+    class ResendConfirmation < Base
+      argument :email,        String, required: true, prepare: ->(email, _) { email.downcase }
+      argument :redirect_url, String, required: true
+      
+      field :message, String, null: false
+      
+      def resolve(email:, redirect_url:)
+        resource = controller.find_resource(:uid, email)
+
+        if resource
+          yield resource if block_given?
+
+          raise_user_error(I18n.t('errors.messages.already_confirmed')) if resource.confirmed?
+
+          resource.send_confirmation_instructions({
+            redirect_url: redirect_url,
+            template_path: ['graphql_devise/mailer']
+          })
+
+          {
+            authenticable: resource,
+            message: I18n.t('graphql_devise.confirmations.send_instructions', email: email)
+          }
+        else
+          raise_user_error(I18n.t('graphql_devise.confirmations.user_not_found', email: email))
+        end
+      end
+    end
+  end
+end

.github/ISSUE_TEMPLATE/question.md

@@ -1,5 +1,5 @@
 <p><%= t(:welcome).capitalize + ' ' + @email %>!</p>
 
-<p><%= t '.confirm_link_msg' %> </p>
+<p><%= t '.confirm_link_msg' %></p>
 
 <p><%= link_to t('.confirm_account_link'), url_for(controller: 'graphql_devise/graphql', action: :auth, **confirmation_query(resource_name: @resource.class.to_s, redirect_url: message['redirect-url'], token: @token)) %></p>

README.md

@@ -19,6 +19,14 @@ en:
       not_confirmed: "A confirmation email was sent to your account at '%{email}'. You must follow the instructions in the email before your account can be activated"
     confirmations:
       invalid_token: "Invalid confirmation token. Please try again"
+      user_not_found: "Unable to find user with email '%{email}'."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
     mailer:
+      confirmation_instructions:
+        confirm_link_msg: "You can confirm your account email through the link below:"
+        confirm_account_link: "Confirm my account"
       unlock_instructions:
         account_lock_msg: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
+  errors:
+    messages:
+      already_confirmed: "Email was already confirmed, please try signing in"

app/graphql/graphql_devise/mutations/resend_confirmation.rb

@@ -14,7 +14,8 @@ def mount_graphql_devise_for(resource, opts = {})
         logout:              GraphqlDevise::Mutations::Logout,
         sign_up:             GraphqlDevise::Mutations::SignUp,
         update_password:     GraphqlDevise::Mutations::UpdatePassword,
-        send_password_reset: GraphqlDevise::Mutations::SendPasswordReset
+        send_password_reset: GraphqlDevise::Mutations::SendPasswordReset,
+        resend_confirmation: GraphqlDevise::Mutations::ResendConfirmation
       }.freeze
       default_queries = {
         confirm_account:      GraphqlDevise::Resolvers::ConfirmAccount,

app/views/graphql_devise/mailer/confirmation_instructions.html.erb

@@ -55,7 +55,6 @@ en:
       unlocked: "Your account has been unlocked successfully. Please sign in to continue."
   errors:
     messages:
-      already_confirmed: "was already confirmed, please try signing in"
       confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       expired: "has expired, please request a new one"
       not_found: "not found"

config/locales/en.yml

@@ -0,0 +1,83 @@
+require 'rails_helper'
+
+RSpec.describe 'Resend confirmation' do
+  include_context 'with graphql query request'
+
+  let(:user)     { create(:user, confirmed_at: nil) }
+  let(:email)    { user.email }
+  let(:id)       { user.id }
+  let(:redirect) { Faker::Internet.url }
+  let(:query) do
+    <<-GRAPHQL
+      mutation {
+        userResendConfirmation(
+          email:"#{email}",
+          redirectUrl:"#{redirect}"
+        ) {
+          message
+          authenticable {
+            id
+            email
+          }
+        }
+      }
+    GRAPHQL
+  end
+
+  context 'when params are correct' do
+    it 'sends an email to the user with confirmation url and returns a success message' do
+      expect { post_request }.to change(ActionMailer::Base.deliveries, :count).by(1)
+      expect(json_response[:data][:userResendConfirmation]).to include(
+        authenticable: {
+          id: id,
+          email: email
+        },
+        message: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      )
+      
+      email = Nokogiri::HTML(ActionMailer::Base.deliveries.last.body.encoded)
+      link  = email.css('a').first
+      confirm_link_msg_text = email.css('p')[1].inner_html
+      confirm_account_link_text = link.inner_html
+
+      expect(confirm_link_msg_text).to eq("You can confirm your account email through the link below:")
+      expect(confirm_account_link_text).to eq("Confirm my account")
+
+      # TODO: Move to feature spec
+      expect do
+        get link['href']
+        user.reload
+      end.to change(user, :confirmed_at).from(NilClass).to(ActiveSupport::TimeWithZone)
+    end
+
+    context 'when the user has already been confirmed' do
+      before { user.confirm }
+
+      it 'does *NOT* send an email and raises an error' do
+        expect { post_request }.to not_change(ActionMailer::Base.deliveries, :count)
+        expect(json_response[:data][:userResendConfirmation]).to be_nil
+        expect(json_response[:errors]).to contain_exactly(
+          hash_including(
+            message: "Email was already confirmed, please try signing in",
+            extensions: { code: 'USER_ERROR' }
+          )
+        )
+      end
+    end
+  end
+
+  context "when the email isn't in the system" do
+    let(:email) { 'nothere@gmail.com' }
+
+    it 'does *NOT* send an email and raises an error' do
+      expect { post_request }.to not_change(ActionMailer::Base.deliveries, :count)
+      expect(json_response[:data][:userResendConfirmation]).to be_nil
+      expect(json_response[:errors]).to contain_exactly(
+        hash_including(
+          message: "Unable to find user with email '#{email}'.",
+          extensions: { code: 'USER_ERROR' }
+        )
+      )
+    end
+  end
+end