base-api-client 0.1.beta → 0.2.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d75f174be753de6e385803877029bdcb18e082
-  data.tar.gz: 5d70306b9d7689c2fd63107fd3254e802f159805
+  metadata.gz: 103ef6001cec3b96f9f486c5189972ea14b66eb0
+  data.tar.gz: 6d4b73796e59847cc1e697f7e9e7ddb842b3a195
 SHA512:
-  metadata.gz: 46b44a2014cafdfa7918095e1ff0d1510ff5e34dff51a7d258ee769018505e70d49c0dcdd07fbdf41fac3625d0b470a5d6b63b1f7679ceba4b7c5812c284ea19
-  data.tar.gz: a4f317556b86c5ea7eebef236a1c6e6e03fec83b97b4607cf25871767695eee645224e9f1bdbaa119942ec18e9e24e2a208c3be04adeab08c67628f60407d146
+  metadata.gz: e07780ea63e9722d309c679e612b53941d8de8e0f16fe2c3ff7670f889ab29baa0a5ede2a0dad1a326102753280c9f535de1296831d9e1cf58bcc5310672b2e1
+  data.tar.gz: 66039dc96c386efced4a658df4cbd84b7e8c496c889366c6c235d74548a05a1a32af56e922d27c1ff071a4736261ee3426f9c05c72361f1ed344f8e5960b43f6

data/base-api-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                  = 'base-api-client'
-  spec.version               = '0.1.beta'
+  spec.version               = '0.2.1.beta'
   spec.author                = 'ysksn'
   spec.email                 = ['bluewhale1982@gmail.com']
   spec.summary               = 'Client for accessing BASE APIs'

data/config/client_secret.json

@@ -1,10 +1,10 @@
 {
-  "client_id": "",
-  "client_secret": "",
+  "client_id": "e0920d3fba627a5da4eaab4e8e9d43fc",
+  "client_secret": "ad493e7ada7eb96a6f71d1ccb100966b",
   "code": "",
-  "redirect_uri": "",
+  "redirect_uri": "http://localhost.local",
   "search": {
-    "client_id": "",
-    "client_secret": ""
+    "client_id": "623f75000821c16163ec570ca6469539",
+    "client_secret": "214b4134022df8bf0230f5a077c772d9"
   }
 }

data/lib/base/api_client/client_secret.rb

@@ -11,6 +11,8 @@ module Base
         :client_id,
         :client_secret,
         :code,
+        :expires_at,
+        :grant_type,
         :redirect_uri,
         :refresh_token,
         :search_client_id,
@@ -25,7 +27,6 @@ module Base
         @redirect_uri ||= app_info['redirect_uri']
         @search_client_id ||= app_info['search']['client_id']
         @search_client_secret ||= app_info['search']['client_secret']
-        set_tokens!
       end
 
       def update!
@@ -69,6 +70,19 @@ module Base
           use_ssl: uri.scheme == 'https') { |http| http.request(request) }
       end
 
+      def generate_code
+        system(command, [AUTH_URI, generate_authorize_parameters].join)
+      end
+
+      def set_tokens!
+        response       = fetch_token
+        @access_token  = response['access_token']
+        @refresh_token = response['refresh_token']
+        @code          = nil
+        @expires_at    = to_expires_at(response['expires_in'])
+        to_hash
+      end
+
       private
 
       def load_file
@@ -80,7 +94,9 @@ module Base
         { client_id:            client_id,
           client_secret:        client_secret,
           code:                 code,
+          expires_at:           expires_at,
           redirect_uri:         redirect_uri,
+          access_token:         access_token,
           refresh_token:        refresh_token,
           search_client_id:     search_client_id,
           search_client_secret: search_client_secret }
@@ -98,13 +114,9 @@ module Base
             ['state', ''],
             %w(response_type code),
             ['scope', SCOPES]]
-          .inject([]) do |memo, arr|
-            memo << arr.join('=')
-          end.join('&')
-      end
-
-      def generate_code
-        system(command, [AUTH_URI, generate_authorize_parameters].join)
+            .inject([]) do |memo, arr|
+              memo << arr.join('=')
+            end.join('&')
       end
 
       def command
@@ -115,8 +127,16 @@ module Base
         end
       end
 
-      def fetch_token(refresh: false)
-        grant_type = refresh ? 'refresh_token' : 'authorization_code'
+      def grant_type
+        @grant_type =
+          if code && redirect_uri
+            'authorization_code'
+          elsif refresh_token
+            'refresh_token'
+          end
+      end
+
+      def fetch_token
         request_parameters = to_hash.merge(grant_type: grant_type)
         uri                = URI.parse(TOKEN_URI.to_s)
         response           = Net::HTTP.post_form(uri, request_parameters)
@@ -124,10 +144,8 @@ module Base
         JSON.parse response.body
       end
 
-      def set_tokens!(refresh: false)
-        response       = refresh ? fetch_token(refresh: refresh) : fetch_token
-        @access_token  = response['access_token']
-        @refresh_token = response['refresh_token']
+      def to_expires_at(expires_in)
+        Time.now + expires_in
       end
     end
   end

data/spec/base/api_client/client_secret_spec.rb

@@ -6,10 +6,12 @@ RSpec.describe Base::APIClient::ClientSecret do
   let(:data) { MultiJson.load(File.open(secret_file, 'r').read) }
 
   before(:each) do
+    allow(Time).to receive(:now) { Time.new(2016) }
     allow_any_instance_of(Base::APIClient::ClientSecret)
       .to receive(:fetch_token) do
       { access_token:  'fake_access_token',
-        refresh_token: 'fake_refresh_token' }
+        refresh_token: 'fake_refresh_token',
+        expires_in:     3600 }
     end
   end
 
@@ -35,6 +37,10 @@ RSpec.describe Base::APIClient::ClientSecret do
         expect(subject).to respond_to(:code)
       end
 
+      it 'has @expires_at' do
+        expect(subject).to respond_to(:expires_at)
+      end
+
       it 'has @redirect_uri' do
         expect(subject).to respond_to(:redirect_uri)
       end
@@ -119,8 +125,10 @@ RSpec.describe Base::APIClient::ClientSecret do
         client_id:            'fake_client_id',
         client_secret:        'fake_client_secret',
         code:                 'fake_code',
+        expires_at:            nil,
         redirect_uri:         'http://fake_redirect_uri.com',
-        refresh_token:        nil,
+        access_token:          nil,
+        refresh_token:         nil,
         search_client_id:     'fake_search_client_id',
         search_client_secret: 'fake_search_client_secret')
     end
@@ -129,7 +137,7 @@ RSpec.describe Base::APIClient::ClientSecret do
   describe '#to_json' do
     it 'returns values of instance variables in json' do
       expect(subject.send(:to_json)).to eq \
-        <<"EOS""{\"client_id\":\"fake_client_id\",\"client_secret\":\"fake_client_secret\",\"code\":\"fake_code\",\"redirect_uri\":\"http://fake_redirect_uri.com\",\"refresh_token\":null,\"search_client_id\":\"fake_search_client_id\",\"search_client_secret\":\"fake_search_client_secret\"}"
+        <<"EOS""{\"client_id\":\"fake_client_id\",\"client_secret\":\"fake_client_secret\",\"code\":\"fake_code\",\"expires_at\":null,\"redirect_uri\":\"http://fake_redirect_uri.com\",\"access_token\":null,\"refresh_token\":null,\"search_client_id\":\"fake_search_client_id\",\"search_client_secret\":\"fake_search_client_secret\"}"
 EOS
     end
   end
@@ -199,10 +207,42 @@ EOS
     end
   end
 
-  describe '#fetch_token' do
-    context 'passed arg "refresh: false"' do
-      let(:arg) { { refresh: false } }
+  describe '#grant_type' do
+    context '@grant_type is not nil' do
+      it 'returns @grant_type value authorization_code' do
+        subject.instance_variable_set(:@grant_type, 'authorization_code')
+        subject.send(:grant_type)
+        expect(subject.instance_variable_get(:@grant_type)).to eq \
+          'authorization_code'
+      end
+    end
 
+    context '@code and @redirect_uri exist' do
+      it 'sets @grant_type "authorization_code"' do
+        subject.instance_variable_set(:@grant_type, nil)
+        subject.instance_variable_set(:@code, true)
+        subject.instance_variable_set(:@redirect_uri, true)
+        subject.send(:grant_type)
+        expect(subject.instance_variable_get(:@grant_type)).to eq \
+          'authorization_code'
+      end
+    end
+
+    context 'only @refresh_token exists' do
+      it 'sets @grant_type "authorization_code"' do
+        subject.instance_variable_set(:@grant_type, nil)
+        subject.instance_variable_set(:@code, nil)
+        subject.instance_variable_set(:@redirect_uri, nil)
+        subject.instance_variable_set(:@refresh_token, true)
+        subject.send(:grant_type)
+        expect(subject.instance_variable_get(:@grant_type)).to eq \
+          'refresh_token'
+      end
+    end
+  end
+
+  describe '#fetch_token' do
+    context 'grant_type is "authorization_code"' do
       it 'returns access and refresh tokens' do
         stub_request(
           :post,
@@ -212,15 +252,14 @@ EOS
             .send(:to_hash)
             .merge(grant_type: 'authorization_code'))
 
-        expect(subject.send(:fetch_token, arg)).to eq(
+        expect(subject.send(:fetch_token)).to eq(
           access_token:  'fake_access_token',
-          refresh_token: 'fake_refresh_token')
+          refresh_token: 'fake_refresh_token',
+          expires_in:     3600)
       end
     end
 
-    context 'passed arg "refresh: true"' do
-      let(:arg) { { refresh: true } }
-
+    context 'grant_type is "refresh_token"' do
       it 'returns access and refresh tokens' do
         stub_request(
           :post,
@@ -230,41 +269,90 @@ EOS
             .send(:to_hash)
             .merge(grant_type: 'refresh_token'))
 
-        expect(subject.send(:fetch_token, arg)).to eq(
+        expect(subject.send(:fetch_token)).to eq(
           access_token:  'fake_access_token',
-          refresh_token: 'fake_refresh_token')
+          refresh_token: 'fake_refresh_token',
+          expires_in:     3600)
       end
     end
   end
 
   describe '#set_tokens!' do
-    context 'passed arg "refresh: false"' do
-      let(:arg) { { refresh: false } }
+    let(:expected_expires_at) do
+      Date.parse(Time.new(2016).to_s).to_time + 3600
+    end
+
+    before do
+      allow(subject).to receive(:fetch_token) do
+        { 'access_token'  => 'stubbed_access_token',
+          'refresh_token' => 'stubbed_refresh_token',
+          'expires_in'    => 3600 }
+      end
+    end
+
+    context 'fetch_token called with grant_type "authorization_code"' do
+      context 'grant_type is authorization_code' do
+        before do
+          allow(subject).to receive(:grant_type) do
+            'authorization_code'
+          end
+        end
 
-      it 'set access and refresh tokens' do
-        allow(subject).to receive(:fetch_token) do
-          { 'access_token'  => 'stubbed_access_token',
-            'refresh_token' => 'stubbed_refresh_token' }
+        it 'set access and refresh tokens' do
+          subject.send(:set_tokens!)
+          expect(subject.access_token).to eq 'stubbed_access_token'
+          expect(subject.refresh_token).to eq 'stubbed_refresh_token'
+          expect(subject.expires_at).to eq expected_expires_at
         end
 
-        subject.send(:set_tokens!, arg)
-        expect(subject.access_token).to  eq 'stubbed_access_token'
-        expect(subject.refresh_token).to eq 'stubbed_refresh_token'
+        it 'returns hased properties' do
+          expect(subject.send(:set_tokens!)).to eq(
+            access_token:         'stubbed_access_token',
+            client_id:            'fake_client_id',
+            client_secret:        'fake_client_secret',
+            code:                  nil,
+            expires_at:            expected_expires_at,
+            redirect_uri:         'http://fake_redirect_uri.com',
+            refresh_token:        'stubbed_refresh_token',
+            search_client_id:     'fake_search_client_id',
+            search_client_secret: 'fake_search_client_secret')
+        end
       end
     end
 
-    context 'passed arg "refresh: true"' do
-      let(:arg) { { refresh: true } }
+    context 'fetch_token called with grant_type "refresh_token"' do
+      context 'grant_type is refresh_token' do
+        before do
+          allow(subject).to receive(:grant_type) { 'refresh_token' }
+        end
+
+        it 'set access and refresh tokens' do
+          subject.send(:set_tokens!)
+          expect(subject.access_token).to eq 'stubbed_access_token'
+          expect(subject.refresh_token).to eq 'stubbed_refresh_token'
+          expect(subject.expires_at).to eq expected_expires_at
+        end
 
-      it 'set access and refresh tokens' do
-        allow(subject).to receive(:fetch_token).with(arg) do
-          { 'access_token'  => 'stubbed_access_token',
-            'refresh_token' => 'stubbed_refresh_token' }
+        it 'returns hased properties' do
+          expect(subject.send(:set_tokens!)).to eq(
+            access_token:         'stubbed_access_token',
+            client_id:            'fake_client_id',
+            client_secret:        'fake_client_secret',
+            code:                  nil,
+            expires_at:            expected_expires_at,
+            redirect_uri:         'http://fake_redirect_uri.com',
+            refresh_token:        'stubbed_refresh_token',
+            search_client_id:     'fake_search_client_id',
+            search_client_secret: 'fake_search_client_secret')
         end
+      end
+    end
 
-        subject.send(:set_tokens!, arg)
-        expect(subject.access_token).to  eq 'stubbed_access_token'
-        expect(subject.refresh_token).to eq 'stubbed_refresh_token'
+    describe '#to_expires_at' do
+      it 'returns expires_at' do
+        expires_at = subject.send(:to_expires_at, 3600)
+        expect(expires_at).to eq \
+          Date.parse(Time.new(2016).to_s).to_time + 3600
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.beta
+  version: 0.2.1.beta
 platform: ruby
 authors:
 - ysksn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os