graphql_devise 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fc4729464c8acabdfc399a6ad2ea777bc411ed1dcbac7e5996c3ea196f603f
-  data.tar.gz: c45854aec9f2658288170df3ca84aac3910ba3b37a0ecc05c153bd5430e76739
+  metadata.gz: 3f82f570616cfaaae35c4660c7f33939bfe749ff615f94c3cd58e6ac7261aec2
+  data.tar.gz: 15f4a78b52e3d4ddb9f40343668f983db3eda83dcc4d0f0adda06b4b4394eb98
 SHA512:
-  metadata.gz: e7a89e959b02190ac0fd70b0baaa325cbe62e87581b7eed837d95ad5352ab3f8da8c1b5fb165cc0127cdb3e968ec3f9b3634542e511d8ac7f6cde7b81a4b93d5
-  data.tar.gz: be3ddeedfa069474790a8625478fff36084760c4f00a0810de0c87bc80c67704ed5db0fb8fe293c74a4c16a5a9124cebe75dd61b314d455aec59fa39bed8fd91
+  metadata.gz: 7f22e378ecd7d40da887996eafcb77ad83c4fade6cfdfac21ad4200d10c75cfb78f3f98f675052eda164fed451dd703ad23ef3158502b24c974cbabf94e283b9
+  data.tar.gz: 2f349211452d275da7fc07337188ff13c8fad04f2577e763a516fd6c43030f2b919bd6d713fb3ef89b2941dc603e600bc0e578df729967db370860bfa43090bf

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [v1.0.1](https://github.com/graphql-devise/graphql_devise/tree/v1.0.1) (2022-08-15)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.0.0...v1.0.1)
+
+**Fixed bugs:**
+
+- A class must be provided when mounting a model. String values are no longer supported [\#235](https://github.com/graphql-devise/graphql_devise/issues/235)
+- Use the class itself in the route generator instead of a string representation [\#236](https://github.com/graphql-devise/graphql_devise/pull/236) ([whotwagner](https://github.com/whotwagner))
+- Honor dta auth cookie when using the schema plugin in a main rails project route [\#233](https://github.com/graphql-devise/graphql_devise/pull/233) ([00dav00](https://github.com/00dav00))
+
 ## [v1.0.0](https://github.com/graphql-devise/graphql_devise/tree/v1.0.0) (2022-08-04)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.18.2...v1.0.0)

data/graphql_devise.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'coveralls-ruby', '~> 0.2'
+  spec.add_development_dependency 'coveralls_reborn'
   spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'faker'
   spec.add_development_dependency 'generator_spec'

data/lib/generators/graphql_devise/install_generator.rb

@@ -38,7 +38,7 @@ module GraphqlDevise
       if options['mount'] != 'separate_route'
         gsub_file(routes_file, /^\s+#{Regexp.escape(dta_route + "\n")}/i, '')
       else
-        gem_route = "mount_graphql_devise_for '#{user_class}', at: '#{mount_path}'"
+        gem_route = "mount_graphql_devise_for #{user_class}, at: '#{mount_path}'"
 
         if file_contains_str?(routes_file, gem_route)
           gsub_file(routes_file, /^\s+#{Regexp.escape(dta_route + "\n")}/i, '')

data/lib/graphql_devise/concerns/additional_controller_methods.rb

@@ -37,7 +37,7 @@ module GraphqlDevise
 
     def build_redirect_headers(access_token, client, redirect_header_options = {})
       {
-        DeviseTokenAuth.headers_names[:"access-token"] => access_token,
+        DeviseTokenAuth.headers_names[:'access-token'] => access_token,
         DeviseTokenAuth.headers_names[:client] => client,
         :config => params[:config],
         :client_id => client,

data/lib/graphql_devise/concerns/controller_methods.rb

@@ -66,9 +66,20 @@ module GraphqlDevise
       end
     end
 
-    def set_auth_headers(resource)
+    def generate_auth_headers(resource)
       auth_headers = resource.create_new_auth_token
-      response.headers.merge!(auth_headers)
+      controller.resource = resource
+      access_token_name = DeviseTokenAuth.headers_names[:'access-token']
+      client_name = DeviseTokenAuth.headers_names[:'client']
+
+      # NOTE: Depending on the DTA version, the token will be an object or nil
+      if controller.token
+        controller.token.client = auth_headers[client_name]
+        controller.token.token = auth_headers[access_token_name]
+      else
+        controller.client_id = auth_headers[client_name]
+        controller.token = auth_headers[access_token_name]
+      end
 
       auth_headers
     end

data/lib/graphql_devise/mutations/confirm_registration_with_token.rb

@@ -18,7 +18,7 @@ module GraphqlDevise
 
           response_payload = { authenticatable: resource }
 
-          response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?
+          response_payload[:credentials] = generate_auth_headers(resource) if resource.active_for_authentication?
 
           response_payload
         else

data/lib/graphql_devise/mutations/login.rb

@@ -19,7 +19,7 @@ module GraphqlDevise
             raise_user_error(I18n.t('graphql_devise.sessions.bad_credentials'))
           end
 
-          new_headers = set_auth_headers(resource)
+          new_headers = generate_auth_headers(resource)
           controller.sign_in(:user, resource, store: false, bypass: false)
 
           yield resource if block_given?

data/lib/graphql_devise/mutations/register.rb

@@ -38,7 +38,7 @@ module GraphqlDevise
 
           response_payload = { authenticatable: resource }
 
-          response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?
+          response_payload[:credentials] = generate_auth_headers(resource) if resource.active_for_authentication?
 
           response_payload
         else

data/lib/graphql_devise/mutations/update_password_with_token.rb

@@ -23,7 +23,7 @@ module GraphqlDevise
           yield resource if block_given?
 
           response_payload               = { authenticatable: resource }
-          response_payload[:credentials] = set_auth_headers(resource) if controller.signed_in?(resource_name)
+          response_payload[:credentials] = generate_auth_headers(resource) if controller.signed_in?(resource_name)
 
           response_payload
         else

data/lib/graphql_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/graphql_devise.rb

@@ -15,7 +15,7 @@ loader = Zeitwerk::Loader.for_gem
 
 loader.collapse("#{__dir__}/graphql_devise/concerns")
 loader.collapse("#{__dir__}/graphql_devise/errors")
-loader.collapse("#{__dir__}/generators")
+loader.ignore("#{__dir__}/generators")
 
 loader.inflector.inflect('error_codes' => 'ERROR_CODES')
 loader.inflector.inflect('supported_options' => 'SUPPORTED_OPTIONS')

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

@@ -4,6 +4,7 @@ module Api
   module V1
     class GraphqlController < ApplicationController
       include GraphqlDevise::SetUserByToken
+      include ActionController::Cookies
 
       def graphql
         result = DummySchema.execute(params[:query], **execute_params(params))

data/spec/generators/graphql_devise/install_generator_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
     let(:args) { [] }
 
     it 'creates and updated required files' do
-      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for 'User', at: 'graphql_auth'/
+      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for User, at: 'graphql_auth'/
       expect(routes_content).not_to match(dta_route)
 
       assert_file 'config/initializers/devise.rb'
@@ -60,7 +60,7 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
     let(:args) { %w[Admin api] }
 
     it 'creates and updated required files' do
-      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for 'Admin', at: 'api'/
+      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for Admin, at: 'api'/
       expect(routes_content).not_to match(dta_route)
 
       assert_file 'config/initializers/devise.rb'

data/spec/requests/mutations/login_spec.rb

@@ -184,4 +184,38 @@ RSpec.describe 'Login Requests' do
       )
     end
   end
+
+
+  if DeviseTokenAuth.respond_to?(:cookie_enabled)
+    context 'when using cookies for auth' do
+      let!(:user) { create(:user, :confirmed, password: password, email: 'vvega@wallaceinc.com') }
+      let(:email) { user.email }
+      let(:query) do
+        <<-GRAPHQL
+        mutation {
+          userLogin(
+            email: "#{email}",
+            password: "#{password}"
+          ) {
+            authenticatable { email }
+            credentials { accessToken uid tokenType client expiry }
+          }
+        }
+      GRAPHQL
+      end
+
+      around do |example|
+        DeviseTokenAuth.cookie_enabled = true
+        example.run
+        DeviseTokenAuth.cookie_enabled = false
+      end
+
+      before { post_request('/api/v1/graphql') }
+
+      it 'honors DTA configuration of setting auth info in cookies' do
+        cookie = cookies.get_cookie('auth_cookie')
+        expect(JSON.parse(cookie.value).keys).to include(*%w[uid access-token client])
+      end
+    end
+  end
 end

data/spec/services/resource_loader_spec.rb

@@ -91,5 +91,44 @@ RSpec.describe GraphqlDevise::ResourceLoader do
         end
       end
     end
+
+    context 'when argument errors are raised when field is set' do
+      context 'when mutation raises an argument error' do
+        before { allow(mutation).to receive(:field).and_raise(ArgumentError, 'mutation error') }
+
+        if Gem::Version.new(GraphQL::VERSION) < Gem::Version.new('2.0')
+          it 'raises the same argument error' do
+            expect { loader }.to raise_error(
+              ArgumentError,
+              'mutation error'
+            )
+          end
+        else
+          it 'raises a GraphqlDevise::Error error' do
+            expect { loader }.to raise_error(GraphqlDevise::Error)
+          end
+        end
+      end
+
+      context 'when query raises an argument error' do
+        before do
+          allow(mutation).to receive(:field)
+          allow(query).to receive(:field).and_raise(ArgumentError, 'query error')
+        end
+
+        if Gem::Version.new(GraphQL::VERSION) < Gem::Version.new('2.0')
+          it 'raises the same argument error' do
+            expect { loader }.to raise_error(
+              ArgumentError,
+              'query error'
+            )
+          end
+        else
+          it 'raises a GraphqlDevise::Error error' do
+            expect { loader }.to raise_error(GraphqlDevise::Error)
+          end
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['CI'] && !ENV['SKIP_COVERALLS']
+if ENV['CI'] && !ENV['SKIP_COVERALLS'] && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5')
   require 'simplecov'
   require 'coveralls'
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mario Celi
 - David Revelo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -100,19 +100,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls-ruby
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -511,7 +511,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/graphql-devise/graphql_devise
   source_code_uri: https://github.com/graphql-devise/graphql_devise
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -526,8 +526,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth
 test_files: