graphql-auth 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a5caee96621fce2d96fada271e528b513529e1f31036774ce512e832deb0fbe
-  data.tar.gz: a9df192c6455909cf08695d852f809008aac56c3f40f98f9181fae3ba1ca9c80
+  metadata.gz: 7321053f154f4a124cc2b732bdb80b97faabf404bc90b9af28fc37345728db43
+  data.tar.gz: 666586e19bce1a314cb55cbaadf49cdc84da267f562e6844321c7c5b0b90528c
 SHA512:
-  metadata.gz: e35e7e38363252aed17bf28a91ec98d7c1ea83cdc412c7f17106fedc2d1d56bd345a15200f5ac2b08aec03f8a241d8c661e56d7b2027352c94b39745001b503c
-  data.tar.gz: f8fecc6295f27c8f364f3de464a8aad808f10350feb30f2bfa97b4d0388a109dd339f6b6707a2dfabea9e17c2848871a3201bb9c3b7d4d015bf8d5075647685a
+  metadata.gz: c5fb1f82cbb9ebc4d2141b322c297b5a30e8d8312016bb848312732fa44ab1a2d09e9f972e46b88335e0dc1d3bcc309f544b20e70983b27c66d9631fb7724ee4
+  data.tar.gz: 8c3818cb610f864f631f9d07a6805d9a3668001f9eb9e2b29cd23dcb14108aacd3d7ad209cc1ad1eec20413e9ee8fc91f41d18b12b75a4383fd3b6790f9e5cfd

data/CHANGELOG.md

@@ -0,0 +1,51 @@
+# Changelog
+
+## 0.6.1
+
+Multiple fixes to allow usage of the gem without the lockable Devise
+feature
+
+## 0.6.0
+
+### Important
+
+Upgrade to 0.6.1 if you plan on using this gem without Devise's lockable
+feature
+
+### New features
+
+Added to possibility to use your own sign_up and update_account mutations
+to allow custom fields for your user accounts
+
+### Breaking changes
+
+Configuration file was changed and some config names now have a different
+use.
+
+Please make sure to update your config file with the current version.
+
+**Those settings were renamed for more clarity**
+* sign_up_mutation => allow_sign_up
+* lock_account_mutation => allow_lock_account
+* unlock_account_mutation => allow_unlock_account
+
+The updated config file should look like this:
+```
+GraphQL::Auth.configure do |config|
+  # config.token_lifespan = 4.hours
+  # config.jwt_secret_key = ENV['JWT_SECRET_KEY']
+  # config.app_url = ENV['APP_URL']
+
+  # config.user_type = '::Types::Auth::User'
+
+  # Devise allowed actions
+  # Don't forget to enable the lockable setting in your Devise user model if you plan on using the lock_account feature
+  # config.allow_sign_up = true
+  # config.allow_lock_account = false
+  # config.allow_unlock_account = false
+
+  # Allow custom mutations for signup and update account
+  # config.sign_up_mutation = '::Mutations::Auth::SignUp'
+  # config.update_account_mutation = '::Mutations::Auth::UpdateAccount'
+end
+```

data/app/graphql/mutations/auth/forgot_password.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Mutations::Auth::ForgotPassword < GraphQL::Schema::Mutation
+  include ::Graphql::AccountLockHelper
+
   argument :email, String, required: true do
     description 'The email with forgotten password'
   end
@@ -10,7 +12,11 @@ class Mutations::Auth::ForgotPassword < GraphQL::Schema::Mutation
   field :valid, Boolean, null: false
 
   def resolve(email:)
-    user = User.where(locked_at: nil).find_by email: email
+    if lockable?
+      user = User.where(locked_at: nil).find_by email: email
+    else
+      user = User.find_by email: email
+    end
 
     user.send_reset_password_instructions if user.present?
 

data/app/graphql/mutations/auth/reset_password.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Mutations::Auth::ResetPassword < GraphQL::Schema::Mutation
+  include ::Graphql::AccountLockHelper
+
   argument :reset_password_token, String, required: true do
     description "Reset password token"
   end
@@ -17,7 +19,11 @@ class Mutations::Auth::ResetPassword < GraphQL::Schema::Mutation
   field :success, Boolean, null: false
 
   def resolve(args)
-    user = User.where(locked_at: nil).reset_password_by_token args
+    if lockable?
+      user = User.where(locked_at: nil).reset_password_by_token args
+    else
+      user = User.reset_password_by_token args
+    end
 
     if user.errors.any?
       {

data/app/graphql/mutations/auth/sign_in.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Mutations::Auth::SignIn < GraphQL::Schema::Mutation
+  include ::Graphql::AccountLockHelper
   include ::Graphql::TokenHelper
 
   argument :email, String, required: true do
@@ -22,7 +23,11 @@ class Mutations::Auth::SignIn < GraphQL::Schema::Mutation
   def resolve(email:, password:, remember_me:)
     response = context[:response]
 
-    user = User.where(locked_at: nil).find_by email: email
+    if lockable?
+      user = User.where(locked_at: nil).find_by email: email
+    else
+      user = User.find_by email: email
+    end
 
     valid_sign_in = user.present? && user.valid_password?(password)
 

data/app/helpers/graphql/account_lock_helper.rb

@@ -1,8 +1,14 @@
 module Graphql
   module AccountLockHelper
+
     def account_locked?(user)
-      return false unless GraphQL::Auth.configuration.allow_lock_account
+      return false unless lockable?
       user.access_locked?
     end
+
+    def lockable?
+      GraphQL::Auth.configuration.allow_lock_account
+    end
+
   end
 end

data/lib/graphql-auth/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Auth
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-auth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Guillaume Ferland
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - Rakefile
 - app/graphql/mutations/auth/forgot_password.rb