bankscrap-bbva 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ef32ec6a56dd9b9352ca60ff3a86b14e9b70f21
-  data.tar.gz: ad37699ac93f8a959cd8562a0e6dd590a466bbdb
+  metadata.gz: 34df67e80fb703b3062b1ddb00ec2be8ad25b285
+  data.tar.gz: bd806c0c5b61626262b542f0f2dd0e91f5c2562d
 SHA512:
-  metadata.gz: 023c42192b35b82f99a8fe7f4e704e42a2419fbf0963a8317131ffe7299e75eb820d68ae09a341134480f08c5358bd54f49001f5e58639b7ffb5771d59c8c62e
-  data.tar.gz: ff6b7afb3e00a79649cd3b4313f094de12ad50032d7d80b7172a4dead6337d96f63e31d42bf5e9dc3c08c1bbd59c96bb1b2730e4dca58ee729775183a51ee1a4
+  metadata.gz: ccb5d6536cb19ca254d51708175c2a88f87dadcccb8a80f5dc156c309f48a3038b8d2812958f5b5d3e3f30a187bc015ce0863a37059fd864a1ddcf4496b40c00
+  data.tar.gz: 35c34f71df5a9cee1dfa2f261ba657e9b72c78de72a848b8a1972cb2c630a4a5274eeb1bc63c393337e115b3486e1b15742c53675d0348e58bf107818f2d4ed0

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  TargetRubyVersion: 2.1
+
+Metrics/LineLength:
+  Max: 120

data/README.md

@@ -1,6 +1,6 @@
 # Bankscrap::BBVA
 
-Bankscrap adapter for the API behind BBVA's [mobile app](https://play.google.com/store/apps/developer?id=BBVA&hl=en).
+Bankscrap adapter for the API behind BBVA's [mobile app](https://play.google.com/store/apps/details?id=com.bbva.bbvacontigo&hl=en).
 This adapter is only valid for personal accounts (the ones that work with that mobile APP), not for company accounts.
 
 ## Installation
@@ -26,7 +26,7 @@ For usage instructions please read [Bankscrap readme](https://github.com/bankscr
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/bankscrap-bbva/fork )
+1. Fork it ( https://github.com/bankscrap/bankscrap-bbva/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/bankscrap-bbva.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bankscrap/bbva/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "bankscrap-bbva"
+  spec.name          = 'bankscrap-bbva'
   spec.version       = Bankscrap::BBVA::VERSION
   spec.authors       = ['Javier Cuevas']
-  spec.email         = ["javier@diacode.com"]
-  spec.summary       = %q{BBVA adapter for Bankscrap}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.email         = ['javier@diacode.com']
+  spec.summary       = 'BBVA adapter for Bankscrap'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "bankscrap", "~> 1.0"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency 'bankscrap', '~> 2.0.3'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/bankscrap-bbva.rb

@@ -1,2 +1,3 @@
 require_relative 'bankscrap/bbva/bank'
 require_relative 'bankscrap/bbva/version'
+require_relative 'monkey_patch/mechanize'

data/lib/bankscrap/bbva/bank.rb

@@ -3,35 +3,35 @@ require 'bankscrap'
 module Bankscrap
   module BBVA
     class Bank < ::Bankscrap::Bank
-      BASE_ENDPOINT     = 'https://servicios.bbva.es'
-      LOGIN_ENDPOINT    = '/DFAUTH/slod/DFServletXML'
-      PRODUCTS_ENDPOINT = '/ENPP/enpp_mult_web_mobility_02/products/v1'
-      ACCOUNT_ENDPOINT  = '/ENPP/enpp_mult_web_mobility_02/accounts/'
-      # BBVA expects an identifier before the actual User Agent, but 12345 works fine
-      USER_AGENT        = '12345;Android;LGE;Nexus 5;1080x1776;Android;5.1.1;BMES;4.4;xxhd'
-
-      def initialize(user, password, log: false, debug: false, extra_args: nil)
-        @user = format_user(user.dup)
-        @password = password
-        @log = log
-        @debug = debug
-
-        initialize_connection
-
-        add_headers(
-          'User-Agent'       => USER_AGENT,
-          'BBVA-User-Agent'  => USER_AGENT,
-          'Accept-Language'  => 'spa',
-          'Content-Language' => 'spa',
-          'Accept'           => 'application/json',
-          'Accept-Charset'   => 'UTF-8',
-          'Connection'       => 'Keep-Alive',
-          'Host'             => 'bancamovil.grupobbva.com',
-          'Cookie2'          => '$Version=1'
-        )
+      BASE_ENDPOINT     = 'https://servicios.bbva.es'.freeze
+      LOGIN_ENDPOINT    = '/DFAUTH/slod/DFServletXML'.freeze
+      SESSIONS_ENDPOINT = '/ENPP/enpp_mult_web_mobility_02/sessions/v1'.freeze
+      PRODUCTS_ENDPOINT = '/ENPP/enpp_mult_web_mobility_02/products/v2'.freeze
+      ACCOUNT_ENDPOINT  = '/ENPP/enpp_mult_web_mobility_02/accounts/'.freeze
 
-        login
-        super
+      # BBVA expects an identifier before the actual User Agent, but 12345 works fine
+      USER_AGENT = SecureRandom.hex(64).upcase + ';iPhone;Apple;iPhone5,2;640x1136;iOS;9.3.2;WOODY;5.1.2;xhdpi'.freeze
+      REQUIRED_CREDENTIALS = [:user, :password].freeze
+
+      # This is probably some sort of identifier of Android vs iOS consumer app
+      CONSUMER_ID = '00000013'.freeze
+
+      def initialize(credentials = {})
+        super do
+          @user = format_user(@user.dup)
+
+          add_headers(
+            'User-Agent'       => USER_AGENT,
+            'BBVA-User-Agent'  => USER_AGENT,
+            'Accept-Language'  => 'spa',
+            'Content-Language' => 'spa',
+            'Accept'           => 'application/json',
+            'Accept-Charset'   => 'UTF-8',
+            'Connection'       => 'Keep-Alive',
+            'Host'             => 'servicios.bbva.es',
+            'ConsumerID'       => CONSUMER_ID
+          )
+        end
       end
 
       # Fetch all the accounts for the given user
@@ -65,11 +65,11 @@ module Bankscrap
           'BBVA-Method' => 'GET'
         }
 
-        # The API accepts a toDate param that we could pass the end_date argument,
+        # The API accepts a toDate param that we could pass the end_date argument,
         # however when we pass the toDate param, the API stops returning the account balance.
-        # Therefore we need to take a workaround: only filter with fromDate and loop
-        # over all the available pages, filtering out the movements that doesn't match
-        # the end_date argument.
+        # Therefore we need to take a workaround: only filter with fromDate and loop
+        # over all the available pages, filtering out the movements that doesn't match
+        # the end_date argument.
         url = BASE_ENDPOINT +
               ACCOUNT_ENDPOINT +
               account.id +
@@ -113,7 +113,7 @@ module Bankscrap
       def format_user(user)
         user.upcase!
 
-        if user.match(/^[0-9]{8}[A-Z]$/)
+        if user =~ /^[0-9]{8}[A-Z]$/
           # It's a DNI
           "0019-0#{user}"
         else
@@ -130,6 +130,19 @@ module Bankscrap
           'eai_password'   => @password
         }
         post(BASE_ENDPOINT + LOGIN_ENDPOINT, fields: params)
+
+        # We also need to initialize a session
+        with_headers('Content-Type' => 'application/json') do
+          post(SESSIONS_ENDPOINT, fields: {
+            consumerID: CONSUMER_ID
+          }.to_json)
+        end
+
+        # We need to extract the "tsec" header from the last response.
+        # As the Bankscrap core library doesn't expose the headers of each response
+        # we have to use Mechanize's HTTP client "current_page" method.
+        tsec = @http.current_page.response['tsec']
+        add_headers('tsec' => tsec)
       end
 
       # Build an Account object from API data
@@ -138,9 +151,8 @@ module Bankscrap
           bank: self,
           id: data['id'],
           name: data['name'],
-          available_balance: data['availableBalance'],
-          balance: data['availableBalance'],
-          currency: data['currency'],
+          available_balance: Money.new(data['availableBalance'].to_f * 100, data['currency']),
+          balance: Money.new(data['actualBalance'].to_f * 100, data['currency']),
           iban: data['iban'],
           description: "#{data['typeDescription']} #{data['familyCode']}"
         )
@@ -154,7 +166,6 @@ module Bankscrap
           amount: transaction_amount(data),
           description: data['conceptDescription'] || data['description'],
           effective_date: Date.strptime(data['operationDate'], '%Y-%m-%d'),
-          currency: data['currency'],
           balance: transaction_balance(data)
         )
       end

data/lib/bankscrap/bbva/version.rb

@@ -1,5 +1,5 @@
 module Bankscrap
   module BBVA
-    VERSION = "1.0.0"
+    VERSION = '2.0.1'.freeze
   end
 end

data/lib/monkey_patch/mechanize.rb

@@ -0,0 +1,55 @@
+# Extracted from http://scottwb.com/blog/2013/11/09/defeating-the-infamous-mechanize-too-many-connection-resets-bug/
+
+class Mechanize::HTTP::Agent
+  MAX_RESET_RETRIES = 10
+
+  # We need to replace the core Mechanize HTTP method:
+  #
+  #   Mechanize::HTTP::Agent#fetch
+  #
+  # with a wrapper that handles the infamous "too many connection resets"
+  # Mechanize bug that is described here:
+  #
+  #   https://github.com/sparklemotion/mechanize/issues/123
+  #
+  # The wrapper shuts down the persistent HTTP connection when it fails with
+  # this error, and simply tries again. In practice, this only ever needs to
+  # be retried once, but I am going to let it retry a few times
+  # (MAX_RESET_RETRIES), just in case.
+  #
+  def fetch_with_retry(
+    uri,
+    method    = :get,
+    headers   = {},
+    params    = [],
+    referer   = current_page,
+    redirects = 0
+  )
+    action      = "#{method.to_s.upcase} #{uri.to_s}"
+    retry_count = 0
+
+    begin
+      fetch_without_retry(uri, method, headers, params, referer, redirects)
+    rescue Net::HTTP::Persistent::Error => e
+      # Pass on any other type of error.
+      raise unless e.message =~ /too many connection resets/
+
+      # Pass on the error if we've tried too many times.
+      if retry_count >= MAX_RESET_RETRIES
+        puts "**** WARN: Mechanize retried connection reset #{MAX_RESET_RETRIES} times and never succeeded: #{action}" if Bankscrap.debug
+        raise
+      end
+
+      # Otherwise, shutdown the persistent HTTP connection and try again.
+      puts "**** WARN: Mechanize retrying connection reset error: #{action}" if Bankscrap.debug
+      retry_count += 1
+      self.http.shutdown
+      retry
+    end
+  end
+
+  # Alias so #fetch actually uses our new #fetch_with_retry to wrap the
+  # old one aliased as #fetch_without_retry.
+  alias_method :fetch_without_retry, :fetch
+  alias_method :fetch, :fetch_with_retry
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bankscrap-bbva
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Javier Cuevas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bankscrap
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,6 +69,7 @@ files:
 - lib/bankscrap-bbva.rb
 - lib/bankscrap/bbva/bank.rb
 - lib/bankscrap/bbva/version.rb
+- lib/monkey_patch/mechanize.rb
 homepage: ''
 licenses:
 - MIT
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: BBVA adapter for Bankscrap