recaptcha 5.12.2 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a8e985580ee7e6829b2b213403c7a7062167dac7f5184800b6585b0897cdaab
-  data.tar.gz: 9b7dd59495998217cdc96ec7436163f3faec7fccdc5c60ebd21611ccec1f9ad5
+  metadata.gz: 413f379aca4968847b291687d0c36e7ef432f7d6ebdce5b87c164afe45291b83
+  data.tar.gz: e277f54b020495ffe3a431e51ff3d8ed6080d01bc7a93a291f60894e888bc102
 SHA512:
-  metadata.gz: ce899e801c0679cfa3e4074826ef349d6142914fafbef12bfd69467811b3e7d4855638f53f13f469224f5500911f4481240c54d5f394bc767337a1a3f747b778
-  data.tar.gz: d4c7626d90d7423d446bb03178476c30e78db7a3834443f70bb395f3fe8380b7e5ae70cb8ab5a2931e9f82e1a0b5053ac59f1dad8ac6244f55bc9138e089b86c
+  metadata.gz: bcf166047a4de7972b3040301fb51f7b8b0a17b5c7f46ba9cef127c3418538635ffe707ac208b091254da5501538134285870f01ff880555e21cc7ff2ab39bf8
+  data.tar.gz: 9e8ad8cd049c352a48810b19c1611ac82f62d196a91af17f2baa8f568e9a77bc0d7aac3662cd52174cccca371afceae076bdb6d4f17072be90cf51268d714100

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Next
 
+## 5.13.0
+* Added option to ignore_no_element.
+
+## 5.12.3
+* Remove score fallback for enterprise
+* Update enterprise tests to v1 assessment schema
+
 ## 5.12.2
 * Fix minimum score for enterprise
 

data/README.md

@@ -427,6 +427,7 @@ but only accepts the following options:
 | `:inline_script`    | If `true`, adds an inline script tag that calls `grecaptcha.execute` for the given `site_key` and `action` and calls the `callback` with the resulting response token. Pass `false` if you want to handle calling `grecaptcha.execute` yourself. (default: `true`) |
 | `:element`          | The element to render, if any (default: `:input`)<br/>`:input`: Renders a hidden `<input type="hidden">` tag. The value of this will be set to the response token by the default `setInputWithRecaptchaResponseTokenFor{action}` callback.<br/>`false`: Doesn't render any tag. You'll have to add a custom callback that does something with the token. |
 | `:turbolinks`          | If `true`, calls the js function which executes reCAPTCHA after all the dependencies have been loaded. This cannot be used with the js param `:onload`. This makes reCAPTCHAv3 usable with turbolinks. |
+| `:ignore_no_element`  | If `true`, adds null element checker for forms that can be removed from the page by javascript like modals with forms. (default: true) |
 
 [JavaScript resource (api.js) parameters](https://developers.google.com/recaptcha/docs/invisible#js_param):
 

data/lib/recaptcha/helpers.rb

@@ -16,6 +16,7 @@ module Recaptcha
       options[:render] = site_key
       options[:script_async] ||= false
       options[:script_defer] ||= false
+      options[:ignore_no_element] = options.key?(:ignore_no_element) ? options[:ignore_no_element] : true
       element = options.delete(:element)
       element = element == false ? false : :input
       if element == :input
@@ -138,6 +139,7 @@ module Recaptcha
       nonce = options.delete(:nonce)
       skip_script = (options.delete(:script) == false) || (options.delete(:external_script) == false)
       ui = options.delete(:ui)
+      options.delete(:ignore_no_element)
 
       data_attribute_keys = [:badge, :theme, :type, :callback, :expired_callback, :error_callback, :size]
       data_attribute_keys << :tabindex unless ui == :button
@@ -206,7 +208,7 @@ module Recaptcha
             })
           };
 
-          #{recaptcha_v3_define_default_callback(callback) if recaptcha_v3_define_default_callback?(callback, action, options)}
+          #{recaptcha_v3_define_default_callback(callback, options) if recaptcha_v3_define_default_callback?(callback, action, options)}
         </script>
       HTML
     end
@@ -224,7 +226,7 @@ module Recaptcha
               });
             });
           };
-          #{recaptcha_v3_define_default_callback(callback) if recaptcha_v3_define_default_callback?(callback, action, options)}
+          #{recaptcha_v3_define_default_callback(callback, options) if recaptcha_v3_define_default_callback?(callback, action, options)}
         </script>
       HTML
     end
@@ -235,12 +237,12 @@ module Recaptcha
       options[:inline_script] != false
     end
 
-    private_class_method def self.recaptcha_v3_define_default_callback(callback)
+    private_class_method def self.recaptcha_v3_define_default_callback(callback, options)
       <<-HTML
-          var #{callback} = function(id, token) {
-            var element = document.getElementById(id);
-            element.value = token;
-          }
+        var #{callback} = function(id, token) {
+          var element = document.getElementById(id);
+          #{element_check_condition(options)} element.value = token;
+        }
       HTML
     end
 
@@ -328,5 +330,9 @@ module Recaptcha
     private_class_method def self.hash_to_query(hash)
       hash.delete_if { |_, val| val.nil? || val.empty? }.to_a.map { |pair| pair.join('=') }.join('&')
     end
+
+    private_class_method def self.element_check_condition(options)
+      options[:ignore_no_element] ? "if (element !== null)" : ""
+    end
   end
 end

data/lib/recaptcha/version.rb

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

data/lib/recaptcha.rb

@@ -77,7 +77,7 @@ module Recaptcha
     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') || reply['score']
+    score = reply.dig('riskAnalysis', 'score')
     token_properties = reply['tokenProperties']
     success = !token_properties.nil? &&
       token_properties['valid'].to_s == 'true' &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.13.0
 platform: ruby
 authors:
 - Jason L Perry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -163,7 +163,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/ambethia/recaptcha
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Helpers for the reCAPTCHA API
 test_files: []