graphql_devise 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fc4729464c8acabdfc399a6ad2ea777bc411ed1dcbac7e5996c3ea196f603f
-  data.tar.gz: c45854aec9f2658288170df3ca84aac3910ba3b37a0ecc05c153bd5430e76739
+  metadata.gz: 7325ecea583beb248fe28de9d2421121ddbff9776178bca006d16880b39867df
+  data.tar.gz: 7005c49c45623fa02a7f6ebd1f72d893890264564ad91ae2628814c99d811a24
 SHA512:
-  metadata.gz: e7a89e959b02190ac0fd70b0baaa325cbe62e87581b7eed837d95ad5352ab3f8da8c1b5fb165cc0127cdb3e968ec3f9b3634542e511d8ac7f6cde7b81a4b93d5
-  data.tar.gz: be3ddeedfa069474790a8625478fff36084760c4f00a0810de0c87bc80c67704ed5db0fb8fe293c74a4c16a5a9124cebe75dd61b314d455aec59fa39bed8fd91
+  metadata.gz: da309b6629078b7e83ac491958b613ac501be53f9166de18f0bb5df8256e4d906012454770fc76bca2c5c4b0c2b6803dec01ad58a0c8553ccbd182033f9daf6e
+  data.tar.gz: 5109daf3bd8103f7c70e723ed7f096e5e4b3c1eb1ebe36d02f3b7d9bea693dcc0eaf41a7f9147d1588cb7a56cd7ecccfeff1c9ecec20c9ea802ceba7794665c2

data/.circleci/config.yml

@@ -69,35 +69,11 @@ workflows:
                 - gemfiles/rails6.1_graphql1.12.gemfile
                 - gemfiles/rails6.1_graphql1.13.gemfile
                 - gemfiles/rails6.1_graphql2.0.gemfile
+                - gemfiles/rails7.0_graphql1.11.gemfile
+                - gemfiles/rails7.0_graphql1.12.gemfile
+                - gemfiles/rails7.0_graphql1.13.gemfile
+                - gemfiles/rails7.0_graphql2.0.gemfile
             exclude:
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.2'
-                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
               - ruby-version: '2.4'
@@ -112,10 +88,34 @@ workflows:
                 gemfile: gemfiles/rails6.1_graphql1.13.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.1_graphql2.0.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails6.0_graphql1.13.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails6.1_graphql1.13.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
               - ruby-version: '2.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

data/Appraisals

@@ -145,20 +145,11 @@ appraise 'rails6.1-graphql2.0' do
   gem 'graphql', '~> 2.0.1'
 end
 
-appraise 'rails7.0-graphql1.10' do
-  gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
-  gem 'devise', '>= 4.7'
-  gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
-  gem 'graphql', '~> 1.10.0'
-end
-
 appraise 'rails7.0-graphql1.11' do
   gem 'sassc-rails'
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
-  gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
+  gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
   gem 'graphql', '~> 1.11.0'
 end
@@ -167,7 +158,7 @@ appraise 'rails7.0-graphql1.12' do
   gem 'sassc-rails'
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
-  gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
+  gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
   gem 'graphql', '~> 1.12.0'
 end
@@ -176,16 +167,16 @@ appraise 'rails7.0-graphql1.13' do
   gem 'sassc-rails'
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
-  gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
+  gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
   gem 'graphql', '~> 1.13.0'
 end
 
-appraise 'rails7.0-graphql_edge' do
+appraise 'rails7.0-graphql2.0' do
   gem 'sassc-rails'
   gem 'sqlite3', '~> 1.4'
-  gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
+  gem 'devise_token_auth', '>= 1.2.1'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
-  gem 'graphql', git: 'https://github.com/rmosolgo/graphql-ruby', branch: 'master'
+  gem 'graphql', '~> 2.0.1'
 end

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [v1.1.0](https://github.com/graphql-devise/graphql_devise/tree/v1.1.0) (2022-09-15)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.0.1...v1.1.0)
+
+**Implemented enhancements:**
+
+- Support Rails 7 [\#241](https://github.com/graphql-devise/graphql_devise/pull/241) ([mcelicalderon](https://github.com/mcelicalderon))
+
+**Merged pull requests:**
+
+- Fix typo in README file.  [\#238](https://github.com/graphql-devise/graphql_devise/pull/238) ([MathiasPfeil](https://github.com/MathiasPfeil))
+
+## [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/README.md

@@ -176,7 +176,7 @@ options go [here](#available-mount-options)
 ### Mounting Operations In an Existing Schema
 
 Starting with `v0.12.0` you can mount the GQL operations provided by this gem into an
-existing schema in you app.
+existing schema in your app.
 
 ```ruby
 # app/graphql/dummy_schema.rb

data/graphql_devise.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
   spec.add_dependency 'graphql', '>= 1.8', '< 2.1'
-  spec.add_dependency 'rails', '>= 4.2', '< 6.2'
+  spec.add_dependency 'rails', '>= 4.2', '< 7.1'
   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.1.0'
 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/dummy/app/graphql/types/query_type.rb

@@ -10,7 +10,11 @@ module Types
     field :vip_field, String, null: false, authenticate: ->(user) { user.is_a?(User) && user.vip? }
 
     def public_field
-      'Field does not require authentication'
+      if context[:current_resource]
+        "Authenticated user on public field: #{context[:current_resource].email}"
+      else
+        'Field does not require authentication'
+      end
     end
 
     def private_field

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/requests/user_controller_spec.rb

@@ -30,6 +30,16 @@ RSpec.describe "Integrations with the user's controller" do
       it 'does not require authentication' do
         expect(json_response[:data][:publicField]).to eq('Field does not require authentication')
       end
+
+      context 'when user sends authentication headers anyway' do
+        let(:headers) { user.create_new_auth_token }
+
+        it 'sets current resource in the context' do
+          expect(json_response[:data][:publicField]).to eq(
+            "Authenticated user on public field: #{user.email}"
+          )
+        end
+      end
     end
 
     context 'when using an interpreter schema' do
@@ -38,6 +48,16 @@ RSpec.describe "Integrations with the user's controller" do
       it 'does not require authentication' do
         expect(json_response[:data][:publicField]).to eq('Field does not require authentication')
       end
+
+      context 'when user sends authentication headers anyway' do
+        let(:headers) { user.create_new_auth_token }
+
+        it 'sets current resource in the context' do
+          expect(json_response[:data][:publicField]).to eq(
+            "Authenticated user on public field: #{user.email}"
+          )
+        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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -60,7 +60,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth