katalyst-google-apis 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51f52aae567e3a56c4527cddaf6b18846e2c6e3ea67ee71c163688d1f6e8da72
-  data.tar.gz: 5d55b8005640afd0c0e4e415d7bb898a2239635e29c3cd0225058536c95efb0b
+  metadata.gz: 5794e6da69ca70b6edb9a8e7bc30e75b8536d9d436422f3db7e311997aa44fee
+  data.tar.gz: 47e4870067a6c655821415606a2446f80535b76623900290c16fe35441865966
 SHA512:
-  metadata.gz: 030e7a79106cc553df2962296d937b921ce51fd2247bf81ff8bc44f9628f6b460cbaee2d866cecf2e3dc204e2091c37e188028352a7442030a82cd3ac19792bf
-  data.tar.gz: 17952c835ecd2ded66860405972345db0d5252eaf0f18d0ff41b209a378cac06451b4cf6d97d90d8246dc24ad9c5b76158cb75be36a7f025ee1bac939cf623f1
+  metadata.gz: 14b904f1003fe047a112aea03619c29a9bdca4ec9c486e4143b1c2f02d4995837d0033a1319335d4036beb53e12c6e49483d6a23c9cfdc0303711fc8bbab3d3d
+  data.tar.gz: 5d7693c3922f2573b711a033a5313b35dc0fdfb0156ee4b44f00d1c5df1316df611a9062ad1a7b1750e319b7242d34f9500d4ec4c0cac226ad841ba9de2dc521

data/app/assets/javascripts/controllers/recaptcha_controller.js

@@ -10,25 +10,6 @@ enterprise.ready = (f) => {
   (config["fns"] ||= []).push(f);
 };
 
-/**
- * Inject recaptcha enterprise script into the head, unless it is already there.
- */
-function injectRecaptchaScripts() {
-  if (document.head.querySelector("script[src*='recaptcha/enterprise']")) {
-    return;
-  }
-
-  const script = document.createElement("script");
-  script.setAttribute(
-    "src",
-    "https://www.google.com/recaptcha/enterprise.js?render=explicit",
-  );
-  script.toggleAttribute("async", true);
-  script.toggleAttribute("defer", true);
-
-  document.head.appendChild(script);
-}
-
 export default class RecaptchaController extends Controller {
   static values = {
     siteKey: String,
@@ -122,3 +103,40 @@ export default class RecaptchaController extends Controller {
     return this.element.nextElementSibling;
   }
 }
+
+function getMetaElement(name) {
+  return document.querySelector(`meta[name="${name}"]`);
+}
+
+function getCspNonce() {
+  const element = getMetaElement("csp-nonce");
+  if (element) {
+    const {nonce: nonce, content: content} = element;
+    return nonce === "" ? content : nonce;
+  }
+}
+
+function createRecaptchaScriptElement() {
+  const element = document.createElement("script");
+  element.src = "https://www.google.com/recaptcha/enterprise.js?render=explicit";
+  const cspNonce = getCspNonce();
+  if (cspNonce) {
+    element.setAttribute("nonce", cspNonce);
+  }
+  element.async = true
+  element.defer = true
+
+  return element;
+}
+
+/**
+ * Inject recaptcha enterprise script into the head, unless it is already there.
+ */
+function injectRecaptchaScripts() {
+  let element = document.head.querySelector("script[src*='recaptcha/enterprise']");
+  if (!element) {
+    element = createRecaptchaScriptElement();
+    document.head.appendChild(element);
+  }
+  return element;
+}

data/app/services/katalyst/google_apis/credentials.rb

@@ -43,7 +43,7 @@ module Katalyst
         include ActiveModel::Model
         include ActiveModel::Attributes
 
-        attribute :scope, :string, default: "https://www.googleapis.com/auth/cloud-platform"
+        attribute :scope, :string
         attribute :service_account_email, :string
         attribute :project_number, :integer
         attribute :identity_pool, :string

data/lib/katalyst/google_apis.rb

@@ -18,12 +18,14 @@ module Katalyst
       yield(config)
     end
 
-    def credentials
-      @credentials ||= Credentials.new(
+    def credentials(scope: "https://www.googleapis.com/auth/cloud-platform")
+      @credentials        ||= {}
+      @credentials[scope] ||= Credentials.new(
         project_number:        config.project_number,
         service_account_email: config.service_account_email,
         identity_pool:         config.identity_pool,
         identity_provider:     config.identity_provider,
+        scope:,
       )
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-google-apis
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Google REST APIs for use in Rails projects
 test_files: []