graphql_devise 0.12.0 → 0.13.1

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
@@ -6,7 +8,7 @@ module GraphqlDevise
           @name = name
         end
 
-        def call(operation)
+        def call(operation, **)
           operation.instance_variable_set(:@resource_name, @name)
 
           operation

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
@@ -19,13 +21,11 @@ module GraphqlDevise
 
           resource.send_confirmation_instructions(
             redirect_url:  redirect_url,
-            template_path: ['graphql_devise/mailer']
+            template_path: ['graphql_devise/mailer'],
+            schema_url:    controller.full_url_without_params
           )
 
-          {
-            authenticatable: resource,
-            message:       I18n.t('graphql_devise.confirmations.send_instructions', email: email)
-          }
+          { 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

data/lib/graphql_devise/mutations/send_password_reset.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   module Mutations
     class SendPasswordReset < Base
       argument :email,        String, required: true
       argument :redirect_url, String, required: true
 
+      field :message, String, null: false
+
       def resolve(email:, redirect_url:)
         resource = find_resource(:email, get_case_insensitive_field(:email, email))
 
@@ -14,11 +18,12 @@ module GraphqlDevise
             email:         email,
             provider:      'email',
             redirect_url:  redirect_url,
-            template_path: ['graphql_devise/mailer']
+            template_path: ['graphql_devise/mailer'],
+            schema_url:    controller.full_url_without_params
           )
 
           if resource.errors.empty?
-            { authenticatable: resource }
+            { message: I18n.t('graphql_devise.passwords.send_instructions') }
           else
             raise_user_error_list(I18n.t('graphql_devise.invalid_resource'), errors: resource.errors.full_messages)
           end

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?
@@ -27,13 +34,16 @@ module GraphqlDevise
           unless resource.confirmed?
             resource.send_confirmation_instructions(
               redirect_url:  confirm_success_url,
-              template_path: ['graphql_devise/mailer']
+              template_path: ['graphql_devise/mailer'],
+              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(

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,6 +1,8 @@
+# frozen_string_literal: true
+
 module GraphqlDevise
   class SchemaPlugin
-    DEFAULT_NOT_AUTHENTICATED = ->(field) { raise GraphqlDevise::UserError, "#{field} field requires authentication" }
+    DEFAULT_NOT_AUTHENTICATED = ->(field) { raise GraphqlDevise::AuthenticationError, "#{field} field requires authentication" }
 
     def initialize(query: nil, mutation: nil, authenticate_default: true, resource_loaders: [], unauthenticated_proc: DEFAULT_NOT_AUTHENTICATED)
       @query                = query
@@ -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)
@@ -23,11 +26,12 @@ module GraphqlDevise
 
       field = traced_field(trace_data)
       provided_value = authenticate_option(field, trace_data)
+      context = set_current_resource(context_from_data(trace_data))
 
       if !provided_value.nil?
-        raise_on_missing_resource(context(trace_data), field) if provided_value
+        raise_on_missing_resource(context, field) if provided_value
       elsif @authenticate_default
-        raise_on_missing_resource(context(trace_data), field)
+        raise_on_missing_resource(context, field)
       end
 
       yield
@@ -35,11 +39,29 @@ module GraphqlDevise
 
     private
 
+    def set_current_resource(context)
+      controller                 = context[:controller]
+      resource_names             = Array(context[:resource_name])
+      context[:current_resource] = resource_names.find do |resource_name|
+        unless Devise.mappings.key?(resource_name)
+          raise(
+            GraphqlDevise::Error,
+            "Invalid resource_name `#{resource_name}` provided to `graphql_context`. Possible values are: #{Devise.mappings.keys}."
+          )
+        end
+
+        found = controller.set_resource_by_token(resource_name)
+        break found if found
+      end
+
+      context
+    end
+
     def raise_on_missing_resource(context, field)
       @unauthenticated_proc.call(field.name) if context[:current_resource].blank?
     end
 
-    def context(trace_data)
+    def context_from_data(trace_data)
       query = if trace_data[:context]
         trace_data[:context].query
       else
@@ -73,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.0'.freeze
+  VERSION = '0.13.1'.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,20 +1,51 @@
+# frozen_string_literal: true
+
 module Api
   module V1
     class GraphqlController < ApplicationController
       include GraphqlDevise::Concerns::SetUserByToken
 
-      before_action -> { set_resource_by_token(:user) }
-
       def graphql
-        render json: DummySchema.execute(params[:query], context: graphql_context)
+        result = DummySchema.execute(params[:query], execute_params(params))
+
+        render json: result unless performed?
       end
 
       def interpreter
-        render json: InterpreterSchema.execute(params[:query], context: graphql_context)
+        render json: InterpreterSchema.execute(params[:query], execute_params(params))
+      end
+
+      def failing_resource_name
+        render json: DummySchema.execute(params[:query], context: graphql_context([:user, :fail]))
       end
 
       private
 
+      def execute_params(item)
+        {
+          operation_name: item[:operationName],
+          variables:      ensure_hash(item[:variables]),
+          context:        graphql_context([:user, :schema_user])
+        }
+      end
+
+      def ensure_hash(ambiguous_param)
+        case ambiguous_param
+        when String
+          if ambiguous_param.present?
+            ensure_hash(JSON.parse(ambiguous_param))
+          else
+            {}
+          end
+        when Hash, ActionController::Parameters
+          ambiguous_param
+        when nil
+          {}
+        else
+          raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+        end
+      end
+
       def verify_authenticity_token
       end
     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