zoom_rb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d0d18470f4f9f7f62c286725f5b30c704e1f73fb2cb543723cfbc1e36eed4a
-  data.tar.gz: 6266834d04ea88468eb40d42a30c19e15774f02b322a69eb5535c6569b88fb05
+  metadata.gz: 86cae4930b3b9fa7fc6405797518820e066501d3254c9e569423ad6cb676f2ae
+  data.tar.gz: 8cebc1bb556b9127ecfc25e91bc0017bd516a4ef80d5a621ae52bfa2ddc2e31d
 SHA512:
-  metadata.gz: '028821632a4c9147d86975b00f87d1ff98b1d98cd2adb419a07f551b8f6186f2ed28699b7666e6e2d2765d736df4ece5e8c1b8c51c24cb9c87ed960ba27c8a93'
-  data.tar.gz: bb2088f723fb1f9c0b6780fb81dafe26c0a893298a1c03108dcc14d4e4c6a3070e57543f8ea7953047e2aa75435a55ec88baffb5bd39033891d2f8617694e7c8
+  metadata.gz: 4967db82bd2f5db456a697abae4d0ad772d30047cbecab7c691b2176abdec53f25fdb13350057f838711c7866440540fd63620299bd7a21433176b18621278f1
+  data.tar.gz: 77bc79ea0f536403abab58be9ed0e25d76e59f2f3d21d9714b22170722302ed0f4ad0531fb65f6853df1ef4323d94dbb527f6bf7591a0e8d14be68fc1fe8bfa0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.1
+
+### Fixes:
+* Fix OAuth requests in Zoom::Actions::Token.
+
 # 1.0.0
 
 The 1.0 release and a major refactor of all endpoint definitions.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zoom_rb (1.0.0)
+    zoom_rb (1.0.1)
       httparty (~> 0.13)
       json (>= 1.8)
       jwt
@@ -41,7 +41,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     minitest (5.14.4)
     multi_xml (0.6.0)
     parallel (1.20.1)

data/lib/zoom/actions/token.rb

@@ -7,20 +7,20 @@ module Zoom
 
       post 'access_tokens',
         '/oauth/token?grant_type=authorization_code&code=:auth_code&redirect_uri=:redirect_uri',
-        base_uri: 'https://zoom.us/'
+        oauth: true
 
       post 'refresh_tokens',
         '/oauth/token?grant_type=refresh_token&refresh_token=:refresh_token',
-        base_uri: 'https://zoom.us/'
+        oauth: true
 
       post 'data_compliance', '/oauth/data/compliance',
-        base_uri: 'https://zoom.us/',
+        oauth: true,
         require: %i[
           client_id user_id account_id deauthorization_event_received compliance_completed
         ]
 
       post 'revoke_tokens', '/oauth/revoke?token=:access_token',
-        base_uri: 'https://zoom.us/'
+        oauth: true
     end
   end
 end

data/lib/zoom/actions.rb

@@ -15,9 +15,18 @@ module Zoom
       parsed_path
     end
 
-    def self.make_request(client, method, parsed_path, params, base_uri)
-      request_options = { headers: client.request_headers }
-      request_options[:base_uri] = base_uri if base_uri
+    def self.determine_request_options(client, oauth)
+      if oauth
+        {
+          headers: client.oauth_request_headers,
+          base_uri: 'https://zoom.us/'
+        }
+      else
+        { headers: client.request_headers }
+      end
+    end
+
+    def self.make_request(client, method, parsed_path, params, request_options)
       case method
       when :get
         request_options[:query] = params
@@ -29,7 +38,7 @@ module Zoom
 
     [:get, :post, :patch, :put, :delete].each do |method|
       define_method(method) do |name, path, options={}|
-        required, permitted, base_uri = options.values_at :require, :permit, :base_uri
+        required, permitted, oauth = options.values_at :require, :permit, :oauth
         required = Array(required) unless required.is_a?(Hash)
         permitted = Array(permitted) unless permitted.is_a?(Hash)
 
@@ -37,10 +46,11 @@ module Zoom
           path_keys = Zoom::Actions.extract_path_keys(path)
           params = Zoom::Params.new(Utils.extract_options!(args))
           parsed_path = Zoom::Actions.parse_path(path, path_keys, params)
+          request_options = Zoom::Actions.determine_request_options(self, oauth)
           params = params.require(path_keys) unless path_keys.empty?
           params_without_required = required.empty? ? params : params.require(required)
           params_without_required.permit(permitted) unless permitted.empty?
-          response = Zoom::Actions.make_request(self, method, parsed_path, params, base_uri)
+          response = Zoom::Actions.make_request(self, method, parsed_path, params, request_options)
           Utils.parse_response(response)
         end
       end

data/lib/zoom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zoom
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/lib/zoom/actions_spec.rb

@@ -7,7 +7,7 @@ describe Zoom::Actions do
   let(:path) { '/:id/foo/:bar' }
   let(:path_keys) { [:id, :bar] }
   let(:params) { { id: 100, bar: 'baz' } }
-  let(:base_uri) { 'https://example.com' }
+  let(:oauth) { false }
   let(:parsed_path) { '/100/foo/baz' }
 
   describe 'self.extract_path_keys' do
@@ -23,14 +23,9 @@ describe Zoom::Actions do
   end
 
   describe 'self.make_request' do
-    subject { described_class.make_request(client, method, parsed_path, params, base_uri) }
+    subject { described_class.make_request(client, method, parsed_path, params, request_options) }
 
-    let(:request_options) {
-      {
-        headers: client.request_headers,
-        base_uri: base_uri
-      }
-    }
+    let(:request_options) { Zoom::Actions.determine_request_options(client, oauth) }
 
     context 'when get' do
       let(:method) { :get }
@@ -80,5 +75,31 @@ describe Zoom::Actions do
         subject
       end
     end
+
+    context 'when oauth' do
+      let(:method) { :get }
+      let(:oauth) { true }
+
+      it 'passes oauth request options' do
+        request_options[:query] = params
+        expect(request_options[:headers]).to eq(client.oauth_request_headers)
+        expect(request_options[:base_uri]).to eq('https://zoom.us/')
+        expect(client.class).to receive(method).with(parsed_path, **request_options)
+        subject
+      end
+    end
+
+    context 'when not oauth' do
+      let(:method) { :get }
+      let(:oauth) { false }
+
+      it 'passes standard request options' do
+        request_options[:query] = params
+        expect(request_options[:headers]).to eq(client.request_headers)
+        expect(request_options[:base_uri]).to be_nil
+        expect(client.class).to receive(method).with(parsed_path, **request_options)
+        subject
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoom_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kyle Boe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty