authentication-zero 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34663ddecbc5d0c0276a99a7f7d0f867e90c2f731e1c56a5d508738469647795
-  data.tar.gz: bbffe8e2dff90913524ff9744efa49cb1097d78745206579bb49251472a016ed
+  metadata.gz: 6a0e9d758b6d4e0b0c40fbda4a80145e842d11a5cf0b4ec06491bcef39eeae7d
+  data.tar.gz: 5701d90d2ca54430f67984367d2e0fd26e2fbe137a4d2d1e3261173c62072724
 SHA512:
-  metadata.gz: 38dd57dfb438408fb9ff4099508568c90bc9416fe5e624b4e38eaeba4f886e61340a2104976e62d9214d95d57f45a15a8dac6dd8789022a4cf24f6225f4e98be
-  data.tar.gz: 9393b6ceb9203be1bf0c5643640422ec8c64d96af34b01087f20d533ed781dd8f6b553350d698658a8b5cf1a07b36c965822a03d836451bdcec44c882f87a39f
+  metadata.gz: 4fcdd24221c895d34988aa6be949a9dd5ba7be283df6e48acb0431bad502c6dd8212617e766d7f547c90135ea19f4956d97369621efb5409c6907afe3d7ab65c
+  data.tar.gz: 93308abcdfa186d607fec5b920bae4e87c1a1f92638b74d012a7d6e3e7914339efb9c8bdb9e41e7ac36531ef082535a3933d5b7a0ebcd02ae0c56f28cb926d18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (2.13.0)
+    authentication-zero (2.14.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.13.0"
+  VERSION = "2.14.0"
 end

data/lib/generators/authentication/templates/controllers/api/application_controller.rb.tt

@@ -11,14 +11,12 @@ class ApplicationController < ActionController::API
   end
   <%- end -%>
   <%- if options.lockable? %>
-  def self.lock_on(actions, wait: 1.minute, attempts: 1000, &block)
-    before_action(only: actions) do
-      counter = Kredis.counter("lock_on:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)
-      counter.increment
+  def require_lock(wait: 1.hour, attempts: 10)
+    counter = Kredis.counter("require_lock:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)
+    counter.increment
 
-      if counter.value > attempts
-        instance_exec(&block)
-      end
+    if counter.value > attempts
+      render json: { error: "You've exceeded the maximum number of attempts" }, status: :too_many_requests
     end
   end
   <%- end -%>

data/lib/generators/authentication/templates/controllers/api/identity/password_resets_controller.rb.tt

@@ -3,9 +3,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   before_action :set_user, only: :update
   <%- if options.lockable? %>
-  lock_on :create, wait: 1.hour, attempts: 10 do
-    render json: { error: "You've exceeded the maximum number of attempts" }, status: :too_many_requests
-  end
+  before_action :require_lock, only: :create
   <%- end -%>
 
   def create

data/lib/generators/authentication/templates/controllers/html/application_controller.rb.tt

@@ -9,14 +9,12 @@ class ApplicationController < ActionController::Base
   end
   <%- end -%>
   <%- if options.lockable? %>
-  def self.lock_on(actions, wait: 1.minute, attempts: 1000, &block)
-    before_action(only: actions) do
-      counter = Kredis.counter("lock_on:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)
-      counter.increment
+  def require_lock(wait: 1.hour, attempts: 10)
+    counter = Kredis.counter("require_lock:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)
+    counter.increment
 
-      if counter.value > attempts
-        instance_exec(&block)
-      end
+    if counter.value > attempts
+      redirect_to new_identity_password_reset_path, alert: "You've exceeded the maximum number of attempts"
     end
   end
   <%- end -%>

data/lib/generators/authentication/templates/controllers/html/identity/password_resets_controller.rb.tt

@@ -3,9 +3,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   before_action :set_user, only: %i[ edit update ]
   <%- if options.lockable? %>
-  lock_on :create, wait: 1.hour, attempts: 10 do
-    redirect_to new_identity_password_reset_path, alert: "You've exceeded the maximum number of attempts"
-  end
+  before_action :require_lock, only: :create
   <%- end -%>
 
   def new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies: []
 description:
 email: