graphql_devise 0.12.2 → 0.13.3

data/app/controllers/graphql_devise/graphql_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'graphql_devise/application_controller'
 
 module GraphqlDevise

data/app/helpers/graphql_devise/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module ApplicationHelper
   end

data/app/helpers/graphql_devise/mailer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MailerHelper
     def confirmation_query(resource_name:, token:, redirect_url:)

data/app/models/graphql_devise/concerns/model.rb

@@ -1,5 +1,21 @@
+# frozen_string_literal: true
+
+require 'graphql_devise/model/with_email_updater'
+
 module GraphqlDevise
   module Concerns
     Model = DeviseTokenAuth::Concerns::User
+
+    Model.module_eval do
+      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
+    end
   end
 end

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

@@ -2,4 +2,4 @@
 
 <p><%= t('.confirm_link_msg') %></p>
 
-<p><%= link_to t('.confirm_account_link'), url_for(controller: message['controller'], action: message['action'], **confirmation_query(resource_name: @resource.class.to_s, redirect_url: message['redirect-url'], token: @token)) %></p>
+<p><%= link_to t('.confirm_account_link'), "#{message['schema_url']}?#{confirmation_query(resource_name: @resource.class.to_s, redirect_url: message['redirect-url'], token: @token).to_query}" %></p>

data/app/views/graphql_devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p><%= t('.request_reset_link_msg') %></p>
 
-<p><%= link_to t('.password_change_link'), url_for(controller: message['controller'], action: message['action'], **password_reset_query(token: @token, redirect_url: message['redirect-url'], resource_name: @resource.class.to_s)) %></p>
+<p><%= link_to t('.password_change_link'), "#{message['schema_url']}?#{password_reset_query(token: @token, redirect_url: message['redirect-url'], resource_name: @resource.class.to_s).to_query}" %></p>
 
 <p><%= t('.ignore_mail_msg') %></p>
 <p><%= t('.no_changes_msg') %></p>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 GraphqlDevise::Engine.routes.draw do
   # Required as Devise forces routes to reload on eager_load
   unless GraphqlDevise.schema_loaded?

data/graphql_devise.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 1.11.0'
+  spec.add_dependency 'graphql', '>= 1.8', '< 1.12.0'
   spec.add_dependency 'rails', '>= 4.2', '< 6.2'
 
   spec.add_development_dependency 'appraisal'

data/lib/generators/graphql_devise/install_generator.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.expand_path('templates', __dir__)
 
     argument :user_class, type: :string, default: 'User'
-    argument :mount_path, type: :string, default: 'auth'
+    argument :mount_path, type: :string, default: 'graphql_auth'
 
     class_option :mount, type: :string, default: 'separate_route'
 

data/lib/graphql_devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'graphql'
 require 'devise_token_auth'

data/lib/graphql_devise/concerns/controller_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Concerns
     module ControllerMethods

data/lib/graphql_devise/default_operations/mutations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'graphql_devise/mutations/base'
 require 'graphql_devise/mutations/login'
 require 'graphql_devise/mutations/logout'

data/lib/graphql_devise/default_operations/resolvers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'graphql_devise/resolvers/base'
 require 'graphql_devise/resolvers/check_password_token'
 require 'graphql_devise/resolvers/confirm_account'

data/lib/graphql_devise/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'graphql_devise/rails/routes'
 
 module GraphqlDevise

data/lib/graphql_devise/errors/authentication_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class AuthenticationError < ExecutionError
     def to_h

data/lib/graphql_devise/errors/detailed_user_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class DetailedUserError < ExecutionError
     def initialize(message, errors:)

data/lib/graphql_devise/errors/error_codes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   ERROR_CODES = {
     user_error:           'USER_ERROR',

data/lib/graphql_devise/errors/execution_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class ExecutionError < GraphQL::ExecutionError
   end

data/lib/graphql_devise/errors/user_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class UserError < ExecutionError
     def to_h

data/lib/graphql_devise/model/with_email_updater.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module Model
+    class WithEmailUpdater
+      def initialize(resource, attributes)
+        @attributes = attributes
+        @resource   = resource
+      end
+
+      def call
+        resource_attributes = @attributes.except(:schema_url, :confirmation_success_url)
+        return @resource.update(resource_attributes) unless requires_reconfirmation?(resource_attributes)
+
+        @resource.assign_attributes(resource_attributes)
+
+        if @resource.email == email_in_database
+          return @resource.save
+        elsif required_reconfirm_attributes?
+          return false unless @resource.valid?
+
+          store_unconfirmed_email
+          saved = @resource.save
+          send_confirmation_instructions(saved)
+
+          saved
+        else
+          raise(
+            GraphqlDevise::Error,
+            'Method `update_with_email` requires attributes `confirmation_success_url` and `schema_url` for email reconfirmation to work'
+          )
+        end
+      end
+
+      private
+
+      def required_reconfirm_attributes?
+        @attributes[:schema_url].present? &&
+          (@attributes[:confirmation_success_url].present? || DeviseTokenAuth.default_confirm_success_url.present?)
+      end
+
+      def requires_reconfirmation?(resource_attributes)
+        resource_attributes.key?(:email) &&
+          @resource.devise_modules.include?(:confirmable) &&
+          @resource.respond_to?(:unconfirmed_email=)
+      end
+
+      def store_unconfirmed_email
+        @resource.unconfirmed_email  = @resource.email
+        @resource.confirmation_token = nil
+        @resource.email              = email_in_database
+        @resource.send(:generate_confirmation_token)
+      end
+
+      def email_in_database
+        if Devise.activerecord51?
+          @resource.email_in_database
+        else
+          @resource.email_was
+        end
+      end
+
+      def send_confirmation_instructions(saved)
+        return unless saved
+
+        @resource.send_confirmation_instructions(
+          redirect_url:  @attributes[:confirmation_success_url] || DeviseTokenAuth.default_confirm_success_url,
+          template_path: ['graphql_devise/mailer'],
+          schema_url:    @attributes[:schema_url]
+        )
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'operation_preparers/gql_name_setter'
 require_relative 'operation_preparers/mutation_field_setter'
 require_relative 'operation_preparers/resolver_type_setter'

data/lib/graphql_devise/mount_method/operation_preparers/custom_operation_preparer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_preparers/default_operation_preparer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_preparers/gql_name_setter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_preparers/mutation_field_setter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_preparers/resolver_type_setter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_preparers/resource_name_setter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OperationPreparers

data/lib/graphql_devise/mount_method/operation_sanitizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     class OperationSanitizer

data/lib/graphql_devise/mount_method/option_sanitizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'supported_options'
 
 module GraphqlDevise

data/lib/graphql_devise/mount_method/option_sanitizers/array_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionSanitizers

data/lib/graphql_devise/mount_method/option_sanitizers/class_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionSanitizers

data/lib/graphql_devise/mount_method/option_sanitizers/hash_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionSanitizers

data/lib/graphql_devise/mount_method/option_sanitizers/string_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionSanitizers

data/lib/graphql_devise/mount_method/option_validators/provided_operations_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'supported_operations_validator'
 
 module GraphqlDevise

data/lib/graphql_devise/mount_method/option_validators/skip_only_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionValidators

data/lib/graphql_devise/mount_method/option_validators/supported_operations_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module MountMethod
     module OptionValidators

data/lib/graphql_devise/mount_method/options_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'option_validators/skip_only_validator'
 require_relative 'option_validators/provided_operations_validator'
 

data/lib/graphql_devise/mount_method/supported_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'option_sanitizers/array_checker'
 require_relative 'option_sanitizers/hash_checker'
 require_relative 'option_sanitizers/string_checker'

data/lib/graphql_devise/mutations/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'devise_token_auth/version'
 
 module GraphqlDevise

data/lib/graphql_devise/mutations/login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class Login < Base

data/lib/graphql_devise/mutations/logout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class Logout < Base

data/lib/graphql_devise/mutations/resend_confirmation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class ResendConfirmation < Base
@@ -20,7 +22,7 @@ module GraphqlDevise
           resource.send_confirmation_instructions(
             redirect_url:  redirect_url,
             template_path: ['graphql_devise/mailer'],
-            **controller.params.permit('controller', 'action').to_h.symbolize_keys
+            schema_url:    controller.full_url_without_params
           )
 
           { message: I18n.t('graphql_devise.confirmations.send_instructions', email: email) }

data/lib/graphql_devise/mutations/send_password_reset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class SendPasswordReset < Base
@@ -17,7 +19,7 @@ module GraphqlDevise
             provider:      'email',
             redirect_url:  redirect_url,
             template_path: ['graphql_devise/mailer'],
-            **controller.params.permit('controller', 'action').to_h.symbolize_keys
+            schema_url:    controller.full_url_without_params
           )
 
           if resource.errors.empty?

data/lib/graphql_devise/mutations/sign_up.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class SignUp < Base
@@ -6,6 +8,11 @@ module GraphqlDevise
       argument :password_confirmation, String, required: true
       argument :confirm_success_url,   String, required: false
 
+      field :credentials,
+            GraphqlDevise::Types::CredentialType,
+            null:        true,
+            description: 'Authentication credentials. Null if after signUp resource is not active for authentication (e.g. Email confirmation required).'
+
       def resolve(confirm_success_url: nil, **attrs)
         resource = build_resource(attrs.merge(provider: provider))
         raise_user_error(I18n.t('graphql_devise.resource_build_failed')) if resource.blank?
@@ -28,13 +35,15 @@ module GraphqlDevise
             resource.send_confirmation_instructions(
               redirect_url:  confirm_success_url,
               template_path: ['graphql_devise/mailer'],
-              **controller.params.permit('controller', 'action').to_h.symbolize_keys
+              schema_url:    controller.full_url_without_params
             )
           end
 
-          set_auth_headers(resource) if resource.active_for_authentication?
+          response_payload = { authenticatable: resource }
+
+          response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?
 
-          { authenticatable: resource }
+          response_payload
         else
           resource.try(:clean_up_passwords)
           raise_user_error_list(