money_mover 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010437904cafb2ca6c8793b9cf1a6f6f4544e785
-  data.tar.gz: 8a82210f6a88a6753fcd907e6c2e453a08bac09c
+  metadata.gz: 47b15ecb8c339c01b1412d983414bf5708b07306
+  data.tar.gz: 79c5230ea6f66e8ffdc015fddb5100c69b4caba6
 SHA512:
-  metadata.gz: e294712b6bb300f17c4fcdf83c1bba845ca0502269b25ed8e035cd73b12222105eddfe3b905606316fbc0cf3265af55f1acf7d679f82a611c5e409398a9128cb
-  data.tar.gz: 57c09bfbb5845d1eaa039edc0bbffec11d108ecdb6ba94f4d1bc2ff9d16e4a07cc81b67e2cd54325c44ed5b80cccdb7291f5964d21de06c3a57d351d834c740d
+  metadata.gz: 7734a020fe839b91c31bf17f56a4a8a08354537301ba486f3e99be87f6ba29821ba1b9eb9d9d2ef308bce293b8db20dd4aa37acef4b7d3aa0bffb8997ceb3d62
+  data.tar.gz: 26269ba9e5f83bc40e65b0ddf8f3330554f0b1e0a643f62d87a1b777cb94e92a3cac2ea3ff10b02bff7d9a91751610a0ed469b69bf51ce9570f75f69e3c0baac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    money_mover (0.0.9)
+    money_mover (0.0.12)
       activemodel (>= 4.0, < 5.1)
       activesupport (>= 4.0, < 5.1)
       faraday (~> 0.9)
@@ -21,14 +21,14 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    builder (3.2.2)
+    builder (3.2.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    faraday (0.9.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
     hashdiff (0.3.0)
     i18n (0.7.0)
     json (1.8.3)
@@ -74,4 +74,4 @@ DEPENDENCIES
   webmock (~> 2.1)
 
 BUNDLED WITH
-   1.11.2
+   1.14.4

data/lib/money_mover/dwolla/application_token.rb

@@ -2,13 +2,7 @@ module MoneyMover
   module Dwolla
     class ApplicationToken < Token
       def access_token
-        new_token = request_new_token!
-        new_token.access_token
-      end
-
-      ## NOTE: application does not have refresh token, hit API again to get new access token
-      def refresh_token
-        access_token
+        @ach_config.account_token_provider.access_token
       end
 
       private

data/lib/money_mover/dwolla/environment_urls.rb

@@ -8,9 +8,9 @@ module MoneyMover
           :api_url   => "https://api.dwolla.com"
         },
         :sandbox => {
-          :auth_url  => "https://uat.dwolla.com/oauth/v2/authenticate",
-          :token_url => "https://uat.dwolla.com/oauth/v2/token",
-          :api_url   => "https://api-uat.dwolla.com"
+          :auth_url  => "https://sandbox.dwolla.com/oauth/v2/authenticate",
+          :token_url => "https://sandbox.dwolla.com/oauth/v2/token",
+          :api_url   => "https://api-sandbox.dwolla.com"
         }
       }
 

data/lib/money_mover/dwolla/models/account_funding_source.rb

@@ -8,7 +8,7 @@ module MoneyMover
       end
 
       def self.all(account_id)
-        client = AccountClient.new
+        client = ApplicationClient.new
 
         response = client.get fetch_endpoint(account_id)
         response.body[:_embedded][:"funding-sources"].map {|source| new(source) }

data/lib/money_mover/dwolla/models/api_resource.rb

@@ -7,7 +7,7 @@ module MoneyMover
 
       attr_reader :resource_location, :attrs
 
-      def initialize(attrs = {}, client = AccountClient.new)
+      def initialize(attrs = {}, client = ApplicationClient.new)
         @attrs = attrs
         @id = attrs[:id]
         @resource_location = attrs[:resource_location]
@@ -18,7 +18,7 @@ module MoneyMover
       end
 
       def self.fetch
-        client = AccountClient.new
+        client = ApplicationClient.new
 
         response = client.get fetch_endpoint
 

data/lib/money_mover/dwolla/models/customer.rb

@@ -26,7 +26,7 @@ module MoneyMover
         :created
 
       def self.find(id)
-        client = AccountClient.new
+        client = ApplicationClient.new
 
         response = client.get fetch_endpoint(id)
 

data/lib/money_mover/dwolla.rb

@@ -5,8 +5,6 @@ require 'money_mover/dwolla/api_server_response'
 # token stuff
 require 'money_mover/dwolla/client'
 require 'money_mover/dwolla/token'
-require 'money_mover/dwolla/account_client'
-require 'money_mover/dwolla/account_token'
 require 'money_mover/dwolla/application_client'
 require 'money_mover/dwolla/application_token'
 

data/lib/money_mover/version.rb

@@ -1,3 +1,3 @@
 module MoneyMover
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

data/spec/integration/money_mover/dwolla/customers/find_spec.rb

@@ -50,6 +50,20 @@ describe MoneyMover::Dwolla::Customer do
         expect(subject.email).to eq(email)
         expect(subject.ipAddress).to eq(ipAddress)
       end
+
+      context 'real response' do
+        let(:customer_token) { '7bc7e791-47f7-457d-b15d-ab4d92d46343' }
+        let(:customer_response_filename) { File.expand_path '../../../../../support/dwolla_responses/customer_response.json', __FILE__ }
+        let(:customer_response_object) { JSON.parse File.read(customer_response_filename), symbolize_names: true }
+
+        it 'returns customer' do
+          expect(subject.id).to eq(customer_token)
+          #expect(subject.resource_location).to eq(dwolla_helper.customer_endpoint(customer_token))
+          expect(subject.firstName).to eq('retry')
+          expect(subject.lastName).to eq('Retrya2 Last Name')
+          expect(subject.email).to eq(email)
+        end
+      end
     end
 
     context 'failure' do

data/spec/support/dwolla_helper.rb

@@ -5,14 +5,6 @@ class TestConfigProvider
     "X7JyEzy6F85MeDZERFE2cgiLbm9TXIbQNmr16cCfI6y1CtPrak"
   end
 
-  def refresh_token
-    "Qlj3SFaIGPJmeFrPEJsPI6smKwdXLsPYAYi83lXkqeb8q0MX1P"
-  end
-
-  def application_token
-    "SF8Vxx6H644lekdVKAAHFnqRCFy8WGqltzitpii6w2MVaZp1Nw"
-  end
-
   def environment
     :sandbox
   end
@@ -42,10 +34,6 @@ class TestDwollaTokenProvider
   def access_token
     "X7JyEzy6F85MeDZERFE2cgiLbm9TXIbQNmr16cCfI6y1CtPrak"
   end
-
-  def refresh_token
-    "Qlj3SFaIGPJmeFrPEJsPI6smKwdXLsPYAYi83lXkqeb8q0MX1P"
-  end
 end
 
 class DwollaHelper
@@ -59,14 +47,6 @@ class DwollaHelper
     @config_provider.access_token
   end
 
-  def refresh_token
-    @config_provider.refresh_token
-  end
-
-  def application_token
-    @config_provider.application_token
-  end
-
   def api_key
     @config_provider.api_key
   end
@@ -84,7 +64,7 @@ class DwollaHelper
   end
 
   def api_url
-    "https://api-uat.dwolla.com"
+    "https://api-sandbox.dwolla.com"
   end
 
   def api_endpoint
@@ -226,7 +206,7 @@ class DwollaHelper
   # taken from ach_helper
 
   def get_token_url
-    "https://uat.dwolla.com/oauth/v2/token"
+    "https://sandbox.dwolla.com/oauth/v2/token"
   end
 
   def error_response(body_json = {})
@@ -237,37 +217,17 @@ class DwollaHelper
     }
   end
 
-  def stub_get_token_request(token_response = nil)
-    token_response ||= {
-      "access_token": application_token,
-      "token_type": "bearer",
-      "expires_in": 3600,
-      "scope": "AccountInfoFull|ManageAccount|Contacts|Transactions|Balance|Send|Request|Funding"
-    }
-
-    req_body = {
-      grant_type: "client_credentials",
-      client_id: api_key,
-      client_secret: api_secret_key
-    }
-
-    stub_request(:post, get_token_url).
-    with(:body => req_body).
-      to_return(status: 200, body: token_response.to_json, headers: {"Content-Type" => "application/json"})
-  end
-
   def stub_refresh_token_request(token_response)
     req_body = {
-      grant_type: "refresh_token",
+      grant_type: "client_credentials",
       client_id: api_key,
       client_secret: api_secret_key,
-      refresh_token: refresh_token
     }
 
     req_headers = {
       'Accept'=>'application/vnd.dwolla.v1.hal+json',
       'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent'=>'Faraday v0.9.2'
+      'User-Agent'=>"Faraday v#{Faraday::VERSION}"
     }
 
     stub_request(:post, get_token_url).with(body: req_body, headers: req_headers).
@@ -284,31 +244,22 @@ class DwollaHelper
 
   def stub_get_webhook_subscriptions_request(stub_response)
     stub_request(:get, webhook_subscriptions_url).
-      with(headers: dwolla_application_request_headers).
+      with(headers: request_headers).
       to_return(body: stub_response.to_json, headers: {"Content-Type" => "application/json"})
   end
 
   def stub_create_webhook_subscription_request(stub_params, stub_response)
     stub_request(:post, webhook_subscriptions_url).
-      with(headers: dwolla_application_request_headers, body: stub_params).
+      with(headers: request_headers, body: stub_params).
     to_return(stub_response)
   end
 
   def stub_delete_webhook_subscription_request(subscription_id, stub_response)
     stub_request(:delete, webhook_subscription_url(subscription_id)).
-      with(headers: dwolla_application_request_headers).
+      with(headers: request_headers).
     to_return(stub_response)
   end
 
-  def dwolla_application_request_headers
-    {
-      'Accept'=>'application/vnd.dwolla.v1.hal+json',
-      'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'Authorization'=>"Bearer #{application_token}",
-      'User-Agent'=>'Faraday v0.9.2'
-    }
-  end
-
   def create_webhook_success_response(webhook_token)
     resource_created_response webhook_subscription_url(webhook_token)
   end

data/spec/support/dwolla_responses/customer_response.json

@@ -0,0 +1,37 @@
+{
+  "_links": {
+    "self": {
+      "href": "https://api-uat.dwolla.com/customers/7bc7e791-47f7-457d-b15d-ab4d92d46343",
+      "type": "customer"
+    },
+    "edit": {
+      "href": "https://api-uat.dwolla.com/customers/7bc7e791-47f7-457d-b15d-ab4d92d46343",
+      "type": "customer"
+    },
+    "funding-sources": {
+      "href": "https://api-uat.dwolla.com/customers/7bc7e791-47f7-457d-b15d-ab4d92d46343/funding-sources",
+      "type": "funding-source"
+    },
+    "retry-verification": {
+      "href": "https://api-uat.dwolla.com/customers/7bc7e791-47f7-457d-b15d-ab4d92d46343",
+      "type": "customer"
+    },
+    "transfers": {
+      "href": "https://api-uat.dwolla.com/customers/7bc7e791-47f7-457d-b15d-ab4d92d46343/transfers",
+      "type": "transfer"
+    }
+  },
+  "id": "7bc7e791-47f7-457d-b15d-ab4d92d46343",
+  "firstName": "retry",
+  "lastName": "Retrya2 Last Name",
+  "email": "email@example.com",
+  "type": "business",
+  "status": "retry",
+  "created": "2016-09-06T16:05:23.393Z",
+  "address1": "123 Anywhere St.",
+  "city": "St. Louis",
+  "state": "MO",
+  "postalCode": "63103",
+  "businessName": "office Retry 2",
+  "doingBusinessAs": "office Retry 2"
+}

data/spec/unit/money_mover/dwolla/client_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MoneyMover::Dwolla::AccountClient do
+describe MoneyMover::Dwolla::ApplicationClient do
   let(:expected_response) { double 'expected response' }
   let(:server_request) { double 'server request' }
 
@@ -17,7 +17,7 @@ describe MoneyMover::Dwolla::AccountClient do
 
   before do
     allow(MoneyMover::Dwolla::ApiConnection).to receive(:new).with(token) { api_connection }
-    allow(MoneyMover::Dwolla::AccountToken).to receive(:new) { dwolla_token_provider }
+    allow(MoneyMover::Dwolla::ApplicationToken).to receive(:new) { dwolla_token_provider }
   end
 
   let(:url) { double 'url' }
@@ -60,7 +60,7 @@ describe MoneyMover::Dwolla::AccountClient do
   end
 end
 
-describe MoneyMover::Dwolla::AccountClient do
+describe MoneyMover::Dwolla::ApplicationClient do
   describe '#post' do
     let(:url) { '/customers' }
 

data/spec/unit/money_mover/dwolla/funding_source_spec.rb

@@ -26,7 +26,7 @@ describe MoneyMover::Dwolla::CustomerFundingSource do
   let(:resource_id) { double 'resource id' }
 
   before do
-    allow(MoneyMover::Dwolla::AccountClient).to receive(:new) { dwolla_client }
+    allow(MoneyMover::Dwolla::ApplicationClient).to receive(:new) { dwolla_client }
   end
 
   it { should validate_presence_of(:name) }

data/spec/unit/money_mover/dwolla/microdeposits_initiation_spec.rb

@@ -12,7 +12,7 @@ describe MoneyMover::Dwolla::MicroDepositInitiation do
   subject { described_class.new(funding_source_id: funding_source_id) }
 
   before do
-    allow(MoneyMover::Dwolla::AccountClient).to receive(:new) { ach_client }
+    allow(MoneyMover::Dwolla::ApplicationClient).to receive(:new) { ach_client }
   end
 
   context 'success' do

data/spec/unit/money_mover/dwolla/root_account_spec.rb

@@ -69,7 +69,7 @@ describe MoneyMover::Dwolla::RootAccount do
   end
 
   before do
-    allow(MoneyMover::Dwolla::AccountClient).to receive(:new) { client }
+    allow(MoneyMover::Dwolla::ApplicationClient).to receive(:new) { client }
     allow(client).to receive(:get).with('/') { account_response }
     allow(client).to receive(:get).with("/accounts/#{account_token}/funding-sources") { funding_response }
   end

data/spec/unit/money_mover/dwolla/token_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
-describe MoneyMover::Dwolla::AccountToken do
+describe MoneyMover::Dwolla::ApplicationToken do
   let(:ach_config) { double 'ach config', api_key: ach_config_api_key, api_secret_key: ach_config_api_secret_key, environment: ach_config_environment, account_token_provider: account_token_provider }
   let(:ach_config_api_key) { double 'ach config api key' }
   let(:ach_config_api_secret_key) { double 'ach config api secret' }
   let(:ach_config_environment) { double 'ach config environment' }
-  let(:account_token_provider) { double 'account token provider', access_token: account_access_token, refresh_token: account_refresh_token }
+  let(:account_token_provider) { double 'account token provider', access_token: account_access_token }
   let(:account_access_token) { double 'account access token' }
-  let(:account_refresh_token) { double 'account refresh token' }
 
   let(:attrs) {{}}
 
@@ -18,52 +17,18 @@ describe MoneyMover::Dwolla::AccountToken do
       expect(subject.access_token).to eq(account_access_token)
     end
   end
-
-  describe '#refresh_token' do
-    it 'returns account token from account token provider' do
-      expect(subject.refresh_token).to eq(account_refresh_token)
-    end
-  end
 end
 
 # INTEGRATION TEST
-describe MoneyMover::Dwolla::AccountToken do
-  let(:invalid_refresh_token_response) {{
-    "error": "access_denied",
-    "error_description": "Invalid refresh token."
-  }}
-
-  let(:expired_refresh_token_error) {{
-    "error": "access_denied",
-    "error_description": "Expired refresh token."
-  }}
-
+describe MoneyMover::Dwolla::ApplicationToken do
   let(:refresh_token_request_params) {{
     "client_id": "JCGQXLrlfuOqdUYdTcLz3rBiCZQDRvdWIUPkw++GMuGhkem9Bo",
     "client_secret": "g7QLwvO37aN2HoKx1amekWi8a2g7AIuPbD5C/JSLqXIcDOxfTr",
-    "refresh_token": "Pgk+l9okjwTCfsvIvEDPrsomE1er1txeyoaAkTIBAuXza8WvZY",
-    "grant_type": "refresh_token"
+    "grant_type": "client_credentials"
   }}
 
-  #let(:refresh_token_success_response) {{
-    #"_links": {
-      #"account": {
-        #"href": "https://api-uat.dwolla.com/accounts/ca32853c-48fa-40be-ae75-77b37504581b"
-      #}
-    #},
-    #"access_token": "F3jK4rg7FGlq4yRQ7vWECoXVD4zQq9Xg26VnxzMbHGusZqr7dF",
-    #"expires_in": 3600,
-    #"refresh_token": "DRlqGJ0IFsRK8xzjkKhjTOgz3meet6E91T2oacGCefHGU4h1hj",
-    #"refresh_expires_in": 5184000,
-    #"token_type": "bearer",
-    #"scope": "send|transactions|funding|managecustomers",
-    #"account_id": "ca32853c-48fa-40be-ae75-77b37504581b"
-  #}}
-
-
   let(:account_id) { "7da912eb-5976-4e5c-b5ab-a5df35ac661b" }
   let(:new_access_token) { "oNGSeXqucdVxTLAwSRNc1WjG5BTHWNS5z7hccJGUTGvCXusmbC" }
-  let(:new_refresh_token) { "Et380Ps1y9tyiW3A8yf0ws1lbfGUVXl5DLIHfDDELXC0ls7hie" }
 
   let(:refresh_token_success_response) {{
     "_links": {
@@ -73,7 +38,6 @@ describe MoneyMover::Dwolla::AccountToken do
     },
     "access_token": new_access_token,
     "expires_in":3600,
-    "refresh_token": new_refresh_token,
     "refresh_expires_in":5184000,
     "token_type":"bearer",
     "scope":"accountinfofull|contacts|transactions|balance|send|request|funding|manageaccount|scheduled|email|managecustomers",
@@ -88,13 +52,12 @@ describe MoneyMover::Dwolla::AccountToken do
     end
 
     context 'success' do
-      it 'updates tokens in db' do
+      it 'updates token' do
         new_token = subject.request_new_token!
 
         expect(new_token.account_id).to eq(account_id)
         expect(new_token.expires_in).to eq(3600)
         expect(new_token.access_token).to eq(new_access_token)
-        expect(new_token.refresh_token).to eq(new_refresh_token)
       end
     end
   end

data/spec/unit/money_mover/dwolla/transfer_spec.rb

@@ -26,7 +26,7 @@ describe MoneyMover::Dwolla::Transfer do
   subject { described_class.new(attrs) }
 
   before do
-    allow(MoneyMover::Dwolla::AccountClient).to receive(:new) { dwolla_client }
+    allow(MoneyMover::Dwolla::ApplicationClient).to receive(:new) { dwolla_client }
   end
 
   it { should validate_presence_of(:sender_funding_source_token) }

data/spec/unit/money_mover/dwolla/webhook_subscription_spec.rb

@@ -115,7 +115,6 @@ describe MoneyMover::Dwolla::WebhookSubscription do
     subject { described_class }
 
     before do
-      dwolla_helper.stub_get_token_request
       dwolla_helper.stub_get_webhook_subscriptions_request(webhooks_response)
     end
 
@@ -145,7 +144,6 @@ describe MoneyMover::Dwolla::WebhookSubscription do
     subject { described_class.new(url: callback_url, secret: webhook_secret_key) }
 
     before do
-      dwolla_helper.stub_get_token_request
       dwolla_helper.stub_create_webhook_subscription_request(create_params, create_response)
     end
 
@@ -175,7 +173,6 @@ describe MoneyMover::Dwolla::WebhookSubscription do
     subject { described_class.new(id: subscription_id) }
 
     before do
-      dwolla_helper.stub_get_token_request
       dwolla_helper.stub_delete_webhook_subscription_request(subscription_id, delete_response)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_mover
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Daniel Errante
@@ -180,8 +180,6 @@ files:
 - Gemfile.lock
 - lib/money_mover.rb
 - lib/money_mover/dwolla.rb
-- lib/money_mover/dwolla/account_client.rb
-- lib/money_mover/dwolla/account_token.rb
 - lib/money_mover/dwolla/api_connection.rb
 - lib/money_mover/dwolla/api_server_response.rb
 - lib/money_mover/dwolla/application_client.rb
@@ -222,6 +220,7 @@ files:
 - spec/integration/money_mover/dwolla/transfers/create_spec.rb
 - spec/spec_helper.rb
 - spec/support/dwolla_helper.rb
+- spec/support/dwolla_responses/customer_response.json
 - spec/support/fixtures/sample.jpg
 - spec/unit/money_mover/dwolla/client_spec.rb
 - spec/unit/money_mover/dwolla/config_spec.rb
@@ -253,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Money Mover
@@ -270,6 +269,7 @@ test_files:
 - spec/integration/money_mover/dwolla/transfers/create_spec.rb
 - spec/spec_helper.rb
 - spec/support/dwolla_helper.rb
+- spec/support/dwolla_responses/customer_response.json
 - spec/support/fixtures/sample.jpg
 - spec/unit/money_mover/dwolla/client_spec.rb
 - spec/unit/money_mover/dwolla/config_spec.rb

data/lib/money_mover/dwolla/account_client.rb

@@ -1,9 +0,0 @@
-module MoneyMover
-  module Dwolla
-    class AccountClient < Client
-      def initialize
-        super AccountToken.new.access_token
-      end
-    end
-  end
-end

data/lib/money_mover/dwolla/account_token.rb

@@ -1,24 +0,0 @@
-module MoneyMover
-  module Dwolla
-    class AccountToken < Token
-      def access_token
-        @ach_config.account_token_provider.access_token
-      end
-
-      def refresh_token
-        @ach_config.account_token_provider.refresh_token
-      end
-
-      private
-
-      def create_params
-        {
-          grant_type: :refresh_token,
-          client_id: @ach_config.api_key,
-          client_secret: @ach_config.api_secret_key,
-          refresh_token: refresh_token
-        }
-      end
-    end
-  end
-end