Add missing logout specs

mcelicalderon · mcelicalderon · commit 521fc1dfa199 · 2019-08-29T23:48:41.000-05:00
diff --git a/app/controllers/graphql_devise/graphql_controller.rb b/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)
@@ -26,7 +28,6 @@ def execute_params(item)
         variables:      ensure_hash(item[:variables]),
         context:        {
           current_resource: @resource,
-          token:            @token,
           controller:       self,
           resource_class:   resource_class
         }
diff --git a/app/graphql/graphql_devise/mutations/base.rb b/app/graphql/graphql_devise/mutations/base.rb
@@ -1,8 +1,16 @@
+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
@@ -27,8 +35,12 @@ def current_resource
         context[:current_resource]
       end
 
-      def token
-        context[:token]
+      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
diff --git a/app/graphql/graphql_devise/mutations/logout.rb b/app/graphql/graphql_devise/mutations/logout.rb
@@ -5,15 +5,15 @@ class Logout < Base
       field :errors,  [String], null: false
 
       def resolve
-        client = token.client if token.client
+        if current_resource && client && current_resource.tokens[client]
+          current_resource.tokens.delete(client)
+          current_resource.save!
 
-        if current_user && token.client && current_user.tokens[client]
-          user.tokens.delete(client)
-          user.save!
+          remove_resource
 
-          yield user if block_given?
+          yield current_resource if block_given?
 
-          { success: true, errors: [] }
+          { success: true, errors: [], authenticable: current_resource }
         else
           { success: false, errors: [I18n.t('graphql_devise.user_not_found')] }
         end
diff --git a/gemfiles/rails4.2_graphql1.8.gemfile b/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"
diff --git a/gemfiles/rails5.0_graphql1.8.gemfile b/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"
diff --git a/gemfiles/rails5.0_graphql1.9.gemfile b/gemfiles/rails5.0_graphql1.9.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-0-stable"
 gem "graphql", "~> 1.9.0"
 
diff --git a/gemfiles/rails5.1_graphql1.8.gemfile b/gemfiles/rails5.1_graphql1.8.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-1-stable"
 gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.42"
diff --git a/gemfiles/rails5.1_graphql1.9.gemfile b/gemfiles/rails5.1_graphql1.9.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-1-stable"
 gem "graphql", "~> 1.9.0"
 
diff --git a/gemfiles/rails5.2_graphql1.8.gemfile b/gemfiles/rails5.2_graphql1.8.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.43"
diff --git a/gemfiles/rails5.2_graphql1.9.gemfile b/gemfiles/rails5.2_graphql1.9.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "rails", github: "rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.9.0"
 
diff --git a/gemfiles/rails_edge_graphql_edge.gemfile b/gemfiles/rails_edge_graphql_edge.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "listen"
 gem "sqlite3", "~> 1.4"
 gem "devise_token_auth", github: "lynndylanhurley/devise_token_auth", branch: "master"
 gem "devise", ">= 4.7"
diff --git a/lib/graphql_devise/rails/routes.rb b/lib/graphql_devise/rails/routes.rb
@@ -29,11 +29,8 @@ def mount_graphql_devise_for(resource, opts = {})
         else
           new_mutation = Class.new(mutation)
           new_mutation.graphql_name("#{resource}#{action.to_s.titleize}")
-          new_mutation.field(
-            :authenticable,
-            authenticable_type,
-            null: true
-          )
+          new_mutation.field(:authenticable, authenticable_type, null: true)
+
           new_mutation
         end
 
diff --git a/spec/requests/mutations/logout_spec.rb b/spec/requests/mutations/logout_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+RSpec.describe 'Logout Requests' do
+  include_context 'with graphql query request'
+
+  let(:user) { create(:user, :confirmed) }
+  let(:query) do
+    <<-GRAPHQL
+      mutation {
+        userLogout{
+          authenticable { email }
+          success
+          errors
+        }
+      }
+    GRAPHQL
+  end
+
+  before { post '/api/v1/graphql_auth', *graphql_params }
+
+  context 'when user is logged in' do
+    let(:headers) { user.create_new_auth_token }
+
+    it 'logs out the user' do
+      expect(response).not_to include_auth_headers
+      expect(user.reload.tokens.keys).to be_empty
+      expect(json_response[:data][:userLogout]).to match(
+        success:       true,
+        errors:        [],
+        authenticable: { email: user.email }
+      )
+    end
+  end
+
+  context 'when user is not logged in' do
+    it 'returns an error' do
+      expect(response).not_to include_auth_headers
+      expect(user.reload.tokens.keys).to be_empty
+      expect(json_response[:data][:userLogout]).to match(
+        success:       false,
+        errors:        ['User was not found or was not logged in.'],
+        authenticable: nil
+      )
+    end
+  end
+end
diff --git a/spec/support/contexts/graphql_request.rb b/spec/support/contexts/graphql_request.rb
@@ -1,10 +1,11 @@
 RSpec.shared_context 'with graphql query request' do
+  let(:headers)   { {} }
   let(:variables) { {} }
   let(:graphql_params) do
     if Rails::VERSION::MAJOR >= 5
-      [{ params: { query: query, variables: variables } }]
+      [{ params: { query: query, variables: variables }, headers: headers }]
     else
-      [{ query: query, variables: variables }]
+      [{ query: query, variables: variables }, headers]
     end
   end
 end
