zoom_rb 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c331d1e5c790ce66794e2505ee2482ccea8017c223c71029681848c2fcb402e8
-  data.tar.gz: 12b656b6e1a3e43d31cd619e5f7e1c4e26bcb4fca39906d2109a54482ef6b1f6
+  metadata.gz: 53629dfe332dda4f0b07d194539fd7276e072e3f70d483202f31af40c693c007
+  data.tar.gz: c429987cdd4f12aa9ed17649fb0c498f65eb454cc21602bda075331c136f0f7a
 SHA512:
-  metadata.gz: 54d84ccc716613ad408e491563461cc3af62397f5baf3ae81a413c45eac7a590029327eed38a502e31017d2fceb3560ad9a95fdcea908483aefd138558ef9ca0
-  data.tar.gz: 46356928a4d9ba8dc595f13833d56616290ac930fd5ec19bac84afdf219e7fe176c37c81fb3f2242816be27c813663816accf303bc882fdb7de1731e429eb8a0
+  metadata.gz: faeb2547f3560c6911be1814d4cacc0fade3015123e70bf7011045055dad8548de0984afe130d9541415db98814049fe25844d3a79cd75bec965c9a01ffe4953
+  data.tar.gz: 295ea2103ba5817d381ae85b7f93baf3858fd3d4ac326d9fac685a864eef994d487eae35f59aabe6e2c91f88825db31853ace378c6a9e166f7169f43567038e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zoom_rb (1.1.1)
+    zoom_rb (1.1.2)
       httparty (>= 0.13)
       json (>= 1.8)
       jwt

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/lib/zoom/actions/token.rb

@@ -12,6 +12,11 @@ module Zoom
         permit: :code_verifier,
         args_to_params: { auth_code: :code }
 
+      post 'access_tokens_account_credentials',
+        '/oauth/token?grant_type=account_credentials',
+        oauth: true,
+        require: :account_id
+
       post 'refresh_tokens',
         '/oauth/token',
         oauth: true,

data/lib/zoom/actions/webinar.rb

@@ -18,14 +18,18 @@ module Zoom
                           post_webinar_survey survey_url registrants_email_notification
                           meeting_authentication authentication_option
                           authentication_domains registrants_confirmation_email
-                        ].freeze,
+                        ],
                         {
+                            language_interpretation: [
+                            :enable,
+                            interpreters: %i[email languages]
+                          ],
                           question_and_answer: %i[
-                            allow_anonymous_questions, answer_questions, attendees_can_comment,
-                            attendees_can_upvote, enable
+                            allow_anonymous_questions answer_questions attendees_can_comment
+                            attendees_can_upvote enable
                           ]
                         }
-                      ]
+                      ].freeze
 
       get 'webinar_list', '/users/:host_id/webinars',
         permit: %i[page_size page_number]

data/lib/zoom/client.rb

@@ -59,3 +59,4 @@ end
 
 require 'zoom/clients/jwt'
 require 'zoom/clients/oauth'
+require 'zoom/clients/server_to_server_oauth'

data/lib/zoom/clients/server_to_server_oauth.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Zoom
+  class Client
+    class ServerToServerOAuth < Zoom::Client
+      attr_reader :access_token, :expires_in, :expires_at
+
+      def initialize(config)
+        Zoom::Params.new(config).permit(%i[access_token account_id client_id client_secret timeout])
+        Zoom::Params.new(config).require_one_of(%i[access_token account_id])
+
+        config.each { |k, v| instance_variable_set("@#{k}", v) }
+        self.class.default_timeout(@timeout || 20)
+      end
+
+      def auth
+        response = access_tokens_account_credentials(account_id: @account_id)
+        set_tokens(response)
+        response
+      end
+
+      def auth_token
+        return Base64.urlsafe_encode64("#{@client_id}:#{@client_secret}") if @client_id && @client_secret
+
+        Base64.urlsafe_encode64("#{Zoom.configuration.api_key}:#{Zoom.configuration.api_secret}")
+      end
+
+      private
+
+      def set_tokens(response)
+        if response.is_a?(Hash) && !response.key?(:error)
+          @access_token = response["access_token"]
+          @expires_in = response["expires_in"]
+          @expires_at = @expires_in ? (Time.now + @expires_in).to_i : nil
+        end
+      end
+    end
+  end
+end

data/lib/zoom/params.rb

@@ -32,7 +32,7 @@ module Zoom
                            array << hash_filter(filter)
                          end
                        end
-      non_permitted_params = @parameters.keys - permitted_keys.flatten
+      non_permitted_params = parameters_keys - permitted_keys.flatten
       raise Zoom::ParameterNotPermitted, non_permitted_params.to_s unless non_permitted_params.empty?
     end
 
@@ -106,5 +106,13 @@ module Zoom
         raise Zoom::ParameterValueNotPermitted, "#{key}: #{value}"
       end
     end
+
+    def parameters_keys
+      if @parameters.kind_of?(Array)
+        @parameters.map(&:keys).flatten.uniq
+      else
+        @parameters.keys
+      end
+    end
   end
 end

data/lib/zoom/utils.rb

@@ -12,7 +12,7 @@ module Zoom
       end
 
       def raise_if_error!(response, http_code=200)
-        return response unless response&.key?('code')
+        return response unless response.is_a?(Hash) && response.key?('code')
 
         code = response['code']
 

data/lib/zoom/version.rb

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

data/spec/lib/zoom/client_spec.rb

@@ -120,4 +120,69 @@ describe Zoom::Client do
       end
     end
   end
+
+  describe 'ServerToServerOAuth client' do
+    let(:access_token) {'xxx'}
+    let(:client) do
+      Zoom::Client::ServerToServerOAuth.new(access_token: access_token, timeout: 30)
+    end
+
+    it 'raises an error if there is no arguments' do
+      expect { Zoom::Client::ServerToServerOAuth.new(timeout: 30) }.to raise_error(Zoom::ParameterMissing)
+    end
+
+    it 'requires at least an access token' do
+      expect { Zoom::Client::ServerToServerOAuth.new(access_token: access_token) }.not_to raise_error
+    end
+
+    it 'requires at least an account_id' do
+      expect { Zoom::Client::ServerToServerOAuth.new(access_token: access_token) }.not_to raise_error
+    end
+
+    it 'creates instance of Zoom::Client if api_key and api_secret is provided' do
+      expect(client).to be_kind_of(Zoom::Client)
+    end
+
+    it 'has the bearer token in the auth header' do
+      expect(client.request_headers['Authorization']).to eq("Bearer #{access_token}")
+    end
+
+    describe 'set_tokens' do
+      let(:client) { Zoom::Client::ServerToServerOAuth.new(account_id: 'xxx') }
+
+      before :each do
+        Zoom.configure do |config|
+          config.timeout = 20
+        end
+
+        stub_request(
+          :post,
+          zoom_auth_url('oauth/token')
+        ).to_return(body: json_response('token', 'access_token'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'sets the access_token, expires_in and expires_at' do
+        expected_values = JSON.parse(json_response('token', 'access_token'))
+        client.auth
+        expect(client.access_token).to eq(expected_values['access_token'])
+        expect(client.expires_in).to eq(expected_values['expires_in'])
+        expect(client.expires_at).to eq((Time.now + expected_values['expires_in']).to_i)
+      end
+
+      context 'when client_id and client_secret is not provided' do
+        it 'has the basic auth authorization header based on api_key and api_secret' do
+          expect(client.oauth_request_headers['Authorization']).to eq("Basic eHh4Onh4eA==")
+        end
+      end
+
+      context 'when client_id and client_secret are provided' do
+        let(:client) { Zoom::Client::ServerToServerOAuth.new(account_id: 'xxx', client_id: 'yyy', client_secret: 'yyy') }
+
+        it 'has the basic auth authorization header based on client_id and client_secret' do
+          expect(client.oauth_request_headers['Authorization']).to eq("Basic eXl5Onl5eQ==")
+        end
+      end
+    end
+  end
 end

data/spec/lib/zoom/params_spec.rb

@@ -98,4 +98,22 @@ RSpec.describe Zoom::Params do
       expect { params.permit_value(:baz, values) }.to raise_error(Zoom::ParameterValueNotPermitted, "#{:baz.to_s}: #{:bang.to_s}")
     end
   end
+
+  describe '#parameters_keys' do
+    context 'when param is array ' do
+      let(:params) { Zoom::Params.new([{foo: :bar, baz: :bang}, {foo: :bar1, baz: :bang1}]) }
+  
+      it 'get each object keys and return unique of them' do
+        expect(params.parameters_keys).to eq([:foo, :baz])
+      end
+    end
+    
+    context 'when param is Hash ' do
+      let(:params) { Zoom::Params.new({foo: :bar, baz: :bang}) }
+  
+      it 'return hash keys' do
+        expect(params.parameters_keys).to eq([:foo, :baz])
+      end
+    end
+  end
 end

data/spec/lib/zoom/utils_spec.rb

@@ -30,6 +30,11 @@ describe Zoom::Utils do
       expect { Utils.raise_if_error!(response) }.to_not raise_error
     end
 
+    it 'does not raise Zoom::Error if response is not a Hash' do
+      response = 'xxx'
+      expect { Utils.raise_if_error!(response) }.to_not raise_error
+    end
+
     it 'raises Zoom::Error if http code is not 200' do
       response = { 'code' => 180, 'message' => 'lol error' }
       expect { Utils.raise_if_error!(response, 400) }.to raise_error(Zoom::Error)

data/spec/spec_helper.rb

@@ -45,6 +45,10 @@ def oauth_client
   Zoom::Client::OAuth.new(auth_token: 'xxx', auth_code: 'xxx', redirect_uri: 'xxx', timeout: 15)
 end
 
+def server_to_server_oauth_client
+  Zoom::Client::ServerToServerOAuth.new(account_id: 'xxx')
+end
+
 def zoom_client
   jwt_client
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoom_rb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kyle Boe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -151,6 +151,7 @@ files:
 - LICENSE
 - Makefile
 - README.md
+- Rakefile
 - lib/zoom/actions.rb
 - lib/zoom/actions/account.rb
 - lib/zoom/actions/billing.rb
@@ -171,6 +172,7 @@ files:
 - lib/zoom/client.rb
 - lib/zoom/clients/jwt.rb
 - lib/zoom/clients/oauth.rb
+- lib/zoom/clients/server_to_server_oauth.rb
 - lib/zoom/constants/account/options/pay_modes.rb
 - lib/zoom/constants/account/settings/permitted_settings.rb
 - lib/zoom/constants/constants.rb