Merge pull request #101 from graphql-devise/error-code-authentication…

…-error

Change authentication error code

lib/graphql_devise.rb

@@ -36,6 +36,14 @@ def self.add_mapping(mapping_name, resource)
   end
 end
 
+require 'graphql_devise/engine'
+require 'graphql_devise/version'
+require 'graphql_devise/errors/error_codes'
+require 'graphql_devise/errors/execution_error'
+require 'graphql_devise/errors/user_error'
+require 'graphql_devise/errors/authentication_error'
+require 'graphql_devise/errors/detailed_user_error'
+
 require 'graphql_devise/concerns/controller_methods'
 require 'graphql_devise/schema'
 require 'graphql_devise/types/authenticatable_type'
@@ -46,12 +54,6 @@ def self.add_mapping(mapping_name, resource)
 require 'graphql_devise/default_operations/resolvers'
 require 'graphql_devise/resolvers/dummy'
 
-require 'graphql_devise/engine'
-require 'graphql_devise/version'
-require 'graphql_devise/error_codes'
-require 'graphql_devise/user_error'
-require 'graphql_devise/detailed_user_error'
-
 require 'graphql_devise/mount_method/option_sanitizer'
 require 'graphql_devise/mount_method/options_validator'
 require 'graphql_devise/mount_method/operation_preparer'

lib/graphql_devise/errors/authentication_error.rb

@@ -0,0 +1,7 @@
+module GraphqlDevise
+  class AuthenticationError < ExecutionError
+    def to_h
+      super.merge(extensions: { code: ERROR_CODES.fetch(:authentication_error) })
+    end
+  end
+end

lib/graphql_devise/detailed_user_error.rb → lib/graphql_devise/errors/detailed_user_error.rb

@@ -1,5 +1,5 @@
 module GraphqlDevise
-  class DetailedUserError < GraphQL::ExecutionError
+  class DetailedUserError < ExecutionError
     def initialize(message, errors:)
       @message = message
       @errors  = errors

lib/graphql_devise/errors/error_codes.rb

@@ -0,0 +1,6 @@
+module GraphqlDevise
+  ERROR_CODES = {
+    user_error:           'USER_ERROR',
+    authentication_error: 'AUTHENTICATION_ERROR'
+  }.freeze
+end

lib/graphql_devise/errors/execution_error.rb

@@ -0,0 +1,4 @@
+module GraphqlDevise
+  class ExecutionError < GraphQL::ExecutionError
+  end
+end

lib/graphql_devise/user_error.rb → lib/graphql_devise/errors/user_error.rb

@@ -1,5 +1,5 @@
 module GraphqlDevise
-  class UserError < GraphQL::ExecutionError
+  class UserError < ExecutionError
     def to_h
       super.merge(extensions: { code: ERROR_CODES.fetch(:user_error) })
     end

lib/graphql_devise/schema_plugin.rb

@@ -1,6 +1,6 @@
 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

spec/requests/user_controller_spec.rb

@@ -54,7 +54,7 @@
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
           expect(json_response[:errors]).to contain_exactly(
-            hash_including(message: 'privateField field requires authentication', extensions: { code: 'USER_ERROR' })
+            hash_including(message: 'privateField field requires authentication', extensions: { code: 'AUTHENTICATION_ERROR' })
           )
         end
       end
@@ -74,7 +74,7 @@
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
           expect(json_response[:errors]).to contain_exactly(
-            hash_including(message: 'privateField field requires authentication', extensions: { code: 'USER_ERROR' })
+            hash_including(message: 'privateField field requires authentication', extensions: { code: 'AUTHENTICATION_ERROR' })
           )
         end
       end
@@ -104,7 +104,7 @@
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
           expect(json_response[:errors]).to contain_exactly(
-            hash_including(message: 'dummyMutation field requires authentication', extensions: { code: 'USER_ERROR' })
+            hash_including(message: 'dummyMutation field requires authentication', extensions: { code: 'AUTHENTICATION_ERROR' })
           )
         end
       end
@@ -124,7 +124,7 @@
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
           expect(json_response[:errors]).to contain_exactly(
-            hash_including(message: 'dummyMutation field requires authentication', extensions: { code: 'USER_ERROR' })
+            hash_including(message: 'dummyMutation field requires authentication', extensions: { code: 'AUTHENTICATION_ERROR' })
           )
         end
       end
@@ -162,7 +162,7 @@
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
           expect(json_response[:errors]).to contain_exactly(
-            hash_including(message: 'user field requires authentication', extensions: { code: 'USER_ERROR' })
+            hash_including(message: 'user field requires authentication', extensions: { code: 'AUTHENTICATION_ERROR' })
           )
         end
       end