graphql_devise 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59e0e9162a90d33da8e0d9738c6960db2286acd49db59d85bdc4c352402205b
-  data.tar.gz: c1255d172a2825dcc54f21f68151a64985346f2f2e3d4b236a77ff8ce40c40e4
+  metadata.gz: b7ec77ce68ce663fe0a00048891e79c5fa3a3c2c64d5c92350ee76dd1067cd39
+  data.tar.gz: 4053424aac25cbfc0d68d3bc5c22319c7313d6d22f4e19e66a44d138303e7ada
 SHA512:
-  metadata.gz: 2df583c0be8b0df69c62c5663b7176a54b0e762b4800bdb01b6f90f8835446878fb7c45a5722f78a45a5903681e946c167f80d9d8b7cc23dfc872b7a956ec187
-  data.tar.gz: ae453c594be804358d5dec8a3f8f0526867352b2f77346e42c1c2ccab093df22d9c3f520b70e5e680afd292ab8d316efae3004f4555e4e0ac975e09b7ee0eb5d
+  metadata.gz: c6164f799f2ae729a4b5c138d96e39c02ad21efd5aeb7a241179fdafbd71e414d34a9aaa36c2e261945d2c32208d9087b0585978adcac01aebba4a7adbd6b89a
+  data.tar.gz: e1e130fecbe7adc8dc2c7a55b27f83c32cab04b273fc949a00a6dca3d4e9a1b6a456549ef73eb2235115de01a8c0cb6e09aa4fc9c7ddf61feaba32f04409c5c4

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

data/lib/graphql_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.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.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -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