cronofy 0.36.0 → 0.37.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e085c07872654ff1e239fcdce81beeb212856ce2ff7d9c3168e71c3f2778e6d5
-  data.tar.gz: 0ce2421b8e0aa2b39c76a72eaeeddd4a474573690a6d3ccdf437c1d57dbf0028
+  metadata.gz: f398fb44b861ba5df84e244632877a53b050f584c08d15a815cb0e4abaae13bc
+  data.tar.gz: 8cea161bbef6df1b41a3ff52b29984c9ccd3f713abe279a7137e1e0be89cd7d7
 SHA512:
-  metadata.gz: 8df4506dfe09d4454c8901e312dbda5d03a27d1ec8a0cb28506327f8802a691fa5abf00abd8028ee6f04d9c09eae73f3a0ea417409e7164b2fa1e0e4530bb2a3
-  data.tar.gz: fe07ce98f72073fa8c0254510a089fbf04d37d5da2a12b7c12d1de77e19e1666c394d14aca6d32d96ad2ee7093b1e276ad5571f0ffcfd615a4d269e70031e07b
+  metadata.gz: 5961670573669f876d06f772a1c96175ac2e37a06fb3b3c6a1c677da86f5cbcb50820aa1e71897b7e8379ec556b55f9b56751efb51037d2f642284e72f0f07ed
+  data.tar.gz: 7bf5e28b6786f2fee081d09562e9e2dd57a90652994d1755a13b76c9ad9484cb50ef9dce1784fd6921372a3f6b5b29888c2274e99ed13bdb196aa42036133233

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.37.3]
+
+ * Support `hmac_valid` as well as the original `hmac_match` for Client to verify a HMAC from a push notification using the client's secret.[#95] 
+
+## [0.37.2]
+
+ * Support `query_periods` as well as the original `available_periods` for Availability Query and Sequenced Availability [#91] 
+
+## [0.37.1]
+
+ * Rename `data_centre` to `data_centre` (with aliases for backwards compatibility) [#90] 
+
+## [0.37.0]
+
+ * Add `revoke_by_token` and `revoke_by_sub` to the Client [#86] 
+
+## [0.36.1]
+
+ * Loosen the version requirement on Hashie to allow 4.X
+
 ## [0.36.0]
 
  * Add support for Available Periods [#81]
@@ -167,6 +187,11 @@
 [0.34.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.34.0
 [0.35.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.35.0
 [0.36.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.36.0
+[0.36.1]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.36.1
+[0.37.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.37.0
+[0.37.1]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.37.1
+[0.37.2]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.37.2
+[0.37.3]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.37.3
 
 [#13]: https://github.com/cronofy/cronofy-ruby/pull/13
 [#16]: https://github.com/cronofy/cronofy-ruby/pull/16
@@ -207,3 +232,8 @@
 [#75]: https://github.com/cronofy/cronofy-ruby/pull/75
 [#77]: https://github.com/cronofy/cronofy-ruby/pull/77
 [#81]: https://github.com/cronofy/cronofy-ruby/pull/81
+[#85]: https://github.com/cronofy/cronofy-ruby/pull/85
+[#86]: https://github.com/cronofy/cronofy-ruby/pull/86
+[#90]: https://github.com/cronofy/cronofy-ruby/pull/90
+[#91]: https://github.com/cronofy/cronofy-ruby/pull/91
+[#95]: https://github.com/cronofy/cronofy-ruby/pull/95

data/README.md

@@ -1,9 +1,9 @@
 # Cronofy
 
-[![Build Status](https://travis-ci.org/cronofy/cronofy-ruby.svg?branch=master)](https://travis-ci.org/cronofy/cronofy-ruby)
+[![ruby CI](https://github.com/cronofy/cronofy-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/cronofy/cronofy-ruby/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/cronofy.svg)](http://badge.fury.io/rb/cronofy)
 
-[Cronofy](https://www.cronofy.com) - one API for all the calendars (Google, iCloud, Exchange, Office 365, Outlook.com)
+[Cronofy](https://www.cronofy.com) - the scheduling platform for business
 
 ## Installation
 
@@ -23,22 +23,21 @@ bundle install
 
 In order to use the Cronofy API you will need to [create a developer account](https://app.cronofy.com/sign_up/new).
 
-From there you can [use your Calendar Sandbox](https://app.cronofy.com/oauth/sandbox)
-to access your own calendars, or you can [create an OAuth application](https://app.cronofy.com/oauth/applications/new)
-to obtain an OAuth `client_id` and `client_secret` to be able to use the full
-API.
+From there you can [create an OAuth application](https://app.cronofy.com/oauth/applications/new)
+to obtain an OAuth `client_id` and `client_secret` to be able to use the full API.
 
 ## Creating a client
 
 To make calls to the Cronofy API you must create a `Cronofy::Client`. This takes
-four keyword arguments, all of which are optional:
+five keyword arguments, all of which are optional:
 
 ```ruby
 cronofy = Cronofy::Client.new(
   client_id:     'CLIENT_ID',
   client_secret: 'CLIENT_SECRET',
   access_token:  'ACCESS_TOKEN',
-  refresh_token: 'REFRESH_TOKEN'
+  refresh_token: 'REFRESH_TOKEN',
+  data_center:   :de
 )
 ```
 
@@ -53,6 +52,8 @@ If `client_id` and `client_secret` are not specified explicitly the values from
 the environment variables `CRONOFY_CLIENT_ID` and `CRONOFY_CLIENT_SECRET` will
 be used if present.
 
+`data_center` is the two-letter designation for the data center you want to operate against - for example `:de` for Germany, or `:au` for Australia. When omitted, this defaults to the US data center.
+
 ## Authorization
 
 [API documentation](https://www.cronofy.com/developers/api/#authorization)
@@ -133,6 +134,15 @@ To delete an event from user's calendar:
 cronofy.delete_event(calendar_id, 'uniq-id')
 ```
 
+## A feature I want is not in the SDK, how do I get it?
+
+We add features to this SDK as they are requested, to focus on developing the Cronofy API.
+
+If you're comfortable contributing support for an endpoint or attribute, then we love to receive pull requests!
+Please create a PR mentioning the feature/API endpoint you’ve added and we’ll review it as soon as we can.
+
+If you would like to request a feature is added by our team then please let us know by getting in touch via [support@cronofy.com](mailto:support@cronofy.com).
+
 ## Links
 
  * [API documentation](https://www.cronofy.com/developers/api)

data/cronofy.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |spec|
   spec.version       = Cronofy::VERSION
   spec.authors       = ["Sergii Paryzhskyi", "Garry Shutler"]
   spec.email         = ["parizhskiy@gmail.com", "garry@cronofy.com"]
-  spec.summary       = %q{Cronofy - one API for all the calendars}
+  spec.summary       = %q{Cronofy - the scheduling platform for business}
   spec.description   = %q{Ruby wrapper for Cronofy's unified calendar API}
   spec.homepage      = "https://github.com/cronofy/cronofy-ruby"
   spec.license       = "MIT"
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.files        += Dir['spec/**/*.rb']
   spec.test_files    = Dir['spec/**/*.rb']
 
+  spec.add_runtime_dependency "hashie", ">= 2.1", "< 5"
   spec.add_runtime_dependency "oauth2", "~> 1.0"
-  spec.add_runtime_dependency "hashie", ">= 2.1", "< 4"
 
   spec.add_development_dependency "bundler", ">=  1.6", "< 3"
   spec.add_development_dependency "rake",    "~> 10.0"

data/lib/cronofy.rb

@@ -13,18 +13,26 @@ require 'openssl'
 
 module Cronofy
   def self.default_data_centre
-    @default_data_centre || ENV['CRONOFY_DATA_CENTRE']
+    default_data_center
   end
 
   def self.default_data_centre=(value)
-    @default_data_centre = value
+    default_data_center= value
   end
 
-  def self.api_url(data_centre_override)
-    if data_centre_override
-      api_url_for_data_centre(data_centre_override)
+  def self.default_data_center
+    @default_data_center || ENV['CRONOFY_DATA_CENTER'] || ENV['CRONOFY_DATA_CENTRE']
+  end
+
+  def self.default_data_center=(value)
+    @default_data_center = value
+  end
+
+  def self.api_url(data_center_override)
+    if data_center_override
+      api_url_for_data_center(data_center_override)
     else
-      ENV['CRONOFY_API_URL'] || api_url_for_data_centre(default_data_centre)
+      ENV['CRONOFY_API_URL'] || api_url_for_data_center(default_data_center)
     end
   end
 
@@ -32,7 +40,11 @@ module Cronofy
     @api_url = value
   end
 
-  def self.api_url_for_data_centre(dc)
+  def self.api_url_for_data_centre
+    api_url_for_data_center
+  end
+
+  def self.api_url_for_data_center(dc)
     @api_urls ||= Hash.new do |hash, key|
       if key.nil? || key.to_sym == :us
         url = "https://api.cronofy.com"
@@ -46,11 +58,11 @@ module Cronofy
     @api_urls[dc]
   end
 
-  def self.app_url(data_centre_override)
-    if data_centre_override
-      app_url_for_data_centre(data_centre_override)
+  def self.app_url(data_center_override)
+    if data_center_override
+      app_url_for_data_center(data_center_override)
     else
-      ENV['CRONOFY_APP_URL'] || app_url_for_data_centre(default_data_centre)
+      ENV['CRONOFY_APP_URL'] || app_url_for_data_center(default_data_center)
     end
   end
 
@@ -59,6 +71,10 @@ module Cronofy
   end
 
   def self.app_url_for_data_centre(dc)
+    app_url_for_data_center(dc)
+  end
+
+  def self.app_url_for_data_center(dc)
     @app_urls ||= Hash.new do |hash, key|
       if key.nil? || key.to_sym == :us
         url = "https://app.cronofy.com"

data/lib/cronofy/auth.rb

@@ -11,13 +11,13 @@ module Cronofy
       access_token = options[:access_token]
       client_id = options[:client_id]
       client_secret = options[:client_secret]
-      data_centre = options[:data_centre]
+      data_center = options[:data_center]
       refresh_token = options[:refresh_token]
 
       @client_credentials_missing = blank?(client_id) || blank?(client_secret)
 
-      @auth_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.app_url(data_centre), connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
-      @api_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.api_url(data_centre), connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
+      @auth_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.app_url(data_center), connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
+      @api_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.api_url(data_center), connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
 
       set_access_token(access_token, refresh_token) if access_token || refresh_token
       set_api_key(client_secret) if client_secret
@@ -118,20 +118,50 @@ module Cronofy
     def revoke!
       raise CredentialsMissingError.new("No credentials to revoke") unless access_token
 
+      token = access_token.refresh_token || access_token.token
+      revoke_by_token(token)
+      @access_token = nil
+    end
+
+    # Internal: Revokes an authorization by the sub
+    #
+    # Returns nothing.
+    #
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
+    def revoke_by_sub(sub)
+      do_revoke(sub: sub)
+    end
+
+    # Internal: Revokes an authorization via the token
+    #
+    # Returns nothing.
+    #
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
+    def revoke_by_token(token)
+      do_revoke(token: token)
+    end
+
+    private
+
+    def do_revoke(token: nil, sub: nil)
+      raise CredentialsMissingError.new("No credentials to revoke") unless token || sub
+
       do_request do
         body = {
           client_id: @api_client.id,
           client_secret: @api_client.secret,
-          token: access_token.refresh_token || access_token.token,
         }
 
+        if token
+          body.merge!(token: token)
+        else
+          body.merge!(sub: sub)
+        end
+
         @api_client.request(:post, "/oauth/token/revoke", body: body)
-        @access_token = nil
       end
     end
 
-    private
-
     def do_request(&block)
       if @client_credentials_missing
         raise CredentialsMissingError.new("OAuth client_id and client_secret must be set")

data/lib/cronofy/client.rb

@@ -27,22 +27,22 @@ module Cronofy
     #                            ENV["CRONOFY_CLIENT_SECRET"]).
     #           :refresh_token - An existing refresh token String for the user's
     #                            account (optional).
-    #           :data_centre   - An identifier to override the default data
-    #                            centre (optional).
+    #           :data_center   - An identifier to override the default data
+    #                            center (optional).
     def initialize(options = {})
       access_token  = options[:access_token]
       refresh_token = options[:refresh_token]
 
       @client_id     = options.fetch(:client_id, ENV["CRONOFY_CLIENT_ID"])
       @client_secret = options.fetch(:client_secret, ENV["CRONOFY_CLIENT_SECRET"])
-      @data_centre   = options[:data_centre]
+      @data_center   = options[:data_center] || options[:data_centre]
 
       @auth = Auth.new(
         client_id: @client_id,
         client_secret: @client_secret,
         access_token: access_token,
         refresh_token: refresh_token,
-        data_centre: @data_centre,
+        data_center: @data_center
       )
     end
 
@@ -471,24 +471,33 @@ module Cronofy
       parse_json(Channel, "channel", response)
     end
 
+    # DEPRECATED: Please use hmac_valid instead.
+    def hmac_match?(args)
+      warn "[DEPRECATION] `hmac_match?` is deprecated. Please use `hmac_valid?` instead."
+      hmac_valid?(args)
+    end
+
     # Public: Verifies a HMAC from a push notification using the client secret.
     #
     # args - A Hash containing the details of the push notification:
     #        :body - A String of the body of the notification.
-    #        :hmac - A String of the HMAC of the notification taken from the
+    #        :hmac - A String containing comma-separated values describing HMACs of the notification taken from the
     #                Cronofy-HMAC-SHA256 header.
     #
-    # Returns true if the HMAC provided matches the one calculated using the
+    # Returns true if one of the HMAC provided matches the one calculated using the
     # client secret, otherwise false.
-    def hmac_match?(args)
+    def hmac_valid?(args)
       body = args[:body]
       hmac = args[:hmac]
 
+      return false if hmac.nil? || hmac.empty?
+
       sha256 = OpenSSL::Digest.new('sha256')
       digest = OpenSSL::HMAC.digest(sha256, @client_secret, body)
       calculated = Base64.encode64(digest).strip
 
-      calculated == hmac
+      hmac_list = hmac.split(',')
+      hmac_list.include?(calculated)
     end
 
     # Public: Lists all the notification channels for the account.
@@ -737,6 +746,14 @@ module Cronofy
       @auth.revoke!
     end
 
+    def revoke_by_sub(sub)
+      @auth.revoke_by_sub(sub)
+    end
+
+    def revoke_by_token(token)
+      @auth.revoke_by_token(token)
+    end
+
     # Public: Requests elevated permissions for a set of calendars.
     #
     # args - A Hash of options used to initialize the request (default: {}):
@@ -795,7 +812,7 @@ module Cronofy
     #                                for a single participant group.
     #           :required_duration - An Integer representing the minimum number
     #                                of minutes of availability required.
-    #           :available_periods - An Array of available time periods Hashes,
+    #           :query_periods     - An Array of available time periods Hashes,
     #                                each must specify a start and end Time.
     #           :start_interval    - An Integer representing the start interval
     #                                of minutes for the availability query.
@@ -825,7 +842,7 @@ module Cronofy
         options[:buffer] = map_availability_buffer(buffer)
       end
 
-      translate_available_periods(options[:available_periods])
+      translate_available_periods(options[:query_periods] || options[:available_periods])
 
       response = post("/v1/availability", options)
 
@@ -839,7 +856,7 @@ module Cronofy
     # Public: Performs an sequenced availability query.
     #
     # options - The Hash options used to refine the selection (default: {}):
-    #           :sequence          - An Array of sequence defintions containing
+    #             :sequence          - An Array of sequence defintions containing
     #                                a Hash of:
     #             :sequence_id       - A String to uniquely identify this part
     #                                of the proposed sequence.
@@ -853,7 +870,7 @@ module Cronofy
     #                                of minutes for the availability query.
     #             :buffer            - An Hash containing the buffer to apply to
     #                                the availability query.
-    #           :available_periods - An Array of available time periods Hashes,
+    #             :query_periods     - An Array of available time periods Hashes,
     #                                each must specify a start and end Time.
     #
     # Returns an Array of Sequences.
@@ -870,7 +887,7 @@ module Cronofy
     def sequenced_availability(options = {})
       options[:sequence] = map_availability_sequence(options[:sequence])
 
-      translate_available_periods(options[:available_periods])
+      translate_available_periods(options[:query_periods] || options[:available_periods])
 
       response = post("/v1/sequenced_availability", options)
       parse_collection(Sequence, "sequences", response)
@@ -1881,7 +1898,7 @@ module Cronofy
     end
 
     def api_url
-      ::Cronofy.api_url(@data_centre)
+      ::Cronofy.api_url(@data_center)
     end
   end
 

data/lib/cronofy/version.rb

@@ -1,3 +1,3 @@
 module Cronofy
-  VERSION = "0.36.0".freeze
+  VERSION = "0.37.3".freeze
 end

data/spec/lib/cronofy/auth_spec.rb

@@ -92,7 +92,7 @@ describe Cronofy::Auth do
     let(:scheme) { 'https' }
     let(:host) { 'app.cronofy.com' }
     let(:path) { '/oauth/authorize' }
-    let(:data_centre_override) { nil }
+    let(:data_center_override) { nil }
     let(:default_params) do
       {
         'client_id' => client_id,
@@ -106,7 +106,7 @@ describe Cronofy::Auth do
       Cronofy::Auth.new(
         client_id: client_id,
         client_secret: client_secret,
-        data_centre: data_centre_override,
+        data_center: data_center_override,
       )
     end
 
@@ -156,8 +156,8 @@ describe Cronofy::Auth do
       it_behaves_like 'a user auth link provider'
     end
 
-    context 'when data centre overridden' do
-      let(:data_centre_override) { :de }
+    context 'when data center overridden' do
+      let(:data_center_override) { :de }
       let(:host) { 'app-de.cronofy.com' }
       let(:params) { default_params }
 
@@ -204,13 +204,13 @@ describe Cronofy::Auth do
   end
 
   describe '#get_token_from_code' do
-    let(:data_centre_override) { nil }
+    let(:data_center_override) { nil }
 
     subject do
       Cronofy::Auth.new(
         client_id: client_id,
         client_secret: client_secret,
-        data_centre: data_centre_override,
+        data_center: data_center_override,
       ).get_token_from_code(code, redirect_uri)
     end
 
@@ -236,7 +236,7 @@ describe Cronofy::Auth do
     end
 
     describe '#application_calendar' do
-      let(:data_centre_override) { nil }
+      let(:data_center_override) { nil }
 
       let(:application_calendar_id) { "my-application-calendar" }
       let(:cronofy_application_calendar_id) { "apc_54475485743" }
@@ -273,7 +273,7 @@ describe Cronofy::Auth do
         Cronofy::Auth.new(
           client_id: client_id,
           client_secret: client_secret,
-          data_centre: data_centre_override,
+          data_center: data_center_override,
         ).application_calendar(application_calendar_id)
       end
 
@@ -308,8 +308,8 @@ describe Cronofy::Auth do
       end
     end
 
-    context "with data centre overridden" do
-      let(:data_centre_override) { :de }
+    context "with data center overridden" do
+      let(:data_center_override) { :de }
       let(:api_token_url) { "https://api-de.cronofy.com/oauth/token" }
       let(:app_token_url) { "https://app-de.cronofy.com/oauth/token" }
 
@@ -372,14 +372,14 @@ describe Cronofy::Auth do
       it_behaves_like 'an authorization request'
     end
 
-    context "with data centre overridden" do
+    context "with data center overridden" do
       subject do
         Cronofy::Auth.new(
           client_id: client_id,
           client_secret: client_secret,
           access_token: access_token,
           refresh_token: refresh_token,
-          data_centre: :de,
+          data_center: :de,
         ).refresh!
       end
 
@@ -476,4 +476,84 @@ describe Cronofy::Auth do
       end
     end
   end
+
+  describe "#revoke_by_sub" do
+    let(:auth) do
+      Cronofy::Auth.new(
+        client_id: client_id,
+        client_secret: client_secret,
+        access_token: access_token,
+        refresh_token: refresh_token,
+      )
+    end
+
+    let!(:revocation_request) do
+      stub_request(:post, "https://api.cronofy.com/oauth/token/revoke")
+        .with(
+          body: {
+            client_id: client_id,
+            client_secret: client_secret,
+            sub: sub,
+          },
+          headers: {
+            'Content-Type' => 'application/x-www-form-urlencoded',
+            'User-Agent' => "Cronofy Ruby #{Cronofy::VERSION}",
+          }
+        ).to_return(status: response_status)
+    end
+
+    let(:sub) { "random_sub_value" }
+
+    before do
+      auth.revoke_by_sub(sub)
+    end
+
+    it "does not unset the access token for the current auth" do
+      expect(auth.access_token).not_to be_nil
+    end
+
+    it "makes the revocation request" do
+      expect(revocation_request).to have_been_requested
+    end
+  end
+
+  describe "#revoke_by_token" do
+    let(:auth) do
+      Cronofy::Auth.new(
+        client_id: client_id,
+        client_secret: client_secret,
+        access_token: access_token,
+        refresh_token: refresh_token,
+      )
+    end
+
+    let!(:revocation_request) do
+      stub_request(:post, "https://api.cronofy.com/oauth/token/revoke")
+        .with(
+          body: {
+            client_id: client_id,
+            client_secret: client_secret,
+            token: token,
+          },
+          headers: {
+            'Content-Type' => 'application/x-www-form-urlencoded',
+            'User-Agent' => "Cronofy Ruby #{Cronofy::VERSION}",
+          }
+        ).to_return(status: response_status)
+    end
+
+    let(:token) { "random_token_value" }
+
+    before do
+      auth.revoke_by_token(token)
+    end
+
+    it "does not unset the access token for the current auth" do
+      expect(auth.access_token).not_to be_nil
+    end
+
+    it "makes the revocation request" do
+      expect(revocation_request).to have_been_requested
+    end
+  end
 end

data/spec/lib/cronofy/client_spec.rb

@@ -266,6 +266,7 @@ describe Cronofy::Client do
           ],
         }
       end
+
       let(:request_body) do
         {
           :event_id => "qTtZdczOccgaPncGJaCiLg",
@@ -1718,6 +1719,57 @@ describe Cronofy::Client do
         it_behaves_like 'a Cronofy request'
         it_behaves_like 'a Cronofy request with mapped return value'
       end
+
+      context "when given query_periods instead of available_periods" do
+        let(:participants) do
+          { members: %w{acc_567236000909002 acc_678347111010113} }
+        end
+
+        let(:required_duration) { 60 }
+
+        let(:query_periods) do
+          [
+            { start: Time.parse("2017-01-03T09:00:00Z"), end: Time.parse("2017-01-03T18:00:00Z") },
+            { start: Time.parse("2017-01-04T09:00:00Z"), end: Time.parse("2017-01-04T18:00:00Z") },
+          ]
+        end
+
+        let(:request_body) do
+          {
+            "participants" => [
+              {
+                "members" => [
+                  { "sub" => "acc_567236000909002" },
+                  { "sub" => "acc_678347111010113" }
+                ],
+                "required" => "all"
+              }
+            ],
+            "query_periods" => [
+              {
+                "start" => "2017-01-03T09:00:00Z",
+                "end" => "2017-01-03T18:00:00Z"
+              },
+              {
+                "start" => "2017-01-04T09:00:00Z",
+                "end" => "2017-01-04T18:00:00Z"
+              }
+            ],
+            "required_duration" => { "minutes" => 60 },
+          }
+        end
+
+        subject do
+          client.availability(
+            participants: participants,
+            required_duration: required_duration,
+            query_periods: query_periods
+          )
+        end
+
+        it_behaves_like 'a Cronofy request'
+        it_behaves_like 'a Cronofy request with mapped return value'
+      end
     end
   end
 
@@ -1873,6 +1925,18 @@ describe Cronofy::Client do
 
       it_behaves_like 'a Cronofy request'
       it_behaves_like 'a Cronofy request with mapped return value'
+
+      context "when passing query_periods instead" do
+        before do
+          args[:query_periods] = args[:available_periods]
+          args.delete(:available_periods)
+          request_body["query_periods"] = request_body["available_periods"]
+          request_body.delete("available_periods")
+        end
+
+        it_behaves_like 'a Cronofy request'
+        it_behaves_like 'a Cronofy request with mapped return value'
+      end
     end
   end
 
@@ -2325,8 +2389,8 @@ describe Cronofy::Client do
 
   end
 
-  describe "Specified data centre" do
-    let(:data_centre) { :de }
+  describe "specifying data_centre" do
+    let(:data_center) { :de }
 
     let(:client) do
       Cronofy::Client.new(
@@ -2334,12 +2398,52 @@ describe Cronofy::Client do
         client_secret: 'client_secret_456',
         access_token: token,
         refresh_token: 'refresh_token_456',
-        data_centre: data_centre,
+        data_centre: data_center,
       )
     end
 
     describe "Userinfo" do
-      let(:request_url) { "https://api-#{data_centre}.cronofy.com/v1/userinfo" }
+      let(:request_url) { "https://api-#{data_center}.cronofy.com/v1/userinfo" }
+
+      describe "#userinfo" do
+        let(:method) { :get }
+
+        let(:correct_response_code) { 200 }
+        let(:correct_response_body) do
+          {
+            "sub" => "ser_5700a00eb0ccd07000000000",
+            "cronofy.type" => "service_account",
+            "cronofy.service_account.domain" => "example.com"
+          }
+        end
+
+        let(:correct_mapped_result) do
+          Cronofy::UserInfo.new(correct_response_body)
+        end
+
+        subject { client.userinfo }
+
+        it_behaves_like "a Cronofy request"
+        it_behaves_like "a Cronofy request with mapped return value"
+      end
+    end
+  end
+
+  describe "specifying data_center" do
+    let(:data_center) { :au }
+
+    let(:client) do
+      Cronofy::Client.new(
+        client_id: 'client_id_123',
+        client_secret: 'client_secret_456',
+        access_token: token,
+        refresh_token: 'refresh_token_456',
+        data_center: data_center,
+      )
+    end
+
+    describe "Userinfo" do
+      let(:request_url) { "https://api-#{data_center}.cronofy.com/v1/userinfo" }
 
       describe "#userinfo" do
         let(:method) { :get }
@@ -2377,11 +2481,27 @@ describe Cronofy::Client do
     let(:body) { "{\"example\":\"well-known\"}" }
 
     it "verifies the correct HMAC" do
-      expect(client.hmac_match?(body: body, hmac: "6r2/HjBkqymGegX0wOfifieeUXbbHwtV/LohHS+jv6c=")).to be true
+      expect(client.hmac_valid?(body: body, hmac: "6r2/HjBkqymGegX0wOfifieeUXbbHwtV/LohHS+jv6c=")).to be true
     end
 
     it "rejects an incorrect HMAC" do
-      expect(client.hmac_match?(body: body, hmac: "something-else")).to be false
+      expect(client.hmac_valid?(body: body, hmac: "something-else")).to be false
+    end
+
+    it "verifies the correct HMAC when one of the multiple HMACs splitted by ',' match" do
+      expect(client.hmac_valid?(body: body, hmac: "6r2/HjBkqymGegX0wOfifieeUXbbHwtV/LohHS+jv6c=,something-else")).to be true
+    end
+
+    it "rejects incorrect when multiple HMACs splitted by ',' don't match" do
+      expect(client.hmac_valid?(body: body, hmac: "something-else,something-else2")).to be false
+    end
+
+    it "rejects if empty HMAC" do
+      expect(client.hmac_valid?(body: body, hmac: "")).to be false
+    end
+
+    it "rejects if nil HMAC" do
+      expect(client.hmac_valid?(body: body, hmac: nil)).to be false
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronofy
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.3
 platform: ruby
 authors:
 - Sergii Paryzhskyi
@@ -9,22 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +20,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +30,21 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,10 +156,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
-summary: Cronofy - one API for all the calendars
+summary: Cronofy - the scheduling platform for business
 test_files:
 - spec/spec_helper.rb
 - spec/response_parser_spec.rb