Merge pull request #20 from koshilife/#18-support-x-www-form-urlencoded-for-omniauth-1.0-series

release 0.4.0 - change to use x-www-form-urlencoded

Author: koshilife

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.4.0
+
+- change to use x-www-form-urlencoded in the request of getting tokens.(#18)
+
 ## 0.3.0
 
 - be specified dependency for omniauth 1.9.

lib/omniauth-zoom/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Zoom
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

lib/omniauth/strategies/zoom.rb

@@ -14,20 +14,11 @@ class Zoom < OmniAuth::Strategies::OAuth2
       uid { raw_info['id'] }
       extra { {raw_info: raw_info} }
 
-    protected
-
-      def build_access_token
-        params = {
-          grant_type: 'authorization_code',
-          code: request.params['code'],
-          redirect_uri: callback_url
-        }
-        path = "#{client.options[:token_url]}?#{URI.encode_www_form(params)}"
-        headers_secret = Base64.strict_encode64("#{client.id}:#{client.secret}")
-        opts = {headers: {Authorization: "Basic #{headers_secret}"}}
-
-        res = client.request(:post, path, opts)
-        ::OAuth2::AccessToken.from_hash(client, res.parsed)
+      def token_params
+        params = super
+        params[:headers] ||= {}
+        params[:headers][:Authorization] = format('Basic %s', Base64.strict_encode64("#{client.id}:#{client.secret}"))
+        params
       end
 
     private

test/test_helper.rb

@@ -39,11 +39,12 @@ def strategy
 
   def add_mock_exchange_token
     WebMock.enable!
-    url = "https://zoom.us/oauth/token?code=#{@authorization_code}&grant_type=authorization_code&redirect_uri=http://example.org/auth/zoom/callback"
+    url = 'https://zoom.us/oauth/token'
     secret = Base64.strict_encode64("#{@client_id}:#{@client_secret}")
-    headers = {'Authorization' => "Basic #{secret}"}
+    headers = {'Authorization' => "Basic #{secret}", 'Content-Type' => 'application/x-www-form-urlencoded'}
     res_headers = {'Content-Type' => 'application/json'}
-    stub_request(:post, url).with(headers: headers).to_return(status: 200, body: dummy_token_response.to_json, headers: res_headers)
+    stub_request(:post, url).with(headers: headers).to_return(status: 200, body: dummy_token_response.to_json,
+                                                              headers: res_headers)
   end
 
   def dummy_token_response
@@ -61,7 +62,8 @@ def add_mock_user_info
     url = 'https://zoom.us/v2/users/me'
     headers = {'Authorization' => "Bearer #{@access_token}"}
     res_headers = {'Content-Type' => 'application/json'}
-    stub_request(:get, url).with(headers: headers).to_return(status: 200, body: dummy_user_info_response.to_json, headers: res_headers)
+    stub_request(:get, url).with(headers: headers).to_return(status: 200, body: dummy_user_info_response.to_json,
+                                                             headers: res_headers)
   end
 
   def add_mock_user_info_then_fail_because_of_missing_scope
@@ -82,7 +84,7 @@ def add_mock_user_info_then_fail_because_of_unknown
     stub_request(:get, url).with(headers: headers).to_return(status: 500, body: response.to_json, headers: res_headers)
   end
 
-  def dummy_user_info_response
+  def dummy_user_info_response # rubocop:disable Metrics/MethodLength
     {
       id: 'KdYKjnimT4KPd8FFgQt9FQ',
       first_name: 'Jane',