Merge pull request #5 from graphql-device/take-options-route-mount

Take custom mutations when mounting gem in routes

Author: mcelicalderon

.rubocop.yml

@@ -5,14 +5,17 @@ Rails:
   Enabled: true
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
   Exclude:
     - bin/**/*
     - db/**/*
     - vendor/**/*
     - tmp/**/*
 
+Rails/HttpPositionalArguments:
+  Enabled: false
+
 Rails/HasAndBelongsToMany:
   Enabled: false
 

Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'listen'

app/controllers/graphql_devise/graphql_controller.rb

@@ -18,6 +18,8 @@ def auth
       render json: result
     end
 
+    attr_accessor :client_id, :token, :resource
+
     private
 
     def execute_params(item)

app/graphql/graphql_devise/mutations/base.rb

@@ -1,18 +1,26 @@
+require 'devise_token_auth/version'
+
 module GraphqlDevise
   module Mutations
     class Base < GraphQL::Schema::Mutation
       private
 
+      def remove_resource
+        controller.resource = nil
+        controller.client_id = nil
+        controller.token = nil
+      end
+
       def single_error_object(error)
         { success: false, errors: [error] }
       end
 
       def request
-        context[:controller].request
+        controller.request
       end
 
       def response
-        context[:controller].response
+        controller.response
       end
 
       def controller
@@ -26,6 +34,14 @@ def resource_class
       def current_resource
         context[:current_resource]
       end
+
+      def client
+        if Gem::Version.new(DeviseTokenAuth::VERSION) <= Gem::Version.new('1.1.0')
+          controller.client_id
+        else
+          controller.token.client if controller.token.present?
+        end
+      end
     end
   end
 end

app/graphql/graphql_devise/mutations/login.rb

@@ -4,9 +4,8 @@ class Login < Base
       argument :email,    String, required: true
       argument :password, String, required: true
 
-      field :authenticable, GraphqlDevise::Types::AuthenticableType, null: true
-      field :success,       Boolean,                                 null: false
-      field :errors,        [String],                                null: false
+      field :success, Boolean,  null: false
+      field :errors,  [String], null: false
 
       def resolve(email:, password:)
         resource = resource_class.find_by(email: email)

app/graphql/graphql_devise/mutations/logout.rb

@@ -0,0 +1,23 @@
+module GraphqlDevise
+  module Mutations
+    class Logout < Base
+      field :success, Boolean,  null: false
+      field :errors,  [String], null: false
+
+      def resolve
+        if current_resource && client && current_resource.tokens[client]
+          current_resource.tokens.delete(client)
+          current_resource.save!
+
+          remove_resource
+
+          yield current_resource if block_given?
+
+          { success: true, errors: [], authenticable: current_resource }
+        else
+          { success: false, errors: [I18n.t('graphql_devise.user_not_found')] }
+        end
+      end
+    end
+  end
+end

app/graphql/graphql_devise/types/mutation_type.rb

@@ -1,7 +1,6 @@
 module GraphqlDevise
   module Types
     class MutationType < GraphQL::Schema::Object
-      field :login, mutation: GraphqlDevise::Mutations::Login
     end
   end
 end

config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   graphql_devise:
+    user_not_found: "User was not found or was not logged in."
     sessions:
       bad_credentials: "Invalid login credentials. Please try again."
       not_confirmed: "A confirmation email was sent to your account at '%{email}'. You must follow the instructions in the email before your account can be activated"

gemfiles/rails4.2_graphql1.8.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "bundler", "~> 1.17"
 gem "rails", github: "rails/rails", branch: "4-2-stable"
 gem "graphql", "~> 1.8.0"

gemfiles/rails5.0_graphql1.8.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-0-stable"
 gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.37"