graphql_devise 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d9d933b61c35ed0c51283a9455dea4cf57c9752ee80bd9622695ff07e2788f
-  data.tar.gz: 0b3bf0a42e3ace013b4709076c731a06c4e2955eec852d9d5d2d8288c634f114
+  metadata.gz: 9a0911856ffb6f7569380f899bb033964977cf985144f13e985dd01e98f1164b
+  data.tar.gz: 5a3618481369b49e651efe2f6b13b5bd3f0e35b3f1b722b18cd67d83fc754680
 SHA512:
-  metadata.gz: 168ab031a4a2028f06e6bc0177fa04ce2c5341aede479cb502f99cc0738246c6d90d13cb849d763110820b6a98840b2a6a0677a8b8ea7596ff58d3e545d87b1e
-  data.tar.gz: c1051fbfe8b466c5818232afafff64d17fab8880e4c9395f84e86280c0355928b59ef2c31331ae6bc78a92f0cda5bdb8dafba03eae1f50483b8fa07d4848c39f
+  metadata.gz: d6f19cd7498da32debc6a598e5f13474a9774c5e7c032c64b76818e5ed6cc75e54a8eafa80dbcf9bd28f7700f22d7352c68f16aa7c5f6901e3350ad4924c6d0d
+  data.tar.gz: bc6f6590ec88623f42871fc72b285a9087ebd21c545eb661992b14fac7a90c52bd3a4617b48ee54edf3645e4f1ce58c52f6c46ad25fb104dba8930c445c98aea

data/.circleci/config.yml

@@ -13,22 +13,14 @@ jobs:
       - image: 'ruby:<< parameters.ruby-version >>'
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
-      BUNDLE_PATH: ../vendor/bundle
       COVERALLS_PARALLEL: true
       EAGER_LOAD: 'true'
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v2.0-<< parameters.gemfile >>-<< parameters.ruby-version >>
       - run: gem install bundler -v '1.17'
       - run:
           name: Install dependencies
           command: bundle install
-      - save_cache:
-          key: v2.0-<< parameters.gemfile >>-<< parameters.ruby-version >>
-          paths:
-            - vendor/bundle
       - run:
           name: Run Specs
           command:
@@ -47,7 +39,6 @@ workflows:
           matrix:
             parameters:
               ruby-version:
-                - '2.4'
                 - '2.5'
                 - '2.6'
                 - '2.7'
@@ -73,6 +64,7 @@ workflows:
                 - gemfiles/rails7.0_graphql1.12.gemfile
                 - gemfiles/rails7.0_graphql1.13.gemfile
                 - gemfiles/rails7.0_graphql2.0.gemfile
+                - gemfiles/rails7.0_graphql2.1.gemfile
             exclude:
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
@@ -96,6 +88,8 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql1.13.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.5'
@@ -108,6 +102,18 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql1.13.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
               - ruby-version: '2.6'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.6'
@@ -116,6 +122,8 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql1.13.gemfile
               - ruby-version: '2.6'
                 gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
               - ruby-version: '2.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4.4
   DisplayCopNames: true
   Exclude:
     - bin/**/*

data/Appraisals

@@ -83,63 +83,68 @@ appraise 'rails5.2-graphql1.12' do
 end
 
 appraise 'rails6.0-graphql1.10' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.10.0'
 end
 
 appraise 'rails6.0-graphql1.11' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.11.0'
 end
 
 appraise 'rails6.0-graphql1.12' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.12.0'
 end
 
 appraise 'rails6.0-graphql1.13' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.13.0'
 end
 
 appraise 'rails6.1-graphql1.10' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.10.0'
 end
 
 appraise 'rails6.1-graphql1.11' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.11.0'
 end
 
 appraise 'rails6.1-graphql1.12' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.12.0'
 end
 
 appraise 'rails6.1-graphql1.13' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.13.0'
 end
 
 appraise 'rails6.1-graphql2.0' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'public_suffix', '< 5'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 2.0.1'
@@ -147,7 +152,7 @@ end
 
 appraise 'rails7.0-graphql1.11' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -156,7 +161,7 @@ end
 
 appraise 'rails7.0-graphql1.12' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -165,7 +170,7 @@ end
 
 appraise 'rails7.0-graphql1.13' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -174,9 +179,18 @@ end
 
 appraise 'rails7.0-graphql2.0' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   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', '~> 2.0.1'
 end
+
+appraise 'rails7.0-graphql2.1' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  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', '>= 2.1', '< 2.2'
+end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v1.3.0](https://github.com/graphql-devise/graphql_devise/tree/v1.3.0) (2023-09-01)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.2.0...v1.3.0)
+
+**Implemented enhancements:**
+
+- Support graphql v2.1 [\#257](https://github.com/graphql-devise/graphql_devise/pull/257) ([mcelicalderon](https://github.com/mcelicalderon))
+
+## [v1.2.0](https://github.com/graphql-devise/graphql_devise/tree/v1.2.0) (2022-11-21)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.1.1...v1.2.0)
+
+**Implemented enhancements:**
+
+- Set base controller from route mount [\#237](https://github.com/graphql-devise/graphql_devise/pull/237) ([00dav00](https://github.com/00dav00))
+
 ## [v1.1.1](https://github.com/graphql-devise/graphql_devise/tree/v1.1.1) (2022-10-20)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.1.0...v1.1.1)

data/README.md

@@ -157,6 +157,8 @@ Rails.application.routes.draw do
       login: Mutations::Login
     },
     skip: [:register],
+    # optional, use only if you need a specific base controller to mount the new actions
+    base_controller: ApiController,
     additional_mutations: {
       # generates mutation { adminUserSignUp }
       admin_user_sign_up: Mutations::AdminUserSignUp
@@ -264,6 +266,11 @@ our default classes and yielding your customized code after calling `super`, exa
 and an `authenticatable` type to every query. Gem will try to use `Types::<model>Type` by
 default, so in our example you could define `Types::UserType` and every query and mutation
 will use it. But, you can override this type with this option like in the example.
+1. `base_controller`: Specifying this is optional. By default the controller used to mount the route is
+`GraphqlDevise::ApplicationController` which inherits from `ActionController::API` or `ActionController::Base`
+depending on the rails version of the main project. This option allows you to set the controller used as the parent of
+the controller where the route will be mounted. This config is similar to `Devise`'s `base_controller` config but in
+this case each route can have a different parent controller. **This option only works if you are using the mount method.**
 1. `skip`: An array of the operations that should not be available in the authentication schema. All these operations are
 symbols and should belong to the list of available operations in the gem.
 1. `only`: An array of the operations that should be available in the authentication schema. The `skip` and `only` options are

data/app/controllers/graphql_devise/graphql_controller.rb

@@ -5,48 +5,6 @@ require_dependency 'graphql_devise/application_controller'
 module GraphqlDevise
   class GraphqlController < ApplicationController
     include SetUserByToken
-
-    def auth
-      result = if params[:_json]
-        Schema.multiplex(
-          params[:_json].map do |param|
-            { query: param[:query] }.merge(execute_params(param))
-          end
-        )
-      else
-        Schema.execute(params[:query], **execute_params(params))
-      end
-
-      render json: result unless performed?
-    end
-
-    attr_accessor :client_id, :token, :resource
-
-    private
-
-    def execute_params(item)
-      {
-        operation_name: item[:operationName],
-        variables:      ensure_hash(item[:variables]),
-        context:        { controller: self }
-      }
-    end
-
-    def ensure_hash(ambiguous_param)
-      case ambiguous_param
-      when String
-        if ambiguous_param.present?
-          ensure_hash(JSON.parse(ambiguous_param))
-        else
-          {}
-        end
-      when Hash, ActionController::Parameters
-        ambiguous_param
-      when nil
-        {}
-      else
-        raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
-      end
-    end
+    include AuthControllerMethods
   end
 end

data/graphql_devise.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4.4'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 2.1'
+  spec.add_dependency 'graphql', '>= 1.8', '< 2.2'
   spec.add_dependency 'rails', '>= 4.2', '< 7.1'
   spec.add_dependency 'zeitwerk'
 

data/lib/graphql_devise/concerns/auth_controller_methods.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module AuthControllerMethods
+    extend ActiveSupport::Concern
+
+    def auth
+      result = if params[:_json]
+        Schema.multiplex(
+          params[:_json].map do |param|
+            { query: param[:query] }.merge(execute_params(param))
+          end
+        )
+      else
+        Schema.execute(params[:query], **execute_params(params))
+      end
+
+      render json: result unless performed?
+    end
+
+    attr_accessor :client_id, :token, :resource
+
+    private
+
+    def execute_params(item)
+      {
+        operation_name: item[:operationName],
+        variables:      ensure_hash(item[:variables]),
+        context:        { controller: self }
+      }
+    end
+
+    def ensure_hash(ambiguous_param)
+      case ambiguous_param
+      when String
+        if ambiguous_param.present?
+          ensure_hash(JSON.parse(ambiguous_param))
+        else
+          {}
+        end
+      when Hash, ActionController::Parameters
+        ambiguous_param
+      when nil
+        {}
+      else
+        raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+      end
+    end
+  end
+end

data/lib/graphql_devise/route_mounter.rb

@@ -1,13 +1,23 @@
 module GraphqlDevise
   module RouteMounter
     def mount_graphql_devise_for(resource, options = {})
+      routing = 'graphql_devise/graphql#auth'
+
+      if (base_controller = options.delete(:base_controller))
+        new_controller = GraphqlDevise.const_set("#{resource}AuthController", Class.new(base_controller))
+        new_controller.include(SetUserByToken)
+        new_controller.include(AuthControllerMethods)
+
+        routing = "#{new_controller.to_s.underscore.gsub('_controller','')}#auth"
+      end
+
       clean_options = ResourceLoader.new(resource, options, true).call(
         Types::QueryType,
         Types::MutationType
       )
 
-      post clean_options.at, to: 'graphql_devise/graphql#auth'
-      get  clean_options.at, to: 'graphql_devise/graphql#auth'
+      post clean_options.at, to: routing
+      get  clean_options.at, to: routing
     end
   end
 end

data/lib/graphql_devise/version.rb

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

data/spec/dummy/app/controllers/cookies_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class CookiesController < ApplicationController
+  include ActionController::Cookies
+  protect_from_forgery with: :null_session
+end
+

data/spec/dummy/config/routes.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  mount_graphql_devise_for User, at: '/api/v1/graphql_auth', operations: {
-    login:    Mutations::Login,
-    register: Mutations::Register
-  }, additional_mutations: {
-    register_confirmed_user: Mutations::RegisterConfirmedUser
-  }, additional_queries: {
-    public_user: Resolvers::PublicUser
-  }
+  mount_graphql_devise_for(
+    User,
+    at: '/api/v1/graphql_auth',
+    base_controller: CookiesController,
+    operations: { login: Mutations::Login, register: Mutations::Register },
+    additional_mutations: { register_confirmed_user: Mutations::RegisterConfirmedUser },
+    additional_queries: { public_user: Resolvers::PublicUser }
+  )
 
   mount_graphql_devise_for(
     Admin,

data/spec/requests/mutations/login_spec.rb

@@ -185,23 +185,22 @@ 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 }
+          mutation {
+            userLogin(
+              email: "#{email}",
+              password: "#{password}"
+            ) {
+              authenticatable { email }
+              credentials { accessToken uid tokenType client expiry }
+            }
           }
-        }
-      GRAPHQL
+        GRAPHQL
       end
 
       around do |example|
@@ -214,7 +213,7 @@ RSpec.describe 'Login Requests' do
 
       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])
+        expect(JSON.parse(cookie.value).keys).to include('uid', 'access-token', 'client')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-09-01 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: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,7 @@ files:
 - lib/graphql_devise.rb
 - lib/graphql_devise/concerns/additional_controller_methods.rb
 - lib/graphql_devise/concerns/additional_model_methods.rb
+- lib/graphql_devise/concerns/auth_controller_methods.rb
 - lib/graphql_devise/concerns/authenticatable.rb
 - lib/graphql_devise/concerns/controller_methods.rb
 - lib/graphql_devise/concerns/field_authentication.rb
@@ -389,6 +390,7 @@ files:
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/api/v1/graphql_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/cookies_controller.rb
 - spec/dummy/app/graphql/dummy_schema.rb
 - spec/dummy/app/graphql/interpreter_schema.rb
 - spec/dummy/app/graphql/mutations/base_mutation.rb
@@ -526,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth
@@ -536,6 +538,7 @@ test_files:
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/api/v1/graphql_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/cookies_controller.rb
 - spec/dummy/app/graphql/dummy_schema.rb
 - spec/dummy/app/graphql/interpreter_schema.rb
 - spec/dummy/app/graphql/mutations/base_mutation.rb