plangrade-ruby 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d0e4bf5b76d88ca44a62276da4d6432ca7b9f6
-  data.tar.gz: a896fbc12562a8bc2aacde323f9a8466f994302a
+  metadata.gz: ecb0949e0cc91058f9f73270572ec1430024c60e
+  data.tar.gz: aed964c431dcfc9b084351fe17d7ce0567f51c73
 SHA512:
-  metadata.gz: 38466fe4ba4a3a80791c3557be51fb86234a2fece2a97c433629077a9f82dc47a86754dc2b7177f3e4948e5f5beaa70bf00d7683eb7444f861329b357856479d
-  data.tar.gz: 865a9d42ae45b87ed64511043a9771407cf46e3a0749cb827134247060fd2a485f9c6d81b23aafcc21ef435f08b72498fbecb15e7716db8f79ae8c20a02fb42f
+  metadata.gz: cd5fbc422ed5ad109cbf3e7fc807c26e100a9fffdc700efcf64616e357397804957d6dd2bdba69bce8bbd47f0ff0eab15fad84136f499a83bc5c4bc745890ac3
+  data.tar.gz: 9640f6b24614b22ba86792672a8239aa47cb78e92285a761ec18f1301bf569d568a1f21cb2cf037565e4f97e6d5117e8479a07c2ce13fff98a0a3600921f01ce

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-*o��.>�ln0(��|W���E�G�@�nlr�1(O���Iz&�(!�
�
-��bH��硑���˧�����u~X�N`�gO�@�p_��z?zD��Cxc�VE�`��J1�FX��
Y#R��J��zYKE
�t�q%�rrBjКD'�^|*zsͽ~t�
-k�kh�F�e�$	n�+�O�hda4����6V��W�����}�;Q��D13�{�6��M�5�
�/P=��˛�O�h��� � w��~|֬ڼ��P'�vU
+x��������BRٱ��|���y��gJ�)���7�\��H�y�l�*�/T�Mޠң���S��]���`��7�#�"������a��^��DG���H�Sr�%��,�ݵ���|J�]2^hBR~j#����{l�o������bme,2��/ffh�eMK�g��54��@j4�X�1�
+:$%"t.-��?�[ֽ��� ����hV�x*"+�ғ��j���P5�kH&�ҕ��KM\K��9*?�z;c�
���

data/README.md

@@ -53,14 +53,14 @@ require 'plangrade'
 
 # Begin by getting the authorization url
 plangrade_client = Plangrade::OAuth2Client.new(ENV['PLANGRADE_CLIENT_ID'], ENV['PLANGRADE_CLIENT_SECRET'])
-auth_url = plangrade_client.webserver_authorization_url(:redirect_uri => 'your_redirect_uri')
+auth_url = plangrade_client.webserver_authorization_url(your_redirect_uri)
 ```
 
 After the user follows the link created above and authorizes your app, they will be redirected to your `redirect_uri`, with a code in the params that you can use to obtain an access token.
 
 ```ruby
 plangrade_client = Plangrade::OAuth2Client.new(ENV['PLANGRADE_CLIENT_ID'], ENV['PLANGRADE_CLIENT_SECRET'])
-response = plangrade_client.exchange_auth_code_for_token({:params => {:code => params[:code], :redirect_uri => 'your_redirect_uri'}})
+response = plangrade_client.exchange_auth_code_for_token(params[:code], your_redirect_uri)
 token = JSON.parse response.body
 access_token = token["access_token"]
 refresh_token = token["refresh_token"]
@@ -75,7 +75,7 @@ This gem also allows you to use a `refresh_token` to obtain a new `access_token`
 ```ruby
 # Set up a plangrade OAuth2 client and retrieve your refresh_token
 plangrade_client = Plangrade::OAuth2Client.new(ENV['PLANGRADE_CLIENT_ID'], ENV['PLANGRADE_CLIENT_SECRET'])
-response = plangrade_client.refresh_access_token({:params => {:refresh_token => 'your_refresh_token'}})
+response = plangrade_client.refresh_access_token(your_refresh_token, your_redirect_uri)
 token = JSON.parse response.body
 access_token = token["access_token"]
 refresh_token = token["refresh_token"]

data/lib/plangrade/oauth2_client.rb

@@ -30,8 +30,8 @@ module Plangrade
     # >> https://plangrade.com/oauth/authorize/?client_id={client_id}&
     #    redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fplangrade%2Fcallback&response_type=code
     #
-    def webserver_authorization_url(opts={})
-      opts[:scope] = normalize_scope(opts[:scope]) if opts[:scope]
+    def webserver_authorization_url(redirect)
+      opts = {:redirect_uri => redirect}
       authorization_code.authorization_url(opts)
     end
 
@@ -54,12 +54,9 @@ module Plangrade
 
     #  client_id={client_id}&code=G3Y6jU3a&grant_type=authorization_code&
     #  redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fplangrade%2Fcallback&client_secret={client_secret}
-    def exchange_auth_code_for_token(opts={})
-      unless (opts[:params] && opts[:params][:code])
-        raise ArgumentError.new("You must include an authorization code as a parameter")
-      end
-      opts[:authenticate] ||= :body
-      code = opts[:params].delete(:code)
+    def exchange_auth_code_for_token(code, redirect)
+      opts = {:params => {:redirect_uri => redirect}}
+      opts[:authenticate] = :body
       authorization_code.get_token(code, opts)
     end
 
@@ -81,13 +78,10 @@ module Plangrade
 
     #  client_id={client_id}&refresh_token=G3Y6jU3a&grant_type=refresh_token&
     #  client_secret={client_secret}
-    def refresh_access_token(opts={})
-      unless (opts[:params] && opts[:params][:refresh_token])
-        raise ArgumentError.new("You must provide a refresh_token as a parameter")
-      end
+    def refresh_access_token(ref_token, redirect)
+      opts = {:params => {:redirect_uri => redirect}}
       opts[:authenticate] = :body
-      token = opts[:params].delete(:refresh_token)
-      refresh_token.get_token(token, opts)
+      refresh_token.get_token(ref_token, opts)
     end
   end
 end

data/lib/plangrade/ruby/version.rb

@@ -1,5 +1,5 @@
 module Plangrade
   module Ruby
-    VERSION = "0.3.22"
+    VERSION = "0.3.23"
   end
 end

data/spec/oauth2_client_spec.rb

@@ -38,14 +38,9 @@ describe Plangrade::OAuth2Client do
         "client_id" => "PRbTcg9qjgKsp4jjpm1pw",
         "redirect_uri" => "https://localhost:3000/callback",
         "response_type" =>"code",
-        "state" => "12345"
       }
 
-      auth_url = subject.webserver_authorization_url(
-        :client_id => 'PRbTcg9qjgKsp4jjpm1pw',
-        :state => '12345',
-        :redirect_uri => 'https://localhost:3000/callback'
-      )
+      auth_url = subject.webserver_authorization_url('https://localhost:3000/callback')
 
       parsed_url = Addressable::URI.parse(auth_url)
       expect(parsed_url.path).to eq '/oauth/authorize'
@@ -72,12 +67,7 @@ describe Plangrade::OAuth2Client do
           'User-Agent'     =>"Plangrade OAuth2 Client #{Plangrade::Ruby::VERSION}"
       })
 
-      subject.exchange_auth_code_for_token(
-        :params => {
-          :code => 'MmOGL795LbIZuJJVnL49Cc',
-          :redirect_uri => 'http://localhost:3000/callback'
-        }
-      )
+      subject.exchange_auth_code_for_token('MmOGL795LbIZuJJVnL49Cc', 'http://localhost:3000/callback')
     end
   end
 
@@ -98,12 +88,7 @@ describe Plangrade::OAuth2Client do
           'User-Agent'     =>"Plangrade OAuth2 Client #{Plangrade::Ruby::VERSION}"
       })
 
-      subject.refresh_access_token(
-        :params => {
-          :refresh_token => 'MmOGL795LbIZuJJVnL49Cc',
-          :redirect_uri => 'http://localhost:3000/callback'
-        }
-      )
+      subject.refresh_access_token('MmOGL795LbIZuJJVnL49Cc', 'http://localhost:3000/callback')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plangrade-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Christopher Reynoso