graphql_devise 0.17.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a627bf05673e2c42f24eeb15db1101c060caade6270485146676c6e30840e5d
-  data.tar.gz: 9e97f20e1c073225d884e4d2e4fd9e0c9bddbf4eab52fc214c7c1cd5a113411f
+  metadata.gz: 04d9716e77c081e74caaf93d0808f45ded94630c40b5cca5b8bd6cd8fc3ed09a
+  data.tar.gz: 03b1543236bda0a52055bab779c7b58f33f022c64a5a32641a0e3ddc300b88ca
 SHA512:
-  metadata.gz: 2b4026ea6635fdb87856a57eb50ae58cd5406605ffc46347957e1839da04586e2015792905a8214aa24b4ba0b991102ea0edc4e4713e510e42fa23bc13569a9f
-  data.tar.gz: 9b24ea5c67644952818cb0dce4119696aa552e1cc9aeda5c67fbe045d15a64312be4c868eed5b9780f2114e4d6e50a73edf6ca13513fda0c5745213a10a9586f
+  metadata.gz: b02fc314f7e8581a7b5bc5b77cae1fdc5c1b9bf7b5bdb0f2d8a45a323d6cec009633dc5c43a7309eb8d653808173f004d7c8ac0fa3bdabad8814e284209066b1
+  data.tar.gz: 302d052a6ac63d66ce32c54b84501069205f42dd13d71d9fafe8872f615b9deb12d59813dcfa75fda7720bd51a1a947471eca9442013ca5deb9bbcbaa10b85f4

data/.circleci/config.yml

@@ -66,33 +66,51 @@ workflows:
                 - gemfiles/rails5.2_graphql1.11.gemfile
                 - gemfiles/rails6.0_graphql1.11.gemfile
                 - gemfiles/rails6.0_graphql1.12.gemfile
+                - gemfiles/rails6.0_graphql1.13.gemfile
                 - gemfiles/rails6.1_graphql1.11.gemfile
                 - gemfiles/rails6.1_graphql1.12.gemfile
+                - gemfiles/rails6.1_graphql1.13.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.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.4'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.0_graphql1.12.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.1_graphql1.11.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.1_graphql1.12.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails6.1_graphql1.13.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.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

data/.gitignore

@@ -24,6 +24,7 @@ README.md.*
 # rvm config files
 .ruby-version
 .ruby-gemset
+.tool-versions
 
 .env
 /spec/tmp/config/routes.rb

data/Appraisals

@@ -82,20 +82,6 @@ appraise 'rails5.2-graphql1.12' do
   gem 'rspec-rails', '< 4.0'
 end
 
-appraise 'rails6.0-graphql1.8' do
-  gem 'sqlite3', '~> 1.4'
-  gem 'devise', '>= 4.7'
-  gem 'rails', github: 'rails/rails', branch: '6-0-stable'
-  gem 'graphql', '~> 1.8.0'
-end
-
-appraise 'rails6.0-graphql1.9' do
-  gem 'sqlite3', '~> 1.4'
-  gem 'devise', '>= 4.7'
-  gem 'rails', github: 'rails/rails', branch: '6-0-stable'
-  gem 'graphql', '~> 1.9.0'
-end
-
 appraise 'rails6.0-graphql1.10' do
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
@@ -117,11 +103,11 @@ appraise 'rails6.0-graphql1.12' do
   gem 'graphql', '~> 1.12.0'
 end
 
-appraise 'rails6.1-graphql1.9' do
+appraise 'rails6.0-graphql1.13' do
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
-  gem 'rails', github: 'rails/rails', branch: '6-1-stable'
-  gem 'graphql', '~> 1.9.0'
+  gem 'rails', github: 'rails/rails', branch: '6-0-stable'
+  gem 'graphql', '~> 1.13.0'
 end
 
 appraise 'rails6.1-graphql1.10' do
@@ -145,10 +131,9 @@ appraise 'rails6.1-graphql1.12' do
   gem 'graphql', '~> 1.12.0'
 end
 
-appraise 'rails6.1-graphql_edge' do
+appraise 'rails6.1-graphql1.13' do
   gem 'sqlite3', '~> 1.4'
-  gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
   gem 'devise', '>= 4.7'
   gem 'rails', github: 'rails/rails', branch: '6-1-stable'
-  gem 'graphql', github: 'rmosolgo/graphql-ruby', branch: 'master'
+  gem 'graphql', '~> 1.13.0'
 end

data/app/controllers/graphql_devise/concerns/additional_controller_methods.rb

@@ -46,7 +46,7 @@ module GraphqlDevise
            Use `gql_devise_context(model)` instead.
 
            EXAMPLE
-           include GraphqlDevise::Concerns::SetUserByToken
+           include GraphqlDevise::SetUserByToken
 
            DummySchema.execute(params[:query], context: gql_devise_context(User))
            DummySchema.execute(params[:query], context: gql_devise_context(User, Admin))

data/app/controllers/graphql_devise/concerns/set_user_by_token.rb

@@ -8,6 +8,13 @@ module GraphqlDevise
       included do
         include DeviseTokenAuth::Concerns::SetUserByToken
         include GraphqlDevise::Concerns::AdditionalControllerMethods
+
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
+          Including GraphqlDevise::Concerns::SetUserByToken is deprecated and will be removed in a future version of
+          this gem. Please use GraphqlDevise::SetUserByToken instead.
+          EXAMPLE
+          include GraphqlDevise::SetUserByToken
+        DEPRECATION
       end
     end
   end

data/app/controllers/graphql_devise/graphql_controller.rb

@@ -4,7 +4,7 @@ require_dependency 'graphql_devise/application_controller'
 
 module GraphqlDevise
   class GraphqlController < ApplicationController
-    include GraphqlDevise::Concerns::SetUserByToken
+    include GraphqlDevise::SetUserByToken
 
     def auth
       result = if params[:_json]

data/app/models/graphql_devise/concerns/model.rb

@@ -12,6 +12,13 @@ module GraphqlDevise
         include GraphqlDevise::Concerns::AdditionalModelMethods
 
         GraphqlDevise.configure_warden_serializer_for_model(self)
+
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
+          Including GraphqlDevise::Concerns::Model is deprecated and will be removed in a future version of
+          this gem. Please use GraphqlDevise::Authenticatable instead.
+          EXAMPLE
+          include GraphqlDevise::Authenticatable
+        DEPRECATION
       end
     end
   end

data/graphql_devise.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 1.13.0'
+  spec.add_dependency 'graphql', '>= 1.8', '< 1.14.0'
   spec.add_dependency 'rails', '>= 4.2', '< 6.2'
 
   spec.add_development_dependency 'appraisal'

data/lib/generators/graphql_devise/install_generator.rb

@@ -18,13 +18,13 @@ module GraphqlDevise
       if File.exist?(File.expand_path("app/models/#{user_class.underscore}.rb", destination_root))
         gsub_file(
           "app/models/#{user_class.underscore}.rb",
-          'GraphqlDevise::Concerns::Model',
+          'GraphqlDevise::Authenticatable',
           'DeviseTokenAuth::Concerns::User'
         )
       end
       gsub_file(
         'app/controllers/application_controller.rb',
-        'GraphqlDevise::Concerns::SetUserByToken',
+        'GraphqlDevise::SetUserByToken',
         'DeviseTokenAuth::Concerns::SetUserByToken'
       )
 
@@ -54,7 +54,7 @@ module GraphqlDevise
       gsub_file(
         "app/models/#{user_class.underscore}.rb",
         /^\s+include DeviseTokenAuth::Concerns::User/,
-        '  include GraphqlDevise::Concerns::Model'
+        '  include GraphqlDevise::Authenticatable'
       )
     end
 
@@ -62,7 +62,7 @@ module GraphqlDevise
       gsub_file(
         'app/controllers/application_controller.rb',
         /^\s+include DeviseTokenAuth::Concerns::SetUserByToken/,
-        '  include GraphqlDevise::Concerns::SetUserByToken'
+        '  include GraphqlDevise::SetUserByToken'
       )
     end
 

data/lib/graphql_devise/concerns/authenticatable.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module Authenticatable
+    extend ActiveSupport::Concern
+
+    included do
+      include DeviseTokenAuth::Concerns::User
+      include GraphqlDevise::Concerns::AdditionalModelMethods
+
+      ::GraphqlDevise.configure_warden_serializer_for_model(self)
+    end
+  end
+end

data/lib/graphql_devise/concerns/set_user_by_token.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module SetUserByToken
+    extend ActiveSupport::Concern
+
+    included do
+      include DeviseTokenAuth::Concerns::SetUserByToken
+      include GraphqlDevise::Concerns::AdditionalControllerMethods
+    end
+  end
+end

data/lib/graphql_devise/schema_plugin.rb

@@ -37,7 +37,7 @@ module GraphqlDevise
           Please use `gql_devise_context` in you controller instead.
 
           EXAMPLE
-          include GraphqlDevise::Concerns::SetUserByToken
+          include GraphqlDevise::SetUserByToken
 
           DummySchema.execute(params[:query], context: gql_devise_context(User))
           DummySchema.execute(params[:query], context: gql_devise_context(User, Admin))
@@ -113,7 +113,11 @@ module GraphqlDevise
       auth_required = if trace_data[:context]
         field.metadata[:authenticate]
       else
-        field.graphql_definition.metadata[:authenticate]
+        if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.13.1')
+          field.graphql_definition(silence_deprecation_warning: true).metadata[:authenticate]
+        else
+          field.graphql_definition.metadata[:authenticate]
+        end
       end
 
       auth_required.nil? ? @authenticate_default : auth_required

data/lib/graphql_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  VERSION = '0.17.1'.freeze
+  VERSION = '0.18.2'.freeze
 end

data/lib/graphql_devise.rb

@@ -60,6 +60,10 @@ require 'graphql_devise/errors/user_error'
 require 'graphql_devise/errors/authentication_error'
 require 'graphql_devise/errors/detailed_user_error'
 
+# TODO: Remove when merged into master
+require 'graphql_devise/concerns/authenticatable'
+require 'graphql_devise/concerns/set_user_by_token.rb'
+
 require 'graphql_devise/concerns/controller_methods'
 require 'graphql_devise/schema'
 require 'graphql_devise/types/authenticatable_type'

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

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

data/spec/dummy/app/models/admin.rb

@@ -7,5 +7,5 @@ class Admin < ApplicationRecord
          :validatable,
          :confirmable
 
-  include GraphqlDevise::Concerns::Model
+  include GraphqlDevise::Authenticatable
 end

data/spec/dummy/app/models/guest.rb

@@ -6,5 +6,5 @@ class Guest < ApplicationRecord
          :recoverable,
          :validatable
 
-  include GraphqlDevise::Concerns::Model
+  include GraphqlDevise::Authenticatable
 end

data/spec/dummy/app/models/schema_user.rb

@@ -7,7 +7,7 @@ class SchemaUser < ApplicationRecord
          :validatable,
          :confirmable
 
-  include GraphqlDevise::Concerns::Model
+  include GraphqlDevise::Authenticatable
 
   validates :name, presence: true
 end

data/spec/dummy/app/models/user.rb

@@ -10,7 +10,7 @@ class User < ApplicationRecord
          :validatable,
          :confirmable
 
-  include GraphqlDevise::Concerns::Model
+  include GraphqlDevise::Authenticatable
 
   validates :name, presence: true
 

data/spec/dummy/app/models/users/customer.rb

@@ -4,7 +4,7 @@ module Users
   class Customer < ApplicationRecord
     devise :database_authenticatable, :validatable
 
-    include GraphqlDevise::Concerns::Model
+    include GraphqlDevise::Authenticatable
 
     validates :name, presence: true
   end

data/spec/generators/graphql_devise/install_generator_spec.rb

@@ -29,9 +29,9 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
 
       assert_migration 'db/migrate/devise_token_auth_create_admins.rb'
 
-      assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
+      assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Authenticatable/m
 
-      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
+      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::SetUserByToken/
 
       assert_file 'app/graphql/gqld_dummy_schema.rb', /\s+#{Regexp.escape("GraphqlDevise::ResourceLoader.new(Admin)")}/
     end
@@ -50,9 +50,9 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
 
       assert_migration 'db/migrate/devise_token_auth_create_users.rb'
 
-      assert_file 'app/models/user.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
+      assert_file 'app/models/user.rb', /^\s{2}devise :.+include GraphqlDevise::Authenticatable/m
 
-      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
+      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::SetUserByToken/
     end
   end
 
@@ -69,9 +69,9 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
 
       assert_migration 'db/migrate/devise_token_auth_create_admins.rb'
 
-      assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
+      assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Authenticatable/m
 
-      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
+      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::SetUserByToken/
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -40,7 +40,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +308,9 @@ files:
 - graphql_devise.gemspec
 - lib/generators/graphql_devise/install_generator.rb
 - lib/graphql_devise.rb
+- lib/graphql_devise/concerns/authenticatable.rb
 - lib/graphql_devise/concerns/controller_methods.rb
+- lib/graphql_devise/concerns/set_user_by_token.rb
 - lib/graphql_devise/default_operations/mutations.rb
 - lib/graphql_devise/default_operations/resolvers.rb
 - lib/graphql_devise/engine.rb
@@ -510,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth