zoom_rb 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad16279c225cd1874a9923203eafd25dce7b8f122cb9f5abf2cb5126e2792ef6
-  data.tar.gz: 34fbf4d1a4a4d5dbf02c32cc994ea6eaacdee90b613f70a29d573d9b451e3d3a
+  metadata.gz: efbf20752dce2d7796dd85203549f9147fb81f74c98b5f3317a2d2e3dde68ebb
+  data.tar.gz: 7e71b22ccbe081f63521fea457a010c0ea48d53cbf307fee8d63e9df716b9500
 SHA512:
-  metadata.gz: f392deada6b8e9e7ff03007d295ec97981958a14a1ca6b45cfd4ade5ce6cf7445c6603e899a548d3aef5ff904f02e91138a4bd28ea47da7dd892f3fff9a6d566
-  data.tar.gz: 18f7a36b1f5af0073a87cf66ddfb5ee03bb5bfe1b1be6635a39cd493ec6d82b775e14d6979bbd0aa02c20065bfc70b42575ce944e786ae3cf3bbb68ab4b3b317
+  metadata.gz: f56ec4c5410d86eaa83a10c89ccd29e5d5732effa3203a79c1b3506ffd532abda14090f704f09ded594b5c14c33015a0a786304b8a243b6f561e4e584d2808a5
+  data.tar.gz: 3d213b942fd24614dd323d4d2c45076b80cc6dfff483560cbc376630e8c046cfd443c7cfb2b86c7c6d6e04554496dfa6d92c0db565dc8335a17a5888bbc9d8ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zoom_rb (0.8.7)
+    zoom_rb (0.10.0)
       httparty (~> 0.13)
       json (>= 1.8)
       jwt
@@ -21,12 +21,16 @@ GEM
     hint-rubocop_style (0.2.5)
       rubocop (>= 0.50.0)
       rubocop-rspec (>= 1.17.0)
-    httparty (0.16.2)
+    httparty (0.17.1)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     jaro_winkler (1.5.1)
     json (2.1.0)
-    jwt (2.1.0)
+    jwt (2.2.1)
     method_source (0.9.0)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
     multi_xml (0.6.0)
     parallel (1.12.1)
     parser (2.5.3.0)
@@ -88,4 +92,4 @@ DEPENDENCIES
   zoom_rb!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/README.md

@@ -18,6 +18,8 @@ Or install it yourself as:
 
 ## Usage
 
+The Zoom API uses OAuth or JWT to [Authenticate](https://marketplace.zoom.us/docs/api-reference/Authentication) API request. By defaut, a JWT client will be used.
+
 ```ruby
 require 'zoom'
 
@@ -27,7 +29,19 @@ Zoom.configure do |c|
 end
 
 zoom_client = Zoom.new
+```
+
+To create an OAuth client, create the client directly
+
+```ruby
+require 'zoom'
+
+zoom_client = Zoom::Client::OAuth.new(access_token: 'xxx', timeout: 15)
+```
 
+With the client, access the API
+
+```ruby
 user_list = zoom_client.user_list
 user_list['users'].each do |user|
   user_id = user['id']

data/lib/zoom.rb

@@ -26,7 +26,7 @@ module Zoom
 
     def new
       @configuration ||= Configuration.new
-      Zoom::Client.new(
+      Zoom::Client::JWT.new(
         api_key: @configuration.api_key,
         api_secret: @configuration.api_secret,
         timeout: @configuration.timeout
@@ -40,10 +40,11 @@ module Zoom
   end
 
   class Configuration
-    attr_accessor :api_key, :api_secret, :timeout
+    attr_accessor :api_key, :api_secret, :timeout, :access_token
 
     def initialize
       @api_key = @api_secret = 'xxx'
+      @access_token = nil
       @timeout = 15
     end
   end

data/lib/zoom/actions/account.rb

@@ -4,9 +4,9 @@ module Zoom
   module Actions
     module Account
       def account_list(*args)
-        # TODO: implement accounts_list
-        # options = Utils.extract_options!(args)
-        raise Zoom::NotImplemented, 'accounts_list is not yet implemented'
+        params = Zoom::Params.new(Utils.extract_options!(args))
+        params.permit(:page_size, :page_number)
+        Utils.parse_response self.class.get("/accounts", query: params, headers: request_headers)
       end
 
       def account_create(*args)
@@ -34,9 +34,9 @@ module Zoom
       end
 
       def account_settings_get(*args)
-        # TODO: implement account_settings_get
-        # options = Utils.extract_options!(args)
-        raise Zoom::NotImplemented, 'account_settings_get is not yet implemented'
+        params = Zoom::Params.new(Utils.extract_options!(args))
+        params.require(:id)
+        Utils.parse_response self.class.get("/accounts/#{params[:id]}/settings", query: params.except(:id), headers: request_headers)
       end
 
       def account_settings_update(*args)

data/lib/zoom/actions/im/chat.rb

@@ -7,7 +7,7 @@ module Zoom
         # Get chat messages for a specified period.
         def chat_get(*args)
           options = Utils.extract_options!(args)
-          Utils.require_params(%i[access_token session_id from to], options)
+          Zoom::Params.new(options).require(:access_token, :session_id, :from, :to)
           # TODO handle date format for `from` and `to` params
           # TODO implement `next_page_token`, will be returned whenever the set of available chat history list exceeds 100. The expiration period is 30 minutes.
           Utils.parse_response self.class.post('/chat/get', query: options)
@@ -16,7 +16,7 @@ module Zoom
         # Get chat history list for a specified time period.
         def chat_list(*args)
           options = Utils.extract_options!(args)
-          Utils.require_params(%i[access_token from to], options)
+          Zoom::Params.new(options).require(:access_token, :from, :to)
           # TODO handle date format for `from` and `to` params
           # TODO implement `next_page_token`, will be returned whenever the set of available chat history list exceeds 100. The expiration period is 30 minutes.
           Utils.parse_response self.class.post('/chat/list', query: options)

data/lib/zoom/actions/metrics.rb

@@ -5,21 +5,21 @@ module Zoom
     module Metrics
       def metrics_crc(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params(%i[from to], options)
+        Zoom::Params.new(options).require(:from, :to)
         Utils.process_datetime_params!(%i[from to], options)
         Utils.parse_response self.class.post('/metrics/crc', query: options)
       end
 
       def metrics_meetings(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params(%i[from to type], options)
+        Zoom::Params.new(options).require(:from, :to, :type)
         Utils.process_datetime_params!(%i[from to], options)
         Utils.parse_response self.class.post('/metrics/meetings', query: options)
       end
 
       def metrics_meetingdetail(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params(%i[meeting_id type], options)
+        Zoom::Params.new(options).require(:meeting_id, :type)
         Utils.parse_response self.class.post('/metrics/meetingdetail', query: options)
       end
     end

data/lib/zoom/actions/recording.rb

@@ -5,27 +5,27 @@ module Zoom
     module Recording
       def recording_list(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params([:host_id], options)
+        Zoom::Params.new(options).require(:host_id)
         Utils.process_datetime_params!(%i[from to], options)
         Utils.parse_response self.class.post('/recording/list', query: options)
       end
 
       def mc_recording_list(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params([:host_id], options)
+        Zoom::Params.new(options).require(:host_id)
         Utils.process_datetime_params!(%i[from to], options)
         Utils.parse_response self.class.post('/mc/recording/list', query: options)
       end
 
       def recording_get(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params([:meeting_id], options)
+        Zoom::Params.new(options).require(:meeting_id)
         Utils.parse_response self.class.post('/recording/get', query: options)
       end
 
       def recording_delete(*args)
         options = Utils.extract_options!(args)
-        Utils.require_params([:meeting_id], options)
+        Zoom::Params.new(options).require(:meeting_id)
         Utils.parse_response self.class.post('/recording/delete', query: options)
       end
     end

data/lib/zoom/actions/report.rb

@@ -6,7 +6,7 @@ module Zoom
       def daily_report(*args)
         params = Zoom::Params.new(Utils.extract_options!(args))
         params.permit(:year, :month)
-        Utils.parse_response self.class.get('/report/daily', query: params)
+        Utils.parse_response self.class.get('/report/daily', query: params, headers: request_headers)
       end
 
       def hosts_report(*args)

data/lib/zoom/actions/user.rb

@@ -41,7 +41,6 @@ module Zoom
         raise Zoom::NotImplemented, 'user_assistants_list is not yet implemented'
         # TODO: implement user_assistants_list
         # options = Utils.extract_options!(args)
-        # Utils.require_params([:user_id], options)
         Utils.parse_response self.class.get("/users/#{options.slice!(:id)}/assistants", query: options, headers: request_headers)
       end
 
@@ -90,9 +89,9 @@ module Zoom
       end
 
       def user_settings_get(*args)
-        # TODO: implement user_settings_get
-        # options = Utils.extract_options!(args)
-        raise Zoom::NotImplemented, 'user_settings_get is not yet implemented'
+        params = Zoom::Params.new(Utils.extract_options!(args))
+        params.require(:id).permit(:login_type)
+        Utils.parse_response self.class.get("/users/#{params[:id]}/settings", query: params.except(:id), headers: request_headers)
       end
 
       def user_settings_update(*args)

data/lib/zoom/actions/webinar.rb

@@ -104,6 +104,12 @@ module Zoom
         params.require(:id)
         Utils.parse_response self.class.get("/past_webinars/#{params[:id]}/instances", headers: request_headers)
       end
+
+      def webinar_registrant_get(*args)
+        params = Zoom::Params.new(Utils.extract_options!(args))
+        params.require(:webinar_id, :id).permit(:occurrence_id)
+        Utils.parse_response self.class.get("/webinars/#{params[:webinar_id]}/registrants/#{params[:id]}", query: params.except(:webinar_id, :id), headers: request_headers)
+      end
     end
   end
 end

data/lib/zoom/client.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'httparty'
-require 'json'
-require 'jwt'
 
 module Zoom
   class Client
@@ -23,12 +21,6 @@ module Zoom
     headers 'Accept' => 'application/json'
     headers 'Content-Type' => 'application/json'
 
-    def initialize(config)
-      Utils.require_params(%i[api_key api_secret], config)
-      config.each { |k, v| instance_variable_set("@#{k}", v) }
-      self.class.default_timeout(@timeout)
-    end
-
     def request_headers
       {
         'Accept' => 'application/json',
@@ -36,9 +28,8 @@ module Zoom
         'Authorization' => "Bearer #{access_token}"
       }
     end
-
-    def access_token
-      JWT.encode({ iss: @api_key, exp: Time.now.to_i + @timeout }, @api_secret, 'HS256', { typ: 'JWT' })
-    end
   end
 end
+
+require 'zoom/clients/jwt'
+require 'zoom/clients/oauth'

data/lib/zoom/clients/jwt.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'jwt'
+
+module Zoom
+  class Client
+    class JWT < Zoom::Client
+
+      def initialize(config)
+        Zoom::Params.new(config).require(:api_key, :api_secret)
+        config.each { |k, v| instance_variable_set("@#{k}", v) }
+        self.class.default_timeout(@timeout || 20)
+      end
+
+      def access_token
+        ::JWT.encode({ iss: @api_key, exp: Time.now.to_i + @timeout }, @api_secret, 'HS256', { typ: 'JWT' })
+      end
+
+    end
+  end
+end
+
+

data/lib/zoom/clients/oauth.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Zoom
+  class Client
+    class OAuth < Zoom::Client
+      def initialize(config)
+        Zoom::Params.new(config).require(:access_token)
+        config.each { |k, v| instance_variable_set("@#{k}", v) }
+        self.class.default_timeout(@timeout || 20)
+      end
+
+      def access_token
+        @access_token
+      end
+    end
+  end
+end

data/lib/zoom/constants.rb

@@ -95,8 +95,8 @@ module Zoom
 
     USER_CREATE_TYPES = {
                           'create' => 'User will get an email sent from Zoom. There is a confirmation link in this email. User will then need to click this link to activate their account to the Zoom service. The user can set or change their password in Zoom.',
-                          'custCreate' => 'This action is provided for enterprise customer who has a managed domain. This feature is disabled by default because of the security risk involved in creating a user who does not belong to your domain without notifying the user.',
-                          'autoCreate' => 'This action is provided for API partner only. User created in this way has no password and is not able to log into the Zoom web site or client.',
+                          'autoCreate' => 'This action is provided for enterprise customer who has a managed domain. This feature is disabled by default because of the security risk involved in creating a user who does not belong to your domain without notifying the user.',
+                          'custCreate' => 'This action is provided for API partner only. User created in this way has no password and is not able to log into the Zoom web site or client.',
                           'ssoCreate' => 'This action is provided for enabled “Pre-provisioning SSO User” option. User created in this way has no password. If it is not a basic user, will generate a Personal Vanity URL using user name (no domain) of the provisioning email. If user name or pmi is invalid or occupied, will use random number/random personal vanity URL.'
                        }.freeze # no default
   end

data/lib/zoom/utils.rb

@@ -26,30 +26,6 @@ module Zoom
         raise_if_error!(http_response.parsed_response) || http_response.code
       end
 
-      def require_params(params, options)
-        params = [params] unless params.is_a? Array
-        params.each do |param|
-          raise argument_error(param.to_s) unless options[param]
-        end
-      end
-
-      def permit_params(params, options)
-        params = [params] unless params.is_a? Array
-        options.keys.each do |key|
-          raise exclude_argument_error(key.to_s) unless params.include?(key)
-        end
-      end
-
-      # Dynamically defines bang methods for Actions modules
-      # def define_bang_methods(klass)
-      #   klass.instance_methods.each do |m|
-      #     klass.send(:define_method, "#{m}!") do |*args|
-      #       response = send(m, *args)
-      #       Utils.raise_if_error!(response)
-      #     end
-      #   end
-      # end
-
       def extract_options!(array)
         array.last.is_a?(::Hash) ? array.pop : {}
       end

data/lib/zoom/version.rb

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

data/spec/fixtures/account/list.json

@@ -0,0 +1,18 @@
+{
+  "page_count": 1,
+  "page_number": 1,
+  "page_size": 10,
+  "total_records": 1,
+  "accounts": [
+    {
+      "id": "string [uuid]",
+      "account_name": "string",
+      "owner_email": "string",
+      "account_type": "string",
+      "seats": "integer",
+      "subscription_start_time": "string [date-time]",
+      "subscription_end_time": "string [date-time]",
+      "created_at": "string [date-time]"
+    }
+  ]
+}

data/spec/fixtures/account/settings_get.json

@@ -0,0 +1,120 @@
+{
+  "schedule_meting": {
+    "host_video": false,
+    "participant_video": false,
+    "audio_type": "both",
+    "join_before_host": false,
+    "use_pmi_for_scheduled_meetings": false,
+    "use_pmi_for_instant_meetings": false,
+    "enforce_login": false,
+    "enforce_login_with_domains": false,
+    "enforce_login_domains": "example.com",
+    "not_store_meeting_topic": false,
+    "force_pmi_jbh_password": false
+  },
+  "in_meeting": {
+    "e2e_encryption": false,
+    "chat": false,
+    "private_chat": false,
+    "auto_saving_chat": false,
+    "entry_exit_chime": "host",
+    "record_play_own_voice": false,
+    "file_transfer": false,
+    "feedback": false,
+    "post_meeting_feedback": false,
+    "co_host": false,
+    "polling": false,
+    "attendee_on_hold": false,
+    "show_meeting_control_toolbar": false,
+    "allow_show_zoom_windows": false,
+    "annotation": false,
+    "whiteboard": false,
+    "webinar_question_answer": false,
+    "anonymous_question_answer": false,
+    "breakout_room": false,
+    "closed_caption": false,
+    "far_end_camera_control": false,
+    "group_hd": false,
+    "virtual_background": false,
+    "watermark": false,
+    "alert_guest_join": false,
+    "auto_answer": false,
+    "p2p_connetion": false,
+    "p2p_ports": false,
+    "ports_range": "55,56",
+    "sending_default_email_invites": false,
+    "use_html_format_email": false,
+    "dscp_marking": false,
+    "dscp_audio": 42,
+    "dscp_video": 43,
+    "stereo_audio": false,
+    "original_audio": false,
+    "screen_sharing": false,
+    "remote_control": false,
+    "attention_tracking": false
+  },
+  "email_notification": {
+    "cloud_recording_avaliable_reminder": false,
+    "jbh_reminder": false,
+    "cancel_meeting_reminder": false,
+    "low_host_count_reminder": false,
+    "alternative_host_reminder": false,
+    "schedule_for_reminder": false
+  },
+  "zoom_rooms": {
+    "upcoming_meeting_alert": false,
+    "start_airplay_manually": false,
+    "weekly_system_restart": false,
+    "list_meetings_with_calendar": false,
+    "zr_post_meeting_feedback": false,
+    "ultrasonic": false,
+    "force_private_meeting": false,
+    "hide_host_information": false,
+    "cmr_for_instant_meeting": false,
+    "auto_start_stop_scheduled_meetings": false
+  },
+  "security": {
+    "admin_change_name_pic": false,
+    "import_photos_from_devices": false,
+    "hide_billing_info": false
+  },
+  "recording": {
+    "local_recording": false,
+    "cloud_recording": false,
+    "record_speaker_view": false,
+    "record_gallery_view": false,
+    "record_audio_file": false,
+    "save_chat_text": false,
+    "show_timestamp": false,
+    "recording_audio_transcript": false,
+    "auto_recording": "local",
+    "cloud_recording_download": false,
+    "cloud_recording_download_host": false,
+    "account_user_access_recording": false,
+    "auto_delete_cmr": false,
+    "auto_delete_cmr_days": 60
+  },
+  "telephony": {
+    "third_party_audio": false,
+    "audio_conference_info": "Magic third party auto conference info"
+  },
+  "tsp": {
+    "call_out": false,
+    "call_out_countries": [
+      "US"
+    ],
+    "show_international_numbers_link": false,
+    "display_toll_free_numbers": false
+  },
+  "integration": {
+    "google_calendar": false,
+    "google_drive": false,
+    "dropbox": false,
+    "box": false,
+    "microsoft_one_drive": false,
+    "kubi": false
+  },
+  "feature": {
+    "meeting_capacity": 500
+  }
+}

data/spec/fixtures/user/settings_get.json

@@ -0,0 +1,74 @@
+{
+  "scheduled_meeting": {
+    "host_video": true,
+    "participants_video": true,
+    "audio_type": "cloud",
+    "join_before_host": true,
+    "use_pmi_for_scheduled_meetings": true,
+    "use_pmi_for_instant_meetings": true,
+    "enforce_login": true,
+    "not_store_meeting_topic": true,
+    "force_pmi_jbh_password": true,
+    "pstn_password_protected": true
+  },
+  "in_meeting": {
+    "e2e_encryption": true,
+    "chat": true,
+    "private_chat": true,
+    "auto_saving_chat": true,
+    "entry_exit_chime": "all",
+    "record_play_voice": true,
+    "file_transfer": true,
+    "feedback": true,
+    "co_host": true,
+    "polling": true,
+    "attendee_on_hold": true,
+    "annotation": true,
+    "remote_control": true,
+    "non_verbal_feedback": true,
+    "breakout_room": true,
+    "remote_support": true,
+    "closed_caption": true,
+    "group_hd": true,
+    "virtual_background": true,
+    "far_end_camera_control": true,
+    "share_dual_camera": true,
+    "attention_tracking": true,
+    "waiting_room": true,
+    "allow_live_streaming": true
+  },
+  "email_notification": {
+    "jbh_reminder": true,
+    "cancel_meeting_reminder": true,
+    "alternative_host_reminder": true
+  },
+  "recording": {
+    "local_recording": true,
+    "cloud_recording": true,
+    "record_speaker_view": true,
+    "record_gallery_view": true,
+    "record_audio_file": true,
+    "save_chat_text": true,
+    "show_timestamp": true,
+    "recording_audio_transcript": true,
+    "auto_recording": "cloud",
+    "auto_delete_cmr": true,
+    "auto_delete_cmr_days": 42
+  },
+  "telephony": {
+    "third_party_audio": true,
+    "audio_conference_info": "Third party audio conference info",
+    "show_international_numbers_link": true
+  },
+  "tsp": {},
+  "feature": {
+    "meeting_capacity": 100,
+    "large_meeting": true,
+    "large_meeting_capacity": 1000,
+    "webinar": true,
+    "webinar_capacity": 500,
+    "cn_meeting": true,
+    "in_meeting": true,
+    "zoom_phone": true
+  }
+}

data/spec/fixtures/webinar/registrant/get.json

@@ -0,0 +1,25 @@
+{
+  "id": "FAKE",
+  "first_name": "Bobby",
+  "last_name": "Tables",
+  "email": "bobby_tables@example.org",
+  "address": "",
+  "city": "",
+  "country": "",
+  "zip": "",
+  "state": "",
+  "phone": "",
+  "industry": "",
+  "org": "",
+  "job_title": "",
+  "purchasing_time_frame": "",
+  "role_in_purchase_process": "",
+  "no_of_employees": "",
+  "comments": "",
+  "custom_questions": [
+
+  ],
+  "status": "approved",
+  "create_time": "2019-06-26T10:45:56Z",
+  "join_url": "https://zoom.us/w/FAKE"
+}

data/spec/lib/zoom/actions/account/list_spec.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Zoom::Actions::Account do
+  let(:zc) { zoom_client }
+  let(:args) {
+    {}
+  }
+  describe '#account_list action' do
+    context 'with a valid response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url('/accounts')
+        ).to_return(body: json_response('account', 'list'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'returns a hash' do
+        expect(zc.account_list(args)).to be_kind_of(Hash)
+      end
+
+      it "allows 'page_size and page_numbers" do
+        args[:page_number] = 1
+        args[:page_size] = 30
+        expect(zc.account_list(args)).to be_kind_of(Hash)
+      end
+
+      it "returns 'total_records" do
+        expect(zc.account_list(args)['total_records']).to eq(1)
+      end
+
+      it "returns 'accounts' Array" do
+        expect(zc.account_list(args)['accounts']).to be_kind_of(Array)
+      end
+
+      it 'raises an error when passed an invalid option' do
+        expect { zc.account_list(foo: 'bar') }.to raise_error(Zoom::ParameterNotPermitted, [:foo].to_s)
+      end
+    end
+
+    context 'with a 4xx response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url('/accounts')
+        ).to_return(status: 404,
+                    body: json_response('error', 'not_found'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'raises Zoom::Error exception' do
+        expect { zc.account_list }.to raise_error(Zoom::Error)
+      end
+    end
+  end
+end

data/spec/lib/zoom/actions/account/settings_get_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Zoom::Actions::Account do
+  let(:zc) { zoom_client }
+  let(:args) { { id: 'ufR9342pRyf8ePFN92dttQ' } }
+
+  describe '#settings_get action' do
+    context 'with a valid response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/accounts/#{args[:id]}/settings")
+          ).to_return(status: 200,
+                      body: json_response('account', 'settings_get'),
+                      headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'requires id param' do
+        expect { zc.account_settings_get(filter_key(args, :id)) }.to raise_error(Zoom::ParameterMissing, '[:id]')
+      end
+
+      it 'returns a hash' do
+        expect(zc.account_settings_get(args)).to be_kind_of(Hash)
+      end
+
+      it 'returns same params' do
+        res = zc.account_settings_get(args)
+
+        expect(res.keys).to match_array(["email_notification", "feature", "in_meeting", "integration", "recording", "schedule_meting", "security", "telephony", "tsp", "zoom_rooms"])
+      end
+    end
+
+    context 'with a 4xx response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/accounts/#{args[:id]}/settings")
+        ).to_return(status: 404,
+                    body: json_response('error', 'validation'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'raises Zoom::Error exception' do
+        expect { zc.account_settings_get(args) }.to raise_error(Zoom::Error)
+      end
+    end
+  end
+end

data/spec/lib/zoom/actions/user/settings_get_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Zoom::Actions::User do
+  let(:zc) { zoom_client }
+  let(:args) { { id: 'ufR9342pRyf8ePFN92dttQ' } }
+
+  describe '#settings_get action' do
+    context 'with a valid response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/users/#{args[:id]}/settings")
+          ).to_return(status: 200,
+                      body: json_response('user', 'settings_get'),
+                      headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'requires id param' do
+        expect { zc.user_settings_get(filter_key(args, :id)) }.to raise_error(Zoom::ParameterMissing, '[:id]')
+      end
+
+      it 'allowes login_type' do
+        args[:login_type] = 0
+        expect { zc.user_settings_get(args) }.not_to raise_error
+      end
+
+
+      it 'returns a hash' do
+        expect(zc.user_settings_get(args)).to be_kind_of(Hash)
+      end
+
+      it 'returns same params' do
+        res = zc.user_settings_get(args)
+
+        expect(res.keys).to match_array(['scheduled_meeting', 'in_meeting', 'email_notification', 'recording', 'telephony', 'tsp', 'feature'])
+      end
+    end
+
+    context 'with a 4xx response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/users/#{args[:id]}/settings")
+        ).to_return(status: 404,
+                    body: json_response('error', 'validation'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'raises Zoom::Error exception' do
+        expect { zc.user_settings_get(args) }.to raise_error(Zoom::Error)
+      end
+    end
+  end
+end

data/spec/lib/zoom/actions/webinar/create_spec.rb

@@ -3,51 +3,56 @@
 require 'spec_helper'
 
 RSpec.describe Zoom::Actions::Webinar do
-  let(:zc) { zoom_client }
-  let(:args) { { host_id: 'test_user_id' } }
-
-  describe '#webinar_create' do
-    context 'with a valid response' do
-      before :each do
-        stub_request(
-          :post,
-          zoom_url("/users/#{args[:host_id]}/webinars")
-        ).to_return(body: json_response('webinar', 'create'),
-                    headers: { 'Content-Type' => 'application/json' })
-      end
-
-      it "requires a 'host_id' argument" do
-        expect { zc.webinar_create(filter_key(args, :host_id)) }.to raise_error(Zoom::ParameterMissing, [:host_id].to_s)
-      end
-
-      it 'returns a hash' do
-        expect(zc.webinar_create(args)).to be_kind_of(Hash)
-      end
-
-      it 'returns the setted params' do
-        res = zc.webinar_create(args)
-        expect(res['host_id']).to eq(args[:host_id])
-      end
-
-      it "returns 'start_url' and 'join_url'" do
-        res = zc.webinar_create(args)
-
-        expect(res['start_url']).to_not be_nil
-        expect(res['join_url']).to_not be_nil
-      end
-    end
-
-    context 'with a 4xx response' do
-      before :each do
-        stub_request(
-          :post,
-          zoom_url("/users/#{args[:host_id]}/webinars")
-        ).to_return(body: json_response('error', 'validation'),
-                    headers: { 'Content-Type' => 'application/json' })
-      end
 
-      it 'raises Zoom::Error exception' do
-        expect { zc.webinar_create(args) }.to raise_error(Zoom::Error)
+  [:jwt_client, :oauth_client].each do |client|
+    describe "#{client}" do
+      let(:zc) { send(client) }
+      let(:args) { { host_id: 'test_user_id' } }
+
+      describe '#webinar_create' do
+        context 'with a valid response' do
+          before :each do
+            stub_request(
+              :post,
+              zoom_url("/users/#{args[:host_id]}/webinars")
+            ).to_return(body: json_response('webinar', 'create'),
+                        headers: { 'Content-Type' => 'application/json' })
+          end
+
+          it "requires a 'host_id' argument" do
+            expect { zc.webinar_create(filter_key(args, :host_id)) }.to raise_error(Zoom::ParameterMissing, [:host_id].to_s)
+          end
+
+          it 'returns a hash' do
+            expect(zc.webinar_create(args)).to be_kind_of(Hash)
+          end
+
+          it 'returns the setted params' do
+            res = zc.webinar_create(args)
+            expect(res['host_id']).to eq(args[:host_id])
+          end
+
+          it "returns 'start_url' and 'join_url'" do
+            res = zc.webinar_create(args)
+
+            expect(res['start_url']).to_not be_nil
+            expect(res['join_url']).to_not be_nil
+          end
+        end
+
+        context 'with a 4xx response' do
+          before :each do
+            stub_request(
+              :post,
+              zoom_url("/users/#{args[:host_id]}/webinars")
+            ).to_return(body: json_response('error', 'validation'),
+                        headers: { 'Content-Type' => 'application/json' })
+          end
+
+          it 'raises Zoom::Error exception' do
+            expect { zc.webinar_create(args) }.to raise_error(Zoom::Error)
+          end
+        end
       end
     end
   end

data/spec/lib/zoom/actions/webinar/registrants/get_spec.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Zoom::Actions::Webinar do
+  let(:zc) { zoom_client }
+  let(:args) { { webinar_id: 'webinar_id', id: 'registrant_id' } }
+
+  describe '#webinar_registrant_get' do
+    context 'with a valid response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/webinars/#{args[:webinar_id]}/registrants/#{args[:id]}")
+        ).to_return(body: json_response('webinar', 'registrant', 'get'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it "requires a 'webinar_id' argument" do
+        expect { zc.webinar_registrant_get(filter_key(args, :webinar_id)) }.to raise_error(Zoom::ParameterMissing, [:webinar_id].to_s)
+      end
+      it "requires a 'id' argument" do
+        expect { zc.webinar_registrant_get(filter_key(args, :id)) }.to raise_error(Zoom::ParameterMissing, [:id].to_s)
+      end
+      it "allows occurrence_id" do
+        expect { zc.webinar_registrant_get(args.merge(:occurrence_id => '5')) }.not_to raise_error
+      end
+
+      it 'returns an Hash' do
+        expect(zc.webinar_registrant_get(args)).to be_kind_of(Hash)
+      end
+    end
+
+    context 'with a 4xx response' do
+      before :each do
+        stub_request(
+          :get,
+          zoom_url("/webinars/#{args[:webinar_id]}/registrants/#{args[:id]}")
+        ).to_return(status: 404,
+                    body: json_response('error', 'validation'),
+                    headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'raises Zoom::Error exception' do
+        expect { zc.webinar_registrant_get(args) }.to raise_error(Zoom::Error)
+      end
+    end
+  end
+end

data/spec/lib/zoom/client_spec.rb

@@ -2,11 +2,12 @@
 
 require 'spec_helper'
 
-xdescribe Zoom::Client do
+describe Zoom::Client do
 
-  xdescribe 'default attributes' do
+  describe 'default attributes' do
     it 'must include httparty methods' do
       expect(Zoom::Client).to include(HTTParty)
+      expect(Zoom::Client::JWT).to include(HTTParty)
     end
 
     it 'must have the base url set to Zoom API endpoint' do
@@ -19,7 +20,7 @@ xdescribe Zoom::Client do
         config.api_secret = 'xxx'
       end
       Zoom.new
-      expect(Zoom::Client.default_options[:timeout]).to eq(15)
+      expect(Zoom::Client::JWT.default_options[:timeout]).to eq(15)
     end
 
     it 'must get the timeout from the configuration' do
@@ -29,17 +30,47 @@ xdescribe Zoom::Client do
         config.timeout = 20
       end
       Zoom.new
-      expect(Zoom::Client.default_options[:timeout]).to eq(20)
+      expect(Zoom::Client::JWT.default_options[:timeout]).to eq(20)
     end
   end
 
-  xdescribe 'constructor' do
+  describe 'JWT client' do
+    let(:client) {
+      Zoom::Client::JWT.new(api_key: 'xxx', api_secret: 'xxx', timeout: 15)
+    }
     it 'requires api_key and api_secret for a new instance' do
-      expect { Zoom::Client.new(api_key: 'xxx') }.to raise_error(ArgumentError)
+      expect { Zoom::Client::JWT.new(api_key: 'xxx') }.to raise_error(Zoom::ParameterMissing)
+      expect { Zoom::Client::JWT.new(api_key: 'xxx', api_secret: 'xxx') }.not_to raise_error
     end
 
     it 'creates instance of Zoom::Client if api_key and api_secret is provided' do
-      expect(Zoom::Client.new(api_key: 'xxx', api_secret: 'xxx', timeout: 15)).to be_an_instance_of(Zoom::Client)
+      expect(client).to be_kind_of(Zoom::Client)
+    end
+
+    it 'has the bearer token in the auth header' do
+      fake_token = 'NotTheRealToken'
+      allow(client).to receive(:access_token) {fake_token}
+      expect(client.request_headers['Authorization']).to eq("Bearer #{fake_token}")
+    end
+
+  end
+
+  describe 'OAuth client' do
+    let(:access_token) {'xxx'}
+    let(:client) {
+      Zoom::Client::OAuth.new(access_token: access_token, timeout: 30)
+    }
+    it 'requires an access token' do
+      expect { Zoom::Client::OAuth.new(timeout: 30) }.to raise_error(Zoom::ParameterMissing)
+      expect { Zoom::Client::OAuth.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
   end
 end

data/spec/lib/zoom/utils_spec.rb

@@ -26,16 +26,6 @@ xdescribe Zoom::Utils do
     end
   end
 
-  xdescribe '#require_params' do
-    it 'raises ArgumentError if the param is not present' do
-      expect { Utils.require_params(:foo, { bar: 'bar' }) }.to raise_error(ArgumentError)
-    end
-
-    it 'does not raise ArgumentError if the param is present' do
-      expect { Utils.require_params(:foo, { foo: 'foo' }) }.to_not raise_error
-    end
-  end
-
   xdescribe '#extract_options!' do
     it 'converts array to hash options' do
       args = [{ foo: 'foo' }, { bar: 'bar' }, { zemba: 'zemba' }]

data/spec/spec_helper.rb

@@ -24,10 +24,18 @@ def zoom_url(url)
   /https:\/\/api.zoom.us\/v2#{url}.*/
 end
 
-def zoom_client
+def jwt_client
   Zoom.new
 end
 
+def oauth_client
+  Zoom::Client::OAuth.new(access_token: 'xxx', timeout: 15)
+end
+
+def zoom_client
+  jwt_client
+end
+
 def filter_key(hash, key)
   copy = hash.dup
   copy.delete(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoom_rb
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Kyle Boe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -163,12 +163,16 @@ files:
 - lib/zoom/actions/user.rb
 - lib/zoom/actions/webinar.rb
 - lib/zoom/client.rb
+- lib/zoom/clients/jwt.rb
+- lib/zoom/clients/oauth.rb
 - lib/zoom/constants.rb
 - lib/zoom/error.rb
 - lib/zoom/interface.rb
 - lib/zoom/params.rb
 - lib/zoom/utils.rb
 - lib/zoom/version.rb
+- spec/fixtures/account/list.json
+- spec/fixtures/account/settings_get.json
 - spec/fixtures/chat/get.json
 - spec/fixtures/chat/list.json
 - spec/fixtures/error/already_exists.json
@@ -206,18 +210,22 @@ files:
 - spec/fixtures/user/list.json
 - spec/fixtures/user/pending.json
 - spec/fixtures/user/permanent_delete.json
+- spec/fixtures/user/settings_get.json
 - spec/fixtures/user/update.json
 - spec/fixtures/webinar/create.json
 - spec/fixtures/webinar/delete.json
 - spec/fixtures/webinar/list.json
 - spec/fixtures/webinar/past_webinar_list.json
 - spec/fixtures/webinar/registrant/add.json
+- spec/fixtures/webinar/registrant/get.json
 - spec/fixtures/webinar/registrant/list.json
 - spec/fixtures/webinar/update.json
 - spec/fixtures/webinar_delete.json
 - spec/fixtures/webinar_end.json
 - spec/fixtures/webinar_get.json
 - spec/fixtures/webinar_update.json
+- spec/lib/zoom/actions/account/list_spec.rb
+- spec/lib/zoom/actions/account/settings_get_spec.rb
 - spec/lib/zoom/actions/group/create_spec.rb
 - spec/lib/zoom/actions/group/delete_spec.rb
 - spec/lib/zoom/actions/group/edit_spec.rb
@@ -296,6 +304,7 @@ files:
 - spec/lib/zoom/actions/user/getbyemail_spec.rb
 - spec/lib/zoom/actions/user/list_spec.rb
 - spec/lib/zoom/actions/user/revoketoken_spec.rb
+- spec/lib/zoom/actions/user/settings_get_spec.rb
 - spec/lib/zoom/actions/user/update_spec.rb
 - spec/lib/zoom/actions/user/updatepassword_spec.rb
 - spec/lib/zoom/actions/webinar/attendees_list_spec.rb
@@ -311,6 +320,7 @@ files:
 - spec/lib/zoom/actions/webinar/questions_spec.rb
 - spec/lib/zoom/actions/webinar/register_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/add_spec.rb
+- spec/lib/zoom/actions/webinar/registrants/get_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/list_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/update_status_spec.rb
 - spec/lib/zoom/actions/webinar/registration_cancel_spec.rb
@@ -346,6 +356,8 @@ signing_key:
 specification_version: 4
 summary: zoom.us API wrapper
 test_files:
+- spec/fixtures/account/list.json
+- spec/fixtures/account/settings_get.json
 - spec/fixtures/chat/get.json
 - spec/fixtures/chat/list.json
 - spec/fixtures/error/already_exists.json
@@ -383,18 +395,22 @@ test_files:
 - spec/fixtures/user/list.json
 - spec/fixtures/user/pending.json
 - spec/fixtures/user/permanent_delete.json
+- spec/fixtures/user/settings_get.json
 - spec/fixtures/user/update.json
 - spec/fixtures/webinar/create.json
 - spec/fixtures/webinar/delete.json
 - spec/fixtures/webinar/list.json
 - spec/fixtures/webinar/past_webinar_list.json
 - spec/fixtures/webinar/registrant/add.json
+- spec/fixtures/webinar/registrant/get.json
 - spec/fixtures/webinar/registrant/list.json
 - spec/fixtures/webinar/update.json
 - spec/fixtures/webinar_delete.json
 - spec/fixtures/webinar_end.json
 - spec/fixtures/webinar_get.json
 - spec/fixtures/webinar_update.json
+- spec/lib/zoom/actions/account/list_spec.rb
+- spec/lib/zoom/actions/account/settings_get_spec.rb
 - spec/lib/zoom/actions/group/create_spec.rb
 - spec/lib/zoom/actions/group/delete_spec.rb
 - spec/lib/zoom/actions/group/edit_spec.rb
@@ -473,6 +489,7 @@ test_files:
 - spec/lib/zoom/actions/user/getbyemail_spec.rb
 - spec/lib/zoom/actions/user/list_spec.rb
 - spec/lib/zoom/actions/user/revoketoken_spec.rb
+- spec/lib/zoom/actions/user/settings_get_spec.rb
 - spec/lib/zoom/actions/user/update_spec.rb
 - spec/lib/zoom/actions/user/updatepassword_spec.rb
 - spec/lib/zoom/actions/webinar/attendees_list_spec.rb
@@ -488,6 +505,7 @@ test_files:
 - spec/lib/zoom/actions/webinar/questions_spec.rb
 - spec/lib/zoom/actions/webinar/register_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/add_spec.rb
+- spec/lib/zoom/actions/webinar/registrants/get_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/list_spec.rb
 - spec/lib/zoom/actions/webinar/registrants/update_status_spec.rb
 - spec/lib/zoom/actions/webinar/registration_cancel_spec.rb