@nodeart/cloudflare-provisioning 1.0.9 → 1.0.11

package/cloudflare.js

@@ -284,8 +284,13 @@ class CloudFlare {
   async rewriteFirewallRules (firewallRules) {
     const { id: rulesetId, rules: currentFirewallRules } = await this.getFirewallRules()
 
+    if (!rulesetId) {
+      console.error(`Could not update firewall rules for domain ${this.domain}: custom firewall ruleset id is not found`)
+      throw new Error('Custom firewall ruleset id is not found')
+    }
+
     for (const firewallRule of firewallRules) {
-      const currentFirewallRule = currentFirewallRules.find(
+      const currentFirewallRule = currentFirewallRules?.find(
         rule => rule.description === firewallRule.description
       )
 
@@ -420,8 +425,13 @@ class CloudFlare {
   async rewriteRedirectRules (redirectRules) {
     const { id: rulesetId, rules: currentRedirectRules } = await this.getRedirectRules()
 
+    if (!rulesetId) {
+      console.error(`Could not update redirect rules for domain ${this.domain}: custom firewall ruleset id is not found`)
+      throw new Error('Custom redirect ruleset id is not found')
+    }
+
     for (const redirectRule of redirectRules) {
-      const currentRedirectRule = currentRedirectRules.find(
+      const currentRedirectRule = currentRedirectRules?.find(
         rule => rule.description === redirectRule.description
       )
 

package/index.js

@@ -36,6 +36,7 @@ async function applyCloudflareSettings (config) {
 
   const accountEmail = process.env.CLOUDFLARE_EMAIL
   const accountKey = process.env.CLOUDFLARE_API_KEY
+  const accountToken = process.env.CLOUDFLARE_TOKEN
 
   if (config.enabled === false) {
     console.log('Config is disabled and would not be applied:', config.domains)
@@ -50,9 +51,14 @@ async function applyCloudflareSettings (config) {
       throw new Error('Cloudflare zone ID is not defined')
     }
 
-    const options = site.token === undefined
-      ? { email: accountEmail, apiKey: accountKey }
-      : { token: site.token }
+    let options
+    if (site.token) {
+      options = { token: site.token }
+    } else if (accountToken) {
+      options = { token: accountToken }
+    } else {
+      options = { email: accountEmail, apiKey: accountKey }
+    }
 
     const cloudFlare = new CloudFlare(zoneId, site.domain, options)
     const domainSettings = substituteDomainName(settings, site.domain)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodeart/cloudflare-provisioning",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "",
   "main": "index.js",
   "scripts": {