graphql_devise 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f82f570616cfaaae35c4660c7f33939bfe749ff615f94c3cd58e6ac7261aec2
-  data.tar.gz: 15f4a78b52e3d4ddb9f40343668f983db3eda83dcc4d0f0adda06b4b4394eb98
+  metadata.gz: 7325ecea583beb248fe28de9d2421121ddbff9776178bca006d16880b39867df
+  data.tar.gz: 7005c49c45623fa02a7f6ebd1f72d893890264564ad91ae2628814c99d811a24
 SHA512:
-  metadata.gz: 7f22e378ecd7d40da887996eafcb77ad83c4fade6cfdfac21ad4200d10c75cfb78f3f98f675052eda164fed451dd703ad23ef3158502b24c974cbabf94e283b9
-  data.tar.gz: 2f349211452d275da7fc07337188ff13c8fad04f2577e763a516fd6c43030f2b919bd6d713fb3ef89b2941dc603e600bc0e578df729967db370860bfa43090bf
+  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,17 @@
 # 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)

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,7 +29,7 @@ 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'

data/lib/graphql_devise/version.rb

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

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/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
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Celi
 - David Revelo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-15 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
@@ -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.1.6
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth
 test_files: