graphql-auth 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d9b9e3eebb716abb0ae389627c8006f6e83c59a524d0a47952f4ca7b5ae71b0
-  data.tar.gz: ea1d59f34080c3f8de6c93ca863896749e2eee33c639ddd03a04769634dd5978
+  metadata.gz: 239047f413613df84be135670d06f73647858b26e809c4e01758480e76b70d78
+  data.tar.gz: 9a2e28b7ef4376a9599d75b4fbbba0e7a393b949d65d5ddf20dff79d94e56850
 SHA512:
-  metadata.gz: e63952bea921336b3e583af3f27eba1dde05b1fd21004be8d6eefd97086d51b0535b6290f065ff6a9683ec17d3e20661a584d123756d079552c07a7eeeb3e365
-  data.tar.gz: e10144fa6c1d8ded3de6f4f0e4f4d449c4a4561485c9a03910e776d1c3d9b4f346ed224c7dae4d5efdbd2c7579924018f54ae7da14351f042d45777b013fecb9
+  metadata.gz: 1a1d89eb38a6568dde0443258f7c056045c78d5dd02dc583f6c8b5a48f4122beef8bf7f9af7d98318d77184860169a9b68869761e9832aca2fe796b66b60cc85
+  data.tar.gz: 5576358760b8c8b820476055d673b8a793dd6f16d71031d5286f3b3e02aeda417e79f9ffe942c7af49e58556a51ae967072f4977042fde31cf33eaac63167ca3

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

@@ -10,7 +10,8 @@ class Mutations::Auth::ForgotPassword < GraphQL::Schema::Mutation
   field :valid, Boolean, null: false
 
   def resolve(email:)
-    user = User.find_by email: email
+    user = User.where(locked_at: nil).find_by email: email
+
     user.send_reset_password_instructions if user.present?
 
     {

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Mutations::Auth::LockAccount < GraphQL::Schema::Mutation
+  argument :id, ID, required: true do
+    description 'User id'
+  end
+
+  field :errors, [::Types::Auth::Error], null: false
+  field :success, Boolean, null: false
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
+
+  def resolve(id:)
+    user = User.where(locked_at: nil).find_by id: id
+
+    if context[:current_user] && user.present? && user.lock_access!
+      {
+        errors: [],
+        success: true,
+        user: user
+      }
+    else
+      {
+        errors: [
+          { field: :_error, message: I18n.t('devise.locks.cannot_lock') }
+        ],
+        success: false,
+        user: user
+      }
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ class Mutations::Auth::ResetPassword < GraphQL::Schema::Mutation
   field :success, Boolean, null: false
 
   def resolve(args)
-    user = User.reset_password_by_token args
+    user = User.where(locked_at: nil).reset_password_by_token args
 
     if user.errors.any?
       {

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

@@ -11,18 +11,19 @@ class Mutations::Auth::SignIn < GraphQL::Schema::Mutation
     description "The user's password"
   end
 
-  argument :remember_me, Boolean, required: true do
+  argument :remember_me, Boolean, required: false do
     description "User's checkbox to be remembered after connection timeout"
   end
 
   field :errors, [::Types::Auth::Error], null: false
   field :success, Boolean, null: false
-  field :user, ::Types::Auth::User, null: true
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
 
   def resolve(email:, password:, remember_me:)
     response = context[:response]
 
-    user = User.find_by email: email
+    user = User.where(locked_at: nil).find_by email: email
+
     valid_sign_in = user.present? && user.valid_password?(password)
 
     if valid_sign_in
@@ -44,7 +45,7 @@ class Mutations::Auth::SignIn < GraphQL::Schema::Mutation
           }
         ],
         success: false,
-        user: nil,
+        user: nil
       }
     end
   end

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

@@ -17,7 +17,7 @@ class Mutations::Auth::SignUp < GraphQL::Schema::Mutation
 
   field :errors, [::Types::Auth::Error], null: false
   field :success, Boolean, null: false
-  field :user, ::Types::Auth::User, null: true
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
 
   def resolve(args)
     response = context[:response]
@@ -37,7 +37,7 @@ class Mutations::Auth::SignUp < GraphQL::Schema::Mutation
           { field: field.to_s.camelize(:lower), message: messages.first.capitalize }
         end,
         success: false,
-        user: nil,
+        user: nil
       }
     end
   end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Mutations::Auth::UnlockAccount < GraphQL::Schema::Mutation
+  argument :id, ID, required: true do
+    description 'User id'
+  end
+
+  field :errors, [::Types::Auth::Error], null: false
+  field :success, Boolean, null: false
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
+
+  def resolve(id:)
+    user = User.where.not(locked_at: nil).find_by id: id
+
+    if context[:current_user] && user.present? && user.unlock_access!
+      {
+        errors: [],
+        success: true,
+        user: user
+      }
+    else
+      {
+        errors: [
+          { field: :_error, message: I18n.t('devise.unlocks.cannot_unlock') }
+        ],
+        success: false,
+        user: user
+      }
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ class Mutations::Auth::UpdateAccount < GraphQL::Schema::Mutation
 
   field :errors, [::Types::Auth::Error], null: false
   field :success, Boolean, null: false
-  field :user, ::Types::Auth::User, null: true
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
 
   def resolve(args)
     user = context[:current_user]

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

@@ -3,17 +3,26 @@
 class Mutations::Auth::ValidateToken < GraphQL::Schema::Mutation
   field :errors, [::Types::Auth::Error], null: false
   field :success, Boolean, null: false
-  field :user, ::Types::Auth::User, null: true
+  field :user, GraphQL::Auth.configuration.user_type.constantize, null: true
   field :valid, Boolean, null: false
 
   def resolve
     user = context[:current_user]
 
-    {
-      errors: [],
-      success: user.present?,
-      user: user,
-      valid: user.present?,
-    }
+    if user.present? && !user.access_locked?
+      {
+        errors: [],
+        success: true,
+        user: user,
+        valid: true
+      }
+    else
+      {
+        errors: [],
+        success: false,
+        user: nil,
+        valid: false
+      }
+    end
   end
 end

data/app/graphql/types/graphql_auth.rb

@@ -3,13 +3,24 @@
 module Types::GraphqlAuth
   include GraphQL::Schema::Interface
 
-  field :sign_in, mutation: GraphQL::Auth.configuration.sign_in_mutation
-  field :sign_up, mutation: GraphQL::Auth.configuration.sign_up_mutation
-
-  field :forgot_password, mutation: GraphQL::Auth.configuration.forgot_password_mutation
-  field :reset_password, mutation: GraphQL::Auth.configuration.reset_password_mutation
-  
-  field :update_account, mutation: GraphQL::Auth.configuration.update_account_mutation
-  
-  field :validate_token, mutation: GraphQL::Auth.configuration.validate_token_mutation
-end
+  field :sign_in, mutation: ::Mutations::Auth::SignIn
+
+  if GraphQL::Auth.configuration.lock_account_mutation
+    field :sign_up, mutation: ::Mutations::Auth::SignUp
+  end
+
+  field :forgot_password, mutation: ::Mutations::Auth::ForgotPassword
+  field :reset_password, mutation: ::Mutations::Auth::ResetPassword
+
+  field :update_account, mutation: ::Mutations::Auth::UpdateAccount
+
+  field :validate_token, mutation: ::Mutations::Auth::ValidateToken
+
+  if GraphQL::Auth.configuration.lock_account_mutation
+    field :lock_account, mutation: Mutations::Auth::LockAccount
+  end
+
+  if GraphQL::Auth.configuration.unlock_account_mutation
+    field :unlock_account, mutation: Mutations::Auth::UnlockAccount
+  end
+end

data/app/helpers/graphql/auth_helper.rb

@@ -9,40 +9,36 @@ module Graphql
     def context
       {
         current_user: current_user,
-        response: response,
+        response: response
       }
     end
 
     # set current user from Authorization header
     def current_user
-      return if request.headers['Authorization'].nil?
+      authorization_token = request.headers['Authorization']
+      return nil if authorization_token.nil?
 
-      decrypted_token = GraphQL::Auth::JwtManager.decode(request.headers['Authorization'])
-
-      user_id = decrypted_token['user']
-      user = User.find_by id: user_id
+      decrypted_token = GraphQL::Auth::JwtManager.decode(authorization_token)
+      user = User.find_by id: decrypted_token['user']
+      return nil if user.blank? || user.access_locked?
 
       # update token if user is found with token
-      if user.present?
-        generate_access_token(user, response)
-      end
+      generate_access_token(user, response)
 
       user
 
     # rescue expired Authorization header with RefreshToken header
     rescue JWT::ExpiredSignature
-      return nil if request.headers['RefreshToken'].nil?
+      refresh_token = request.headers['RefreshToken']
+      return nil if refresh_token.nil?
 
-      user = User.find_by refresh_token: request.headers['RefreshToken']
+      user = User.find_by refresh_token: refresh_token
+      return nil if user.blank? || user.access_locked?
 
-      if user.present?
-        generate_access_token(user, response)
-        set_refresh_token(user, response)
-      end
+      generate_access_token(user, response)
+      set_refresh_token(user, response)
 
       user
     end
-
-
   end
 end

data/db/migrate/20190226175233_add_lockable_to_devise.rb

@@ -0,0 +1,5 @@
+class AddLockableToDevise < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :locked_at, :datetime
+  end
+end

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

@@ -3,15 +3,9 @@ GraphQL::Auth.configure do |config|
   # config.jwt_secret_key = ENV['JWT_SECRET_KEY']
   # config.app_url = ENV['APP_URL']
 
-  # config.user_type = ::Type::Auth::User
+  # config.user_type = '::Types::Auth::User'
 
-  # config.sign_in_mutation = ::Mutations::Auth::SignIn
-  # config.sign_up_mutation = ::Mutations::Auth::SignUp
-
-  # config.forgot_password_mutation = ::Mutations::Auth::ForgotPassword
-  # config.reset_password_mutation = ::Mutations::Auth::ResetPassword
-
-  # config.update_account_mutation = ::Mutations::Auth::UpdateAccount
-
-  # config.validate_token_mutation = ::Mutations::Auth::ValidateToken
+  # config.sign_up_mutation = false
+  # config.lock_account_mutation = false
+  # config.unlock_account_mutation = false
 end

data/lib/graphql-auth/configuration.rb

@@ -5,29 +5,20 @@ module GraphQL
                     :jwt_secret_key,
                     :app_url,
                     :user_type,
-                    :sign_in_mutation,
                     :sign_up_mutation,
-                    :forgot_password_mutation,
-                    :reset_password_mutation,
-                    :update_account_mutation,
-                    :validate_token_mutation
+                    :lock_account_mutation,
+                    :unlock_account_mutation
 
       def initialize
         @token_lifespan = 4.hours
         @jwt_secret_key = ENV['JWT_SECRET_KEY']
         @app_url = ENV['APP_URL']
 
-        @user_type = ::Types::Auth::User
+        @user_type = '::Types::Auth::User'
 
-        @sign_in_mutation = ::Mutations::Auth::SignIn
-        @sign_up_mutation = ::Mutations::Auth::SignUp
-
-        @forgot_password_mutation = ::Mutations::Auth::ForgotPassword
-        @reset_password_mutation = ::Mutations::Auth::ResetPassword
-
-        @update_account_mutation = ::Mutations::Auth::UpdateAccount
-
-        @validate_token_mutation = ::Mutations::Auth::ValidateToken
+        @sign_up_mutation = false
+        @lock_account_mutation = false
+        @unlock_account_mutation = false
       end
     end
   end

data/lib/graphql-auth/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Auth
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: graphql-auth
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Guillaume Ferland
+- Brice Sanchez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,9 +147,11 @@ files:
 - README.md
 - Rakefile
 - app/graphql/mutations/auth/forgot_password.rb
+- app/graphql/mutations/auth/lock_account.rb
 - app/graphql/mutations/auth/reset_password.rb
 - app/graphql/mutations/auth/sign_in.rb
 - app/graphql/mutations/auth/sign_up.rb
+- app/graphql/mutations/auth/unlock_account.rb
 - app/graphql/mutations/auth/update_account.rb
 - app/graphql/mutations/auth/validate_token.rb
 - app/graphql/types/auth/error.rb
@@ -158,6 +161,7 @@ files:
 - app/helpers/graphql/token_helper.rb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - db/migrate/20190108151146_add_refresh_token_to_user.rb
+- db/migrate/20190226175233_add_lockable_to_devise.rb
 - lib/generators/graphql_auth/install_generator.rb
 - lib/generators/graphql_auth/templates/graphql_auth.rb.erb
 - lib/graphql-auth.rb