graphql-auth 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4644807dbf31e492493dbd4b6f73b38dbb8679cb4fcafd4bf83d6500724b95cb
-  data.tar.gz: 55b894b9f28c87b71196bc877f43f0f65cfdc089e4d888d76a0cbd96afc65273
+  metadata.gz: 5a5caee96621fce2d96fada271e528b513529e1f31036774ce512e832deb0fbe
+  data.tar.gz: a9df192c6455909cf08695d852f809008aac56c3f40f98f9181fae3ba1ca9c80
 SHA512:
-  metadata.gz: 64709cf08a8c9e8b2ab3346e883751540adf3eb1ee558e8dd6432a458779a96cd57191e8c1a2f3ebf0f6c7fc2fbc76d94d9e415a8eff8f5a94e090a964d69a3e
-  data.tar.gz: b0082ca1eba339aa94ff3ea0fa68d3af20142063a313f0b991806cf93190d2270c408454f084825ea07b0902bd32c8a10dc06322e94bdbc59f2e11b7580e8281
+  metadata.gz: e35e7e38363252aed17bf28a91ec98d7c1ea83cdc412c7f17106fedc2d1d56bd345a15200f5ac2b08aec03f8a241d8c661e56d7b2027352c94b39745001b503c
+  data.tar.gz: f8fecc6295f27c8f364f3de464a8aad808f10350feb30f2bfa97b4d0388a109dd339f6b6707a2dfabea9e17c2848871a3201bb9c3b7d4d015bf8d5075647685a

data/README.md

@@ -1,4 +1,4 @@
-# GraphQL Auth 
+# GraphQL Auth
 
 [![Build Status](https://travis-ci.org/o2web/graphql-auth.svg?branch=master)](https://travis-ci.org/o2web/graphql-auth) [![Maintainability](https://api.codeclimate.com/v1/badges/7e2515bb59f0b205a603/maintainability)](https://codeclimate.com/github/o2web/graphql-auth/maintainability)
 [![Downloads](https://img.shields.io/gem/dt/graphql-auth.svg)](https://rubygems.org/gems/graphql-auth)
@@ -21,7 +21,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install graphql-auth
-    
+
 Then run the installer to create `graphql_auth.rb` file in your initializers folder.
 
 ```
@@ -30,14 +30,14 @@ rails g graphql_auth:install
 
 Make sure to read all configurations present inside the file and fill them with your own configs.
 
-## Devise gem	
+## Devise gem
 
- Use Devise with a User model and skip all route	
+ Use Devise with a User model and skip all route
 
- ```ruby	
-Rails.application.routes.draw do	
-  devise_for :users, skip: :all	
-end	
+ ```ruby
+Rails.application.routes.draw do
+  devise_for :users, skip: :all
+end
 ```
 
 ## Usage
@@ -62,22 +62,22 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
              max_age: 600
   end
 end
-``` 
+```
 
 Make sure to include `Graphql::AuthHelper` in your `GraphqlController`. A context method returning the current_user will be available
 
 ```ruby
 class GraphqlController < ActionController::API
-  
+
   include Graphql::AuthHelper
-  
+
   def execute
     variables = ensure_hash(params[:variables])
     query = params[:query]
     operation_name = params[:operationName]
     result = ::GraphqlSchema.execute(query, variables: variables, context: context, operation_name: operation_name)
     render json: result
-    
+
     ...
 ```
 
@@ -101,9 +101,15 @@ GraphQL::Auth.configure do |config|
 
   # config.user_type = '::Types::Auth::User'
 
-  # config.sign_up_mutation = false
-  # config.lock_account_mutation = false
-  # config.unlock_account_mutation = false
+  # 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/validate_token.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Mutations::Auth::ValidateToken < GraphQL::Schema::Mutation
+  include ::Graphql::AccountLockHelper
+
   field :errors, [::Types::Auth::Error], null: false
   field :success, Boolean, null: false
   field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
@@ -9,7 +11,7 @@ class Mutations::Auth::ValidateToken < GraphQL::Schema::Mutation
   def resolve
     user = context[:current_user]
 
-    if user.present? && !user.access_locked?
+    if user.present? && !account_locked?(user)
       {
         errors: [],
         success: true,
@@ -25,4 +27,4 @@ class Mutations::Auth::ValidateToken < GraphQL::Schema::Mutation
       }
     end
   end
-end
+end

data/app/graphql/types/graphql_auth.rb

@@ -5,22 +5,22 @@ module Types::GraphqlAuth
 
   field :sign_in, mutation: ::Mutations::Auth::SignIn
 
-  if GraphQL::Auth.configuration.lock_account_mutation
-    field :sign_up, mutation: ::Mutations::Auth::SignUp
+  if GraphQL::Auth.configuration.allow_sign_up
+    field :sign_up, mutation: GraphQL::Auth.configuration.sign_up_mutation.constantize
   end
 
   field :forgot_password, mutation: ::Mutations::Auth::ForgotPassword
   field :reset_password, mutation: ::Mutations::Auth::ResetPassword
 
-  field :update_account, mutation: ::Mutations::Auth::UpdateAccount
+  field :update_account, mutation: GraphQL::Auth.configuration.update_account_mutation.constantize
 
   field :validate_token, mutation: ::Mutations::Auth::ValidateToken
 
-  if GraphQL::Auth.configuration.lock_account_mutation
+  if GraphQL::Auth.configuration.allow_lock_account
     field :lock_account, mutation: Mutations::Auth::LockAccount
   end
 
-  if GraphQL::Auth.configuration.unlock_account_mutation
+  if GraphQL::Auth.configuration.allow_unlock_account
     field :unlock_account, mutation: Mutations::Auth::UnlockAccount
   end
 end

data/app/helpers/graphql/account_lock_helper.rb

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

data/app/helpers/graphql/auth_helper.rb

@@ -4,6 +4,7 @@
 
 module Graphql
   module AuthHelper
+    include ::Graphql::AccountLockHelper
     include ::Graphql::TokenHelper
 
     def context
@@ -20,7 +21,7 @@ module Graphql
 
       decrypted_token = GraphQL::Auth::JwtManager.decode(authorization_token)
       user = User.find_by id: decrypted_token['user']
-      return nil if user.blank? || user.access_locked?
+      return nil if user.blank? || account_locked?(user)
 
       # update token if user is found with token
       generate_access_token(user, response)
@@ -33,7 +34,7 @@ module Graphql
       return nil if refresh_token.nil?
 
       user = User.find_by refresh_token: refresh_token
-      return nil if user.blank? || user.access_locked?
+      return nil if user.blank? || account_locked?(user)
 
       generate_access_token(user, response)
       set_refresh_token(user, response)

data/lib/generators/graphql_auth/templates/graphql_auth.rb.erb

@@ -5,7 +5,13 @@ GraphQL::Auth.configure do |config|
 
   # config.user_type = '::Types::Auth::User'
 
-  # config.sign_up_mutation = false
-  # config.lock_account_mutation = false
-  # config.unlock_account_mutation = false
-end
+  # 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/lib/graphql-auth/configuration.rb

@@ -5,9 +5,11 @@ module GraphQL
                     :jwt_secret_key,
                     :app_url,
                     :user_type,
+                    :allow_sign_up,
+                    :allow_lock_account,
+                    :allow_unlock_account,
                     :sign_up_mutation,
-                    :lock_account_mutation,
-                    :unlock_account_mutation
+                    :update_account_mutation
 
       def initialize
         @token_lifespan = 4.hours
@@ -16,9 +18,14 @@ module GraphQL
 
         @user_type = '::Types::Auth::User'
 
-        @sign_up_mutation = false
-        @lock_account_mutation = false
-        @unlock_account_mutation = false
+        # Devise allowed actions
+        @allow_sign_up = true
+        @allow_lock_account = false
+        @allow_unlock_account = false
+
+        # Allow custom mutations for signup and update account
+        @sign_up_mutation = '::Mutations::Auth::SignUp'
+        @update_account_mutation = '::Mutations::Auth::UpdateAccount'
       end
     end
   end

data/lib/graphql-auth/version.rb

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

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: graphql-auth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Guillaume Ferland
 - Brice Sanchez
+- Guillaume Loubier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +53,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +63,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +170,7 @@ files:
 - app/graphql/types/auth/error.rb
 - app/graphql/types/auth/user.rb
 - app/graphql/types/graphql_auth.rb
+- app/helpers/graphql/account_lock_helper.rb
 - app/helpers/graphql/auth_helper.rb
 - app/helpers/graphql/token_helper.rb
 - app/views/devise/mailer/reset_password_instructions.html.erb
@@ -195,7 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: GraphQL + JWT + Devise