Fix confirmation email link

Author: David Revelo

app/helpers/graphql_devise/mailer_helper.rb

@@ -1,15 +1,15 @@
 module GraphqlDevise
   module MailerHelper
-    def confirmation_query(token:, config:, redirect_url:)
+    def confirmation_query(resource_name)
+      name = "#{resource_name.camelize(:lower)}ConfirmAccount"
       raw = <<-GRAPHQL
-        confirmAccount($token:ID!,$clientConfig:String,redirect:String!){
-          userConfirmAccount(token:$token,clientConfig:$clientConfig,redirect:$redirect
-            ){
-            success,errors
+        query($token:String!,$redirect:String!){
+          #{name}(confirmationToken:$token,redirectUrl:$redirect){
+            email
           }
-        }&variables={token:"#{token}",clientConfig:"#{config}",redirect:"#{redirect_url}"}
+        }
       GRAPHQL
-      ERB::Util.url_encode(raw.gsub("\n", '').gsub(' ', ''))
+      raw.delete("\n").delete(' ')
     end
   end
 end

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

@@ -2,4 +2,4 @@
 
 <p><%= t '.confirm_link_msg' %> </p>
 
-<p><%= link_to t('.confirm_account_link'), api_v1_graphql_auth_url, query: confirmation_query(token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url']).html_safe %></p>
+<p><%= link_to t('.confirm_account_link'), url_for(controller: 'graphql_devise/graphql', action: :auth, query: confirmation_query(@resource.class.to_s).html_safe, variables: {token: @token, redirect: message['redirect-url']}) %></p>

spec/requests/mutations/sign_up_spec.rb

@@ -45,9 +45,13 @@
         }
       )
 
-      email = ActionMailer::Base.deliveries.last
-      query = ERB::Util.url_encode("confirmAccount($token:ID!,$clientConfig:String,redirect:String!){userConfirmAccount(token:$token,clientConfig:$clientConfig,redirect:$redirect){success,errors}}&variables={token:\"#{user.confirmation_token}\",clientConfig:\"default\",redirect:\"#{redirect}\"}").html_safe
-      expect(email.body.encoded).to match(/query="#{query}"/)
+      email = Nokogiri::HTML(ActionMailer::Base.deliveries.last.body.encoded)
+      link  = email.css('a').first
+
+      expect do
+        get link['href']
+        user.reload
+      end.to change { user.active_for_authentication? }.to(true)
     end
   end