graphql_devise 0.12.3 → 0.13.0

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
@@ -28,7 +30,7 @@ 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
 

data/lib/graphql_devise/mutations/update_password.rb

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

data/lib/graphql_devise/rails/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionDispatch::Routing
   class Mapper
     def mount_graphql_devise_for(resource, options = {})

data/lib/graphql_devise/resolvers/base.rb

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

data/lib/graphql_devise/resolvers/check_password_token.rb

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

data/lib/graphql_devise/resolvers/confirm_account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Resolvers
     class ConfirmAccount < Base
@@ -13,10 +15,10 @@ module GraphqlDevise
           redirect_header_options = { account_confirmation_success: true }
 
           redirect_to_link = if controller.signed_in?(resource_name)
-            signed_in_resource.build_auth_url(
+            resource.build_auth_url(
               redirect_url,
               redirect_headers(
-                client_and_token(controller.signed_in_resource.create_token),
+                client_and_token(resource.create_token),
                 redirect_header_options
               )
             )

data/lib/graphql_devise/resolvers/dummy.rb

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

data/lib/graphql_devise/resource_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class ResourceLoader
     def initialize(resource, options = {}, routing = false)

data/lib/graphql_devise/schema.rb

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

data/lib/graphql_devise/schema_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class SchemaPlugin
     DEFAULT_NOT_AUTHENTICATED = ->(field) { raise GraphqlDevise::AuthenticationError, "#{field} field requires authentication" }
@@ -11,6 +13,7 @@ module GraphqlDevise
 
       # Must happen on initialize so operations are loaded before the types are added to the schema on GQL < 1.10
       load_fields
+      reconfigure_warden!
     end
 
     def use(schema_definition)
@@ -92,6 +95,11 @@ module GraphqlDevise
       end
     end
 
+    def reconfigure_warden!
+      Devise.class_variable_set(:@@warden_configured, nil)
+      Devise.configure_warden!
+    end
+
     def load_fields
       @resource_loaders.each do |resource_loader|
         raise Error, 'Invalid resource loader instance' unless resource_loader.instance_of?(GraphqlDevise::ResourceLoader)

data/lib/graphql_devise/types/authenticatable_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Types
     class AuthenticatableType < GraphQL::Schema::Object

data/lib/graphql_devise/types/credential_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Types
     class CredentialType < GraphQL::Schema::Object

data/lib/graphql_devise/types/mutation_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Types
     class MutationType < GraphQL::Schema::Object

data/lib/graphql_devise/types/query_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Types
     class QueryType < GraphQL::Schema::Object

data/lib/graphql_devise/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
-  VERSION = '0.12.3'.freeze
+  VERSION = '0.13.0'.freeze
 end

data/spec/dummy/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/spec/dummy/app/controllers/api/v1/graphql_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V1
     class GraphqlController < ApplicationController
@@ -23,7 +25,7 @@ module Api
         {
           operation_name: item[:operationName],
           variables:      ensure_hash(item[:variables]),
-          context:        graphql_context(:user)
+          context:        graphql_context([:user, :schema_user])
         }
       end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 end

data/spec/dummy/app/graphql/dummy_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DummySchema < GraphQL::Schema
   use GraphqlDevise::SchemaPlugin.new(
     query:            Types::QueryType,
@@ -13,7 +15,8 @@ class DummySchema < GraphQL::Schema
           :check_password_token
         ]
       ),
-      GraphqlDevise::ResourceLoader.new('Guest', only: [:logout])
+      GraphqlDevise::ResourceLoader.new('Guest', only: [:logout]),
+      GraphqlDevise::ResourceLoader.new('SchemaUser')
     ]
   )
 

data/spec/dummy/app/graphql/interpreter_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InterpreterSchema < GraphQL::Schema
   use GraphQL::Execution::Interpreter if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.9.0')
   use GraphQL::Analysis::AST          if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.10.0')

data/spec/dummy/app/graphql/mutations/login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mutations
   class Login < GraphqlDevise::Mutations::Login
     field :user, Types::UserType, null: true

data/spec/dummy/app/graphql/mutations/register_confirmed_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mutations
   class RegisterConfirmedUser < GraphqlDevise::Mutations::Base
     argument :email,                 String, required: true

data/spec/dummy/app/graphql/mutations/sign_up.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mutations
   class SignUp < GraphqlDevise::Mutations::SignUp
     argument :name, String, required: false

data/spec/dummy/app/graphql/mutations/update_user.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Mutations
+  class UpdateUser < GraphQL::Schema::Mutation
+    field :user, Types::UserType, null: false
+
+    argument :email, String, required: false
+    argument :name,  String, required: false
+
+    def resolve(**attrs)
+      user = context[:current_resource]
+
+      schema_url = context[:controller].full_url_without_params
+
+      user.update_with_email(
+        attrs.merge(schema_url: schema_url, confirmation_success_url: 'https://google.com')
+      )
+
+      { user: user }
+    end
+  end
+end

data/spec/dummy/app/graphql/resolvers/public_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resolvers
   class PublicUser < GraphQL::Schema::Resolver
     type Types::UserType, null: false

data/spec/dummy/app/graphql/resolvers/user_show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resolvers
   class UserShow < GraphQL::Schema::Resolver
     type Types::UserType, null: false

data/spec/dummy/app/graphql/types/base_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Types
   class BaseObject < GraphQL::Schema::Object
   end

data/spec/dummy/app/graphql/types/custom_admin_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Types
   class CustomAdminType < GraphQL::Schema::Object
     field :email,        String, null: false

data/spec/dummy/app/graphql/types/mutation_type.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module Types
   class MutationType < Types::BaseObject
     field :dummy_mutation, String, null: false, authenticate: true
+    field :update_user, mutation: Mutations::UpdateUser
 
     def dummy_mutation
       'Necessary so GraphQL gem does not complain about empty mutation type'

data/spec/dummy/app/graphql/types/query_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Types
   class QueryType < Types::BaseObject
     field :user, resolver: Resolvers::UserShow

data/spec/dummy/app/graphql/types/user_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Types
   class UserType < GraphQL::Schema::Object
     field :id,            Int,    null: false

data/spec/dummy/app/jobs/application_job.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
 end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: 'from@example.com'
   layout 'mailer'

data/spec/dummy/app/models/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin < ApplicationRecord
   devise :database_authenticatable,
          :registerable,

data/spec/dummy/app/models/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

data/spec/dummy/app/models/guest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Guest < ApplicationRecord
   devise :database_authenticatable,
          :registerable,

data/spec/dummy/app/models/schema_user.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SchemaUser < ApplicationRecord
+  devise :database_authenticatable,
+         :recoverable,
+         :trackable,
+         :validatable,
+         :confirmable
+
+  include GraphqlDevise::Concerns::Model
+
+  validates :name, presence: true
+end

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ApplicationRecord
   devise :database_authenticatable,
          :registerable,

data/spec/dummy/app/models/users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Users
   def self.table_name_prefix
     'users_'

data/spec/dummy/app/models/users/customer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Users
   class Customer < ApplicationRecord
     devise :database_authenticatable, :validatable

data/spec/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require_relative 'config/environment'

data/spec/dummy/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'active_model/railtie'
 require 'active_job/railtie'

data/spec/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require_relative 'application'
 

data/spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.