cloudflare_client_rb 4.2.7 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 781fa68d768317105d936c42203e717c9fa760f2
-  data.tar.gz: 4b04969de67f023b90a7054c6638e5f1bd3801f7
+  metadata.gz: 125802fef0c3221bb92cde156cafd90ded68d591
+  data.tar.gz: 627757654b8419bab16194820c5bbc5e4b8d7ba9
 SHA512:
-  metadata.gz: a5adf49cd33d6fc7a8370a7627ffd9f9e9d9d972dd5f5e736c7e9de507b9ff39b6de88adfade73a4f7fd6ab1ab92861676d4d9447bed2d28e953cc23f6c13e59
-  data.tar.gz: c6ff857e320a7708eebdc9b15e7bfa9f0fa261d1ffa51311eed8adb7a2d31220ea15f9199b6e9d2a77472ec1fb01c4fc246aaa4fc301949b23cc3cb48aa9a2bf
+  metadata.gz: 60eeece7b3ecd4d5b975415017aac7035c587422bae15fd1cef05a2e217885737dec81645bd221c3c0c4bdeb26f66c0b49798f7ac8a5f4a29a6e1e71800b2178
+  data.tar.gz: 1578ee65e475099591342d754ff59f1abb7ea2bb00b56c96b2383fc28aaf3a51fa6957644933e2b770d8f3836ba0b414976a9309a1a07af91adc4c8ed46fb15d

data/lib/cloudflare_client.rb

@@ -51,10 +51,10 @@ class CloudflareClient
     websockets
   ].freeze
 
-  def initialize(auth_key: nil, email: nil, &block)
-    raise('Missing auth_key') if auth_key.nil?
-    raise('missing email') if email.nil?
-    @cf_client ||= build_client(auth_key: auth_key, email: email, &block)
+  def initialize(auth_key: nil, email: nil, auth_token: nil, &block)
+    raise('Missing auth_key or auth_token') if auth_key.nil? && auth_token.nil?
+    raise('missing email') if email.nil? && !auth_key.nil?
+    @cf_client ||= build_client(auth_key: auth_key, email: email, auth_token: auth_token, &block)
   end
 
   #TODO: add the time based stuff
@@ -137,10 +137,16 @@ class CloudflareClient
       conn.request :url_encoded
       conn.use Middleware::Response::RaiseError
     end
-    client.headers['X-Auth-Key']                = params[:auth_key]
-    client.headers['X-Auth-User-Service-Key	'] = params[:auth_key] #FIXME, is this always the same?
-    client.headers['X-Auth-Email']              = params[:email]
+
     client.headers['Content-Type']              = 'application/json'
+    if params[:auth_token]
+      client.headers['Authorization'] = "Bearer #{params[:auth_token]}"
+    else
+      client.headers['X-Auth-Key']                = params[:auth_key]
+      client.headers['X-Auth-User-Service-Key	']  = params[:auth_key] #FIXME, is this always the same?
+      client.headers['X-Auth-Email']              = params[:email]
+    end
+
     yield client if block_given?
     client.adapter :net_http
     client
@@ -203,4 +209,4 @@ class CloudflareClient
     return false unless POSSIBLE_API_SETTINGS.include?(name)
     true
   end
-end
+end

data/lib/cloudflare_client/version.rb

@@ -1,3 +1,3 @@
 class CloudflareClient
-  VERSION = "4.2.7"
+  VERSION = "4.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare_client_rb
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.10
 platform: ruby
 authors:
 - ian waters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: iwaters@zendesk.com
@@ -52,7 +52,7 @@ files:
 - lib/cloudflare_client/zone/subscription.rb
 homepage: https://github.com/zendesk/cloudflare_client_rb
 licenses:
-- Apache License Version 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []