recaptcha 5.19.0 → 5.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fa7316f287cfcec8e2b06d36481f1fa596d1b629810a784fae509c55255b2f
-  data.tar.gz: 7cf82254973204d7ac47b6bba428ff394e24c9ec5dbbb5669657b4c10b30c16b
+  metadata.gz: 995e891c595981b495f6911abe80bdc9de1df1f2d445e12cc9129f4fcc5d523d
+  data.tar.gz: b160af36ee62814a45c2c3e96a0e6e268521b6f0eacc7dee2bcc130068384dd9
 SHA512:
-  metadata.gz: 572402b7af72a67f76a1952cb7e5739a7cf4073ba0b510f55f8f74bc59a6e6116bad1be5ece41e20a43cb2d3c36c7ab2bca072b8a4c27b5a1db16d1007846284
-  data.tar.gz: 021a0fa67e25aee448c66c43ae5fd3295d1472329bccdcfe4a5acf2c6fe90fd83c9cdcf8963db29816919fb6383d49c8303d41032e1af8abde3dcafbdeacc36a
+  metadata.gz: fa21ffc606ec9e389970f607aaab34449a21454c4ce5044092ae773dab3a2f622b097504969dd4ec3e532222bed29b8185936f4def1ec17886201ff1869106cd
+  data.tar.gz: 7dfe2542b8cda9555c578c4c9c1977d5ddc6ac6a8955b19f0b5abb96e5946cb4d7b25627a107f8bd2aa60984cb6babd0594fc1ae6e856f66ca500265f92be484

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Next
 
-
+## 5.20.0
+* turn recpatch reply into a object with logic
 
 ## 5.19.0
 * require a minimum lenght of 100 for responses, configured via response_minimum

data/lib/recaptcha/adapters/controller_methods.rb

@@ -31,16 +31,18 @@ module Recaptcha
 
             success, @_recaptcha_reply =
               Recaptcha.verify_via_api_call(recaptcha_response, options.merge(with_reply: true))
+
             unless success
-              @_recaptcha_failure_reason = if @_recaptcha_reply["score"] &&
-                                              @_recaptcha_reply["score"].to_f < options[:minimum_score].to_f
-                "Recaptcha score didn't exceed the minimum: #{@_recaptcha_reply["score"]} < #{options[:minimum_score]}."
-              elsif @_recaptcha_reply['error-codes']
-                "Recaptcha api call returned with error-codes: #{@_recaptcha_reply['error-codes']}."
-              else
-                "Recaptcha failure after api call. Api reply: #{@_recaptcha_reply}."
-              end
+              @_recaptcha_failure_reason =
+                if @_recaptcha_reply.score && @_recaptcha_reply.score.to_f < options[:minimum_score].to_f
+                  "Recaptcha score didn't exceed the minimum: #{@_recaptcha_reply.score} < #{options[:minimum_score]}."
+                elsif @_recaptcha_reply.error_codes.any?
+                  "Recaptcha api call returned with error-codes: #{@_recaptcha_reply.error_codes}."
+                else
+                  "Recaptcha failure after api call. Api reply: #{@_recaptcha_reply}."
+                end
             end
+
             success
           end
 

data/lib/recaptcha/reply.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Recaptcha
+  class Reply
+    def initialize(raw_reply, enterprise:)
+      @raw_reply = raw_reply
+      @enterprise = enterprise
+    end
+
+    def success?(options = {})
+      success.to_s == 'true' &&
+        hostname_valid?(options[:hostname]) &&
+        action_valid?(options[:action]) &&
+        score_above_threshold?(options[:minimum_score]) &&
+        score_below_threshold?(options[:maximum_score])
+    end
+
+    def token_properties
+      @raw_reply['tokenProperties'] if enterprise?
+    end
+
+    def success
+      if enterprise?
+        token_properties&.dig('valid')
+      else
+        @raw_reply['success']
+      end
+    end
+
+    def hostname
+      if enterprise?
+        token_properties&.dig('hostname')
+      else
+        @raw_reply['hostname']
+      end
+    end
+
+    def action
+      if enterprise?
+        token_properties&.dig('action')
+      else
+        @raw_reply['action']
+      end
+    end
+
+    def score
+      if enterprise?
+        @raw_reply.dig('riskAnalysis', 'score')
+      else
+        @raw_reply['score'] unless enterprise?
+      end
+    end
+
+    def error_codes
+      if enterprise?
+        []
+      else
+        @raw_reply['error-codes'] || []
+      end
+    end
+
+    def challenge_ts
+      return @raw_reply['challenge_ts'] unless enterprise?
+
+      token_properties&.dig('createTime')
+    end
+
+    def hostname_valid?(validation)
+      validation ||= Recaptcha.configuration.hostname
+
+      case validation
+      when nil, FalseClass
+        true
+      when String
+        validation == hostname
+      else
+        validation.call(hostname)
+      end
+    end
+
+    def action_valid?(expected_action)
+      case expected_action
+      when nil, FalseClass
+        true
+      else
+        action == expected_action.to_s
+      end
+    end
+
+    def score_above_threshold?(minimum_score)
+      !minimum_score || (score && score >= minimum_score)
+    end
+
+    def score_below_threshold?(maximum_score)
+      !maximum_score || (score && score <= maximum_score)
+    end
+
+    def enterprise?
+      @enterprise
+    end
+
+    def to_h
+      @raw_reply
+    end
+
+    def to_s
+      @raw_reply.to_s
+    end
+
+    def to_json(*args)
+      @raw_reply.to_json(*args)
+    end
+  end
+end

data/lib/recaptcha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Recaptcha
-  VERSION = '5.19.0'
+  VERSION = '5.20.0'
 end

data/lib/recaptcha.rb

@@ -6,6 +6,7 @@ require 'uri'
 
 require 'recaptcha/configuration'
 require 'recaptcha/helpers'
+require 'recaptcha/reply'
 require 'recaptcha/adapters/controller_methods'
 require 'recaptcha/adapters/view_methods'
 if defined?(Rails)
@@ -76,21 +77,10 @@ module Recaptcha
     body['event']['expectedAction'] = options[:action] if options.key?(:action)
     body['event']['userIpAddress'] = options[:remote_ip] if options.key?(:remote_ip)
 
-    reply = api_verification_enterprise(query_params, body, project_id, timeout: options[:timeout])
-    score = reply.dig('riskAnalysis', 'score')
-    token_properties = reply['tokenProperties']
-    success = !token_properties.nil? &&
-      token_properties['valid'].to_s == 'true' &&
-      hostname_valid?(token_properties['hostname'], options[:hostname]) &&
-      action_valid?(token_properties['action'], options[:action]) &&
-      score_above_threshold?(score, options[:minimum_score]) &&
-      score_below_threshold?(score, options[:maximum_score])
-
-    if options[:with_reply] == true
-      [success, reply]
-    else
-      success
-    end
+    raw_reply = api_verification_enterprise(query_params, body, project_id, timeout: options[:timeout])
+    reply = Reply.new(raw_reply, enterprise: true)
+    result = reply.success?(options)
+    options[:with_reply] == true ? [result, reply] : result
   end
 
   def self.verify_via_api_call_free(response, options)
@@ -98,43 +88,10 @@ module Recaptcha
     verify_hash = { 'secret' => secret_key, 'response' => response }
     verify_hash['remoteip'] = options[:remote_ip] if options.key?(:remote_ip)
 
-    reply = api_verification_free(verify_hash, timeout: options[:timeout], json: options[:json])
-    success = reply['success'].to_s == 'true' &&
-      hostname_valid?(reply['hostname'], options[:hostname]) &&
-      action_valid?(reply['action'], options[:action]) &&
-      score_above_threshold?(reply['score'], options[:minimum_score]) &&
-      score_below_threshold?(reply['score'], options[:maximum_score])
-
-    if options[:with_reply] == true
-      [success, reply]
-    else
-      success
-    end
-  end
-
-  def self.hostname_valid?(hostname, validation)
-    validation ||= configuration.hostname
-
-    case validation
-    when nil, FalseClass then true
-    when String then validation == hostname
-    else validation.call(hostname)
-    end
-  end
-
-  def self.action_valid?(action, expected_action)
-    case expected_action
-    when nil, FalseClass then true
-    else action == expected_action.to_s
-    end
-  end
-
-  def self.score_above_threshold?(score, minimum_score)
-    !minimum_score || (score && score >= minimum_score)
-  end
-
-  def self.score_below_threshold?(score, maximum_score)
-    !maximum_score || (score && score <= maximum_score)
+    raw_reply = api_verification_free(verify_hash, timeout: options[:timeout], json: options[:json])
+    reply = Reply.new(raw_reply, enterprise: false)
+    result = reply.success?(options)
+    options[:with_reply] == true ? [result, reply] : result
   end
 
   def self.http_client_for(uri:, timeout: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 5.19.0
+  version: 5.20.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -139,6 +139,7 @@ files:
 - lib/recaptcha/helpers.rb
 - lib/recaptcha/rails.rb
 - lib/recaptcha/railtie.rb
+- lib/recaptcha/reply.rb
 - lib/recaptcha/version.rb
 - rails/locales/de.yml
 - rails/locales/en.yml