plangrade-ruby 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb0949e0cc91058f9f73270572ec1430024c60e
-  data.tar.gz: aed964c431dcfc9b084351fe17d7ce0567f51c73
+  metadata.gz: 84042f01be72b4e9a4f175176cdd38ca0f93ff82
+  data.tar.gz: 3666e185380752fb2780dca13905ad3f6e5b2d94
 SHA512:
-  metadata.gz: cd5fbc422ed5ad109cbf3e7fc807c26e100a9fffdc700efcf64616e357397804957d6dd2bdba69bce8bbd47f0ff0eab15fad84136f499a83bc5c4bc745890ac3
-  data.tar.gz: 9640f6b24614b22ba86792672a8239aa47cb78e92285a761ec18f1301bf569d568a1f21cb2cf037565e4f97e6d5117e8479a07c2ce13fff98a0a3600921f01ce
+  metadata.gz: e0b23cff9db342711a11b81a4171d3e4a7321321d8d9a2af6735f1f3c4d9229a7378d5840b29e182c8dbe524fb43549b2e1504a17d4e9932779f9b0ec2f68aa2
+  data.tar.gz: 1c89eef0bf1516cc388e4bf4257b419a96fc7a4e1f1bd25189d36c5f488d2026e95990c20dbb272eeea2b56f7f17d815938d094dd1936de6b1594535c338a514

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(your_redirect_uri)
+auth_url = plangrade_client.webserver_authorization_url(:redirect_uri => '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], your_redirect_uri)
+response = plangrade_client.exchange_auth_code_for_token(:params => {:code => params[:code], :redirect_uri => '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(your_refresh_token, your_redirect_uri)
+response = plangrade_client.refresh_access_token(:params => {:refresh_token => 'your_refresh_token', :redirect_uri => 'http://localhost:3000/callback'})
 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(redirect)
-      opts = {:redirect_uri => redirect}
+    def webserver_authorization_url(opts={})
+      opts[:scope] = normalize_scope(opts[:scope]) if opts[:scope]
       authorization_code.authorization_url(opts)
     end
 
@@ -54,9 +54,12 @@ 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(code, redirect)
-      opts = {:params => {:redirect_uri => redirect}}
-      opts[:authenticate] = :body
+    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)
       authorization_code.get_token(code, opts)
     end
 
@@ -78,10 +81,13 @@ module Plangrade
 
     #  client_id={client_id}&refresh_token=G3Y6jU3a&grant_type=refresh_token&
     #  client_secret={client_secret}
-    def refresh_access_token(ref_token, redirect)
-      opts = {:params => {:redirect_uri => redirect}}
+    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
       opts[:authenticate] = :body
-      refresh_token.get_token(ref_token, opts)
+      token = opts[:params].delete(:refresh_token)
+      refresh_token.get_token(token, opts)
     end
   end
 end

data/lib/plangrade/ruby/version.rb

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

data/spec/oauth2_client_spec.rb

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