simple-oauth2 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef184588478b46fd4e334b78fa141a3b7a540703
-  data.tar.gz: 579123b59a3b7fa1c56fee46c3eb7dd2325e694b
+  metadata.gz: 6b037cb1cb09dbcbf5bdc7f18702c38015365866
+  data.tar.gz: d0ff5dbca25265b7b047ed2ed7f5914ea9982b8d
 SHA512:
-  metadata.gz: 787dd620b5f76f8e787a647ceb9d00a2208630e00a919c63f12891c982cd21428298e2d46e9e8511aaea6b90f29603f4456f8afd7cba2e92dcd6ff19ead91cab
-  data.tar.gz: 00a0cf3e24f5365a9602fc9486d0646ce990ad407c5297136d09ec0f0ef9cc74feb23397c93038e67f2cad3c5907e6d6c4f51a6d67d08e1a9f8cbc8656aea7ef
+  metadata.gz: 89a043c7098d258635789280a81098991037c9e2e5232c46f8523bdb048340168c88d3e6f5b52cd1bd978cd30c40d8c587547b4c15b78d0ae5a4d5aa238a675a
+  data.tar.gz: 9576c88267b3a9b744323af24c1d28d66c7753cb0da62555b37b7a7ad7a3f935ca8c498a008a43222c10136f620314d59511440f0d6987532396e56e263ca882

data/lib/simple-oauth2.rb

@@ -2,10 +2,10 @@ require "faraday"
 require "addressable/template"
 require "addressable/uri"
 require "json"
+require "models/response"
 
 module Simple
   module Oauth2
-    
     class Client
       attr_accessor :client_id,
                     :client_secret,
@@ -43,18 +43,14 @@ module Simple
           redirect_uri: @redirect_uri,
           client_secret: @client_secret
         }
-        uri = "#{@base_uri}#{@token_endpoint}?#{params.query}"
-        conn = Faraday.new(:url => uri)
-        response = conn.post uri
-        response = JSON.parse(response.body)
-        return {
-          access_token: response['access_token'],
-          expires_in: response['expires_in']
-        }
+        url = "#{@base_uri}#{@token_endpoint}?#{params.query}"
+        conn = Faraday.new(:url => url)
+        response = conn.post url
+        Response.new(response.body)
       end
 
       # Exchanges a verification code for an access token.
-      def exchange_for_access_token(code)
+      def exchange(code)
         params = Addressable::URI.new
         params.query_values = {
           type: 'web_server',
@@ -66,11 +62,8 @@ module Simple
         uri = "#{@base_uri}#{@token_endpoint}?#{params.query}"
         conn = Faraday.new(:url => uri)
         response = conn.post uri
-        response = JSON.parse(response.body)
-        return {
-          access_token: response['access_token'],
-          expires_in: response['expires_in']
-        }
+        binding.pry
+        Response.new(response.body)
       end
 
       # Returns redirect url.
@@ -85,4 +78,4 @@ module Simple
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mitch Stewart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler