omni_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb1577afa97eb1cc2a58fee25900b59f807f9ac
-  data.tar.gz: 4a9242500eb846d47e9089d7e03fc7e29eb8e491
+  metadata.gz: 8464dd48ed93791d548c2f5b3eaa744aec2d20f5
+  data.tar.gz: 4a8c63a501d5283c8fa9c3bfaa11ca902b56d0c4
 SHA512:
-  metadata.gz: bbf5b72b329db9c4e6c2e16dc41bbcd216f685255daed1154f8fca33c04df4cc6d3c887cba77f79702922d311355915199e0c16ed85ffa72eb3aff5d6d6b59f0
-  data.tar.gz: fe6f2c7534cd5109a60f69e016f2161f46de8eae1a66514978e17fc08c1755bf1bde687099b16f2fac7478063e956763cb991298791d643d93a42b5d865425f7
+  metadata.gz: 279d94e3a2869c510244bec6cf3cd3664615f6e2397fcc8265c563cc81c45a016a650ebce12fc9b6e0609dffe00dbe9832b36644a4a7bc997b9bf2bbec0bf1c2
+  data.tar.gz: 9f8563f868fdcfeddc75ea8c4a85ce4cadf37810fb1fac1bf43f72a07d1deed89d9c3740745b9eb2c97141a28ff26c5ac221d6782f0dc361e5481604970dc599

data/lib/omni_api/config.rb

@@ -11,21 +11,24 @@ module OmniApi
   mattr_accessor :client_secret
   self.client_secret = ''
 
+  mattr_accessor :user_access_token
+  self.user_access_token = ''
+
+  mattr_accessor :user_refresh_token
+  self.user_refresh_token = ''
+
+  mattr_accessor :base_url
+  self.base_url = ''
+
   # rubocop:disable Style/ClassVars
   def self.client_access_token=(token)
     @@client_access_token = "bearer #{token}"
   end
 
-  mattr_accessor :user_access_token
-  self.user_access_token = ''
-
   # rubocop:disable Style/ClassVars
   def self.user_access_token=(token)
     @@user_access_token = "bearer #{token}"
-  end
-
-  mattr_accessor :base_url
-  self.base_url = ''
+    end
 
   def self.config
     self

data/lib/omni_api/resources/{omni_api_connection.rb → connection.rb}

@@ -2,19 +2,17 @@ require 'active_resource/connection'
 
 module OmniApi
   module Resources
-    class OmniApiConnection < ActiveResource::Connection
+    class Connection < ActiveResource::Connection
       def initialize(site, format = ActiveResource::Formats::JsonFormat)
         super
       end
 
       attr_accessor :error_handler
 
-      private
-
-      def request(method, path, *arguments)
+      def request(*arguments)
         super
-      rescue Error => e
-        error_handler.present? ? error_handler.handle(e) : raise
+      rescue => e
+        error_handler.present? ? error_handler.handle(e, self, arguments) : raise
       end
     end
   end

data/lib/omni_api/resources/oauth2/token.rb

@@ -21,10 +21,12 @@ module OmniApi
           instance
         end
 
-        def self.refresh(refresh_token)
+        def self.refresh_for(refresh_token)
           instance = self.new
           instance.attributes[:grant_type] = OmniApi::Resources::Oauth2::GrantTypes::REFRESH_TOKEN
+          instance.attributes[:client_id] = OmniApi.config.client_id
           instance.attributes[:refresh_token] = refresh_token
+          instance.attributes[:resource_type] = OmniApi::Resources::Oauth2::ResourceTypes::USER
           instance.save
           instance
         end

data/lib/omni_api/resources/user_authorization_error_handler.rb

@@ -0,0 +1,13 @@
+module OmniApi
+  module Resources
+    class UserAuthorizationErrorHandler
+      def handle(error, connection, arguments)
+        raise error unless error.is_a?(ActiveResource::UnauthorizedAccess)
+        Oauth2::Token.refresh_for(OmniApi.config.user_refresh_token)
+        new_connection = connection.clone
+        new_connection.error_handler = nil
+        new_connection.request(*arguments)
+      end
+    end
+  end
+end

data/lib/omni_api/resources/user_authorized_resource.rb

@@ -12,6 +12,19 @@ module OmniApi
         new_headers['Authorization'] = OmniApi.config.user_access_token
         new_headers
       end
+
+      def self.connection(refresh = false)
+        @connection = create_new_connection if refresh || @connection.nil?
+        super
+      end
+
+      protected
+
+      def self.create_new_connection
+        connection = Connection.new(site, format)
+        connection.error_handler = UserAuthorizationErrorHandler.new
+        connection
+      end
     end
   end
 end

data/lib/omni_api/version.rb

@@ -1,3 +1,3 @@
 module OmniApi
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/OmniApi/resources/connection_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe OmniApi::Resources::Connection do
+  let(:instance) { OmniApi::Resources::Connection.new('http://123.com') }
+
+  subject { instance }
+
+  it { is_expected.to respond_to(:error_handler=) }
+  it { is_expected.to respond_to(:request) }
+
+  describe '#request' do
+    let(:path) { 'http://123.com/test' }
+
+    subject { instance.request(:get, 'http://123.com/test', {}) }
+
+    context 'the underlying connection fails to resolve the request' do
+      before { ActiveResource::HttpMock.respond_to { |mock| mock.get path, {}, nil, 400 } }
+
+      context 'an error handler is not set' do
+        before { instance.error_handler = nil }
+
+        it 'does not swallow the resulting exception' do
+          expect { subject }.to raise_error(ActiveResource::BadRequest)
+        end
+      end
+
+      context 'an error handler is set' do
+        let(:error_handler) { double('error_handler') }
+
+        before { instance.error_handler = error_handler }
+
+        it 'calls the handle method of the error handler' do
+          expect(error_handler).to receive(:handle).with(ActiveResource::BadRequest, instance, [:get, 'http://123.com/test', {}])
+
+          subject
+        end
+
+        context 'the error handler handles the error successfully' do
+          let(:response) { ActiveResource::Response.new(body: 'testR') }
+          before { allow(error_handler).to receive(:handle).and_return(response) }
+
+          it { is_expected.to be response }
+        end
+      end
+
+      context 'a user_authorization_error_handler is used' do
+        let(:error_handler) { OmniApi::Resources::UserAuthorizationErrorHandler.new }
+
+        before { instance.error_handler = error_handler }
+
+        context 'refreshing the access token works but the request always fails with 401' do
+          before do
+            token_request_headers = {'Content-Type' => 'application/json', 'Authorization' => 'bearer random'}
+            ActiveResource::HttpMock.respond_to do |mock|
+              mock.get path, {}, nil, 401
+              mock.post '/api/v1/oauth2/token.json', token_request_headers, nil, 200
+            end
+          end
+
+          it 'raises the first exception encountered after refreshing the token without causing a stack overflow' do
+            expect { subject }.to raise_error(ActiveResource::UnauthorizedAccess)
+          end
+        end
+      end
+    end
+
+    context 'the underlying connection resolves the request' do
+      before { ActiveResource::HttpMock.respond_to { |mock | mock.get path, {}, 'testR', 200 } }
+
+      it { is_expected.to be_a(ActiveResource::Response) }
+      its(:body) { is_expected.to eq 'testR' }
+    end
+  end
+end

data/spec/OmniApi/resources/oauth2/token_spec.rb

@@ -6,4 +6,63 @@ describe OmniApi::Resources::Oauth2::Token do
 
     it { is_expected.to eq('token') }
   end
+
+  def setup_successful_token_request
+    body = {}
+    headers = {'Content-Type' => 'application/json', 'Authorization' => 'bearer random'}
+    ActiveResource::HttpMock.respond_to { |mock| mock.post '/api/v1/oauth2/token.json', headers, body.to_json, 200 }
+  end
+
+  describe '.create_for' do
+    let(:email) { 'someUser@email.com' }
+
+    subject { OmniApi::Resources::Oauth2::Token.create_for(email) }
+
+    it 'tries to create a new access token for the user with the given email for the the current client using client credentials' do
+      setup_successful_token_request
+
+      subject
+
+      expected_body = {
+        'grant_type' => 'client_credentials',
+        'client_id' => '',
+        'client_secret' => '',
+        'resource_type' => 'user',
+        'resource_id' => 'someUser@email.com'
+      }
+      expect(ActiveResource::HttpMock.requests.first.body).to eq expected_body.to_json
+    end
+
+    context 'creating the token is successful' do
+      before { setup_successful_token_request }
+
+      it { is_expected.to be_a(OmniApi::Resources::Oauth2::Token) }
+    end
+  end
+
+  describe '.refresh_for' do
+    let(:refresh_token) { 'someRefreshToken' }
+
+    subject { OmniApi::Resources::Oauth2::Token.refresh_for(refresh_token) }
+
+    it 'tries to refresh the current user access token using the current user refresh token' do
+      setup_successful_token_request
+
+      subject
+
+      expected_body = {
+        'grant_type' => 'refresh_token',
+        'client_id' => '',
+        'refresh_token' => 'someRefreshToken',
+        'resource_type' => 'user'
+      }
+      expect(ActiveResource::HttpMock.requests.first.body).to eq expected_body.to_json
+    end
+
+    context 'refreshing the token is successful' do
+      before { setup_successful_token_request }
+
+      it { is_expected.to be_a(OmniApi::Resources::Oauth2::Token) }
+    end
+  end
 end

data/spec/OmniApi/resources/user/user_resource_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 require 'uri'
 
 describe OmniApi::Resources::User::UserResource do
+  describe '.connection' do
+    subject { OmniApi::Resources::User::UserResource.connection }
+
+    it { is_expected.to be_a(OmniApi::Resources::Connection) }
+  end
+
   describe '.site' do
     subject { OmniApi::Resources::User::UserResource.site }
 

data/spec/OmniApi/resources/user_authorization_error_handler_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'active_resource/http_mock'
+
+describe OmniApi::Resources::UserAuthorizationErrorHandler do
+  let(:instance) { OmniApi::Resources::UserAuthorizationErrorHandler.new }
+
+  describe '#handle' do
+    let(:error) { Exception.new('some message') }
+    let(:connection) { OmniApi::Resources::Connection.new('http://123.com') }
+    let(:arguments) { [:get, 'http://123.com', {}] }
+
+    subject { instance.handle(error, connection, arguments) }
+
+    context 'the given error is not an ActiveResource::UnauthorizedAccess error' do
+      it 'rethrows the given error' do
+        expect { subject }.to raise_error(error)
+      end
+    end
+
+    context 'the given error is an ActiveResource::UnauthorizedAccess error' do
+      let(:error) { ActiveResource::UnauthorizedAccess.new('nah') }
+
+      it 'tries to refresh the current user access token' do
+        OmniApi.config.user_refresh_token = 'refreshToken'
+        expect(OmniApi::Resources::Oauth2::Token).to receive(:refresh_for).with('refreshToken')
+
+        subject rescue nil
+      end
+
+      describe 'refreshing the token works' do
+        let(:updated_token) { OmniApi::Resources::Oauth2::Token.new({access_token: 'test'}) }
+
+        before do
+          allow(updated_token).to receive(:persisted?).and_return(true)
+          allow(OmniApi::Resources::Oauth2::Token).to receive(:refresh_for).and_return(updated_token)
+        end
+
+        it 'tries to perform the original request again' do
+          expect(connection).to receive(:request).with(*arguments)
+
+          subject
+        end
+
+        context 'retrying the request is successful' do
+          let(:response) { ActiveResource::Response.new(body: 'test1') }
+
+          before { allow(connection).to receive(:request).and_return(response) }
+
+          it { is_expected.to be response}
+        end
+
+        context 'retrying the request fails' do
+          before { allow(connection).to receive(:request).and_raise(ActiveResource::BadRequest.new('test')) }
+
+          it 'rethrows the error' do
+            expect { subject }.to raise_error(ActiveResource::BadRequest)
+          end
+
+          context 'the request fails again with ActiveResource::UnauthorizedAccess' do
+            before { allow(connection).to receive(:request).and_raise(ActiveResource::BadRequest.new('test')) }
+
+
+          end
+        end
+      end
+    end
+  end
+end

data/spec/OmniApi/resources/user_authorized_resource_spec.rb

@@ -16,4 +16,12 @@ describe OmniApi::Resources::UserAuthorizedResource do
       its(['Authorization']) { is_expected.to eq('bearer ') }
     end
   end
+
+  describe '.connection' do
+    subject { OmniApi::Resources::UserAuthorizedResource.connection }
+
+    it { is_expected.to be_a(OmniApi::Resources::Connection) }
+
+    its(:error_handler) { is_expected.to be_a(OmniApi::Resources::UserAuthorizationErrorHandler) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omni_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Cristi Badila
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -129,10 +129,10 @@ files:
 - lib/omni_api/resources/base_client_model.rb
 - lib/omni_api/resources/base_model.rb
 - lib/omni_api/resources/client.rb
+- lib/omni_api/resources/connection.rb
 - lib/omni_api/resources/oauth2/grant_types.rb
 - lib/omni_api/resources/oauth2/resource_types.rb
 - lib/omni_api/resources/oauth2/token.rb
-- lib/omni_api/resources/omni_api_connection.rb
 - lib/omni_api/resources/payment_plan.rb
 - lib/omni_api/resources/phone_call.rb
 - lib/omni_api/resources/sms_message.rb
@@ -140,13 +140,16 @@ files:
 - lib/omni_api/resources/user/client_association.rb
 - lib/omni_api/resources/user/device.rb
 - lib/omni_api/resources/user/user_resource.rb
+- lib/omni_api/resources/user_authorization_error_handler.rb
 - lib/omni_api/resources/user_authorized_resource.rb
 - lib/omni_api/version.rb
 - spec/OmniApi/factories/user_factory_spec.rb
 - spec/OmniApi/resources/client_spec.rb
+- spec/OmniApi/resources/connection_spec.rb
 - spec/OmniApi/resources/oauth2/token_spec.rb
 - spec/OmniApi/resources/sms_message_spec.rb
 - spec/OmniApi/resources/user/user_resource_spec.rb
+- spec/OmniApi/resources/user_authorization_error_handler_spec.rb
 - spec/OmniApi/resources/user_authorized_resource_spec.rb
 - spec/OmniApi/resources/user_spec.rb
 - spec/OmniApi_spec.rb
@@ -178,9 +181,11 @@ summary: A gem used to make using OmniApi easier
 test_files:
 - spec/OmniApi/factories/user_factory_spec.rb
 - spec/OmniApi/resources/client_spec.rb
+- spec/OmniApi/resources/connection_spec.rb
 - spec/OmniApi/resources/oauth2/token_spec.rb
 - spec/OmniApi/resources/sms_message_spec.rb
 - spec/OmniApi/resources/user/user_resource_spec.rb
+- spec/OmniApi/resources/user_authorization_error_handler_spec.rb
 - spec/OmniApi/resources/user_authorized_resource_spec.rb
 - spec/OmniApi/resources/user_spec.rb
 - spec/OmniApi_spec.rb