bankscrap-openbank 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b65647a5159a87170071f62b9e436746cc82e0
-  data.tar.gz: f29fa5cf4c2ab71265e6c73beb806e71ce92ea0d
+  metadata.gz: 7ecc804e009d7b76359f51dddb7fcf92bd1cf48f
+  data.tar.gz: 878ed70101cccb3a52f9a76068ac96a368269147
 SHA512:
-  metadata.gz: 9e0d44b99398209c21b48c6c34ac64b6c6c2d9af3d3aaaa4ea5da443024f0bb5a5687493841b6d16a22c9738ef62ec4b2937efefa567b8f6cf94777759e0bbfd
-  data.tar.gz: 7deac7f651ea8e0445b4bcd390358755a0ea89ec4af3976a706ebde8c6b1a642e2baff4df3eae68b2b7e34192d2ba72fba10fc71ce2979a72eca4fa138961fe5
+  metadata.gz: c9ef1956b469746dc95cabc64051a824018ff3e24655b553fe315b174dfe1d1dfb4cefc31c66ddc2ab028c4492f1cd55578d455ba88f9c1555d57f823c18bacf
+  data.tar.gz: 38274e655d05e2ba0f6a103d38cfc4e597c7e0101d88a02b0028921131473d607f3cdf2bfe0400b1380c9be8e72525f4fb5658954dd47a526c362870de1cad2c

data/lib/bankscrap/openbank/account.rb

@@ -7,7 +7,7 @@ module Bankscrap
 
       attr_accessor :contract_id
 
-      ACCOUNT_ENDPOINT = '/OPB_BAMOBI_WS_ENS/ws/BAMOBI_WS_Def_Listener'.freeze
+      ACCOUNT_ENDPOINT = '/my-money/cuentas/movimientos'.freeze
 
       # Fetch transactions for the given account.
       # By default it fetches transactions for the last month,
@@ -15,63 +15,32 @@ module Bankscrap
       # Returns an array of BankScrap::Transaction objects
       def fetch_transactions_for(connection, start_date: Date.today - 1.month, end_date: Date.today)
         transactions = []
-        end_page = false
-        repo = nil
-        importe_cta = nil
 
+        fields = { producto: contract_id,
+                   numeroContrato: id,
+                   fechaDesde: format_date(start_date),
+                   fechaHasta: format_date(end_date),
+                   concepto: '000' }
         # Loop over pagination
-        until end_page
-          document = connection.post(ACCOUNT_ENDPOINT, fields: xml_account(connection, start_date, end_date, repo, importe_cta))
-
-          transactions += document.xpath('//listadoMovimientos/movimiento').map { |data| build_transaction(data) }
-
-          repo = document.at_xpath('//methodResult/repo')
-          importe_cta = document.at_xpath('//methodResult/importeCta')
-          end_page = value_at_xpath(document, '//methodResult/finLista') != 'N'
+        until fields.empty?
+          data = connection.get(ACCOUNT_ENDPOINT, fields: fields)
+          transactions += data['movimientos'].map { |item| build_transaction(item) }
+          fields = next_page_fields(data)
         end
 
         transactions
       end
 
-      def xml_account(connection, from_date, to_date, repo, importe_cta)
-        is_pagination = repo ? 'S' : 'N'
-        xml_from_date = xml_date(from_date)
-        xml_to_date = xml_date(to_date)
-        <<-account
-      <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"   xmlns:v1="http://www.isban.es/webservices/BAMOBI/Cuentas/F_bamobi_cuentas_lip/internet/BAMOBICTA/v1">
-        #{connection.xml_security_header}
-        <soapenv:Body>
-          <v1:listaMovCuentasFechas_LIP facade="BAMOBICTA">
-            <entrada>
-        #{connection.xml_datos_cabecera}
-              <datosConexion>#{connection.user_data.children}</datosConexion>
-              <contratoID>#{contract_id}</contratoID>
-              <fechaDesde>#{xml_from_date}</fechaDesde>
-              <fechaHasta>#{xml_to_date}</fechaHasta>
-        #{importe_cta}
-              <esUnaPaginacion>#{is_pagination}</esUnaPaginacion>
-        #{repo}
-            </entrada>
-          </v1:listaMovCuentasFechas_LIP>
-        </soapenv:Body>
-      </soapenv:Envelope>
-        account
-      end
-
-      def xml_date(date)
-        "<dia>#{date.day}</dia><mes>#{date.month}</mes><anyo>#{date.year}</anyo>"
-      end
-
       # Build a transaction object from API data
       def build_transaction(data)
         Transaction.new(
           account: self,
-          id: value_at_xpath(data, 'numeroMovimiento'),
-          amount: money(data, 'importe'),
-          description: value_at_xpath(data, 'descripcion'),
-          effective_date: Date.strptime(value_at_xpath(data, 'fechaValor'), '%Y-%m-%d'),
-          # TODO: Bankscrap has no interface to add operation date
-          balance: money(data, 'importeSaldo')
+          id: data['nummov'],
+          amount: money(data['importe']),
+          description: data['conceptoTabla'],
+          effective_date: parse_date(data['fechaValor']),
+          operation_date: parse_date(data['fechaOperacion']),
+          balance: money(data['saldo'])
         )
       end
     end

data/lib/bankscrap/openbank/bank.rb

@@ -1,5 +1,6 @@
 require 'bankscrap'
 require 'securerandom'
+require 'json'
 require 'byebug'
 require_relative 'account.rb'
 require_relative 'card.rb'
@@ -10,20 +11,18 @@ module Bankscrap
     class Bank < ::Bankscrap::Bank
       include Utils
 
-      attr_accessor :user_data
-
       # Define the endpoints for the Bank API here
-      BASE_ENDPOINT     = 'https://www.openbank.mobi'.freeze
-      LOGIN_ENDPOINT    = '/OPBMOV_IPAD_NSeg_ENS/ws/QUIZ_Def_Listener'.freeze
-      PRODUCTS_ENDPOINT = '/OPB_BAMOBI_WS_ENS/ws/BAMOBI_WS_Def_Listener'.freeze
-      USER_AGENT        = 'Dalvik/1.6.0 (Linux; U; Android 4.4.4; XT1032 Build/KXB21.14-L1.40)'.freeze
+      BASE_ENDPOINT     = 'https://api.openbank.es'.freeze
+      LOGIN_ENDPOINT    = '/authenticationcomposite/login'.freeze
+      PRODUCTS_ENDPOINT = '/posicion-global-total'.freeze
+      USER_AGENT        = 'okhttp/3.9.1'.freeze
 
       def initialize(credentials = {})
+        @token_credential = nil
         super do
           add_headers(
-            'Content-Type'     => 'text/xml; charset=utf-8',
+            'Content-Type'     => 'application/json; charset=utf-8',
             'User-Agent'       => USER_AGENT,
-            'Host'             => 'www.openbank.mobi',
             'Connection'       => 'Keep-Alive',
             'Accept-Encoding'  => 'gzip'
           )
@@ -32,7 +31,20 @@ module Bankscrap
 
       def login
         log 'login'
-        post(LOGIN_ENDPOINT, fields: xml_login(public_ip))
+        login_data = {
+            document: @user,
+            documentType: "N",
+            password: @password,
+            force: true,
+            osVersion: "8.1.0",
+            uuid: "#{SecureRandom.hex(10)[0..2]}-#{SecureRandom.hex(10)[0..6]}",
+            mobileDeviceInfo: { pushEnabled:false,
+                                rooted: false,
+                                version: "1.1.16",
+                                device: "SAMSUNG",
+                                platform: "ANDROID" }
+            }
+        post(LOGIN_ENDPOINT, fields: login_data)
       end
 
       # Fetch all the accounts for the given user
@@ -40,11 +52,19 @@ module Bankscrap
       # Should returns an array of Bankscrap::Account objects
       def fetch_accounts
         log 'fetch_accounts'
-        document = post(PRODUCTS_ENDPOINT, fields: xml_products)
-        document.xpath('//cuentas/cuenta').map { |data| build_account(data) } +
-          document.xpath('//tarjetas/tarjeta').map { |data| build_card(data) }
+        data = get(PRODUCTS_ENDPOINT, fields: { carteras: false,listaSolicitada: 'TODOS',indicadorSaldoPreTarj: false })
+        cuentas = data['datosSalidaCuentas']['cuentas'].zip(data['datosSalidaCodIban']['datosIban'])
+        cuentas.map{ |data| build_account(data) }
       end
 
+      # Fetch all the cards for the given user
+      #
+      # Should returns an array of Bankscrap::Card objects
+      def fetch_cards
+         log 'fetch_cards'
+         data = get(PRODUCTS_ENDPOINT, fields: { carteras: false,listaSolicitada: 'TODOS',indicadorSaldoPreTarj: false })
+         data['datosSalidaTarjetas']['tarjetas'].map{ |data| build_card(data) }
+      end
       # Fetch transactions for the given account.
       #
       # Account should be a Bankscrap::Account object
@@ -53,57 +73,32 @@ module Bankscrap
         product.fetch_transactions_for(self, start_date: start_date, end_date: end_date)
       end
 
-      def xml_security_header
-        <<-security
-        <soapenv:Header>
-          <wsse:Security SOAP-ENV:actor="http://www.isban.es/soap/actor/wssecurityB64" SOAP-ENV:mustUnderstand="1" S12:role="wsssecurity" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:S12="http://www.w3.org/2003/05/soap-envelope" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
-            <wsse:BinarySecurityToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="SSOToken" ValueType="esquema" EncodingType="hwsse:Base64Binary">#{@token_credential}</wsse:BinarySecurityToken>
-          </wsse:Security>
-        </soapenv:Header>
-        security
-      end
-
-      def xml_datos_cabecera
-        <<-datos
-        <datosCabecera>
-          <version>3.0.4</version>
-          <terminalID>Android</terminalID>
-          <idioma>es-ES</idioma>
-        </datosCabecera>
-        datos
+      def post(method, fields: {})
+        set_auth_headers()
+        response = super(BASE_ENDPOINT + method, fields: JSON.generate(fields))
+        parse_context(response)
       end
 
-      def post(method, fields: {})
-        response = super(BASE_ENDPOINT + method, fields: fields)
+      def get(method, fields: {})
+        set_auth_headers()
+        response = super(BASE_ENDPOINT + method, params: fields)
         parse_context(response)
       end
 
       private
 
-      def xml_products
-        <<-products
-      <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v1="http://www.isban.es/webservices/BAMOBI/Posglobal/F_bamobi_posicionglobal_lip/internet/BAMOBIPGL/v1">
-        #{xml_security_header}
-        <soapenv:Body>
-          <v1:obtenerPosGlobal_LIP facade="BAMOBIPGL">
-            <entrada>#{xml_datos_cabecera}</entrada>
-          </v1:obtenerPosGlobal_LIP>
-        </soapenv:Body>
-      </soapenv:Envelope>
-        products
-      end
-
       # Build an Account object from API data
       def build_account(data)
+        account, iban = data
         Account.new(
           bank: self,
-          id: value_at_xpath(data, 'comunes/contratoID/NUMERO_DE_CONTRATO'),
-          name: value_at_xpath(data, 'comunes/descContrato'),
-          available_balance: money(data, 'importeDispAut'),
-          balance: money(data, 'impSaldoActual'),
-          iban: value_at_xpath(data, 'IBAN').tr(' ', ''),
-          description: value_at_xpath(data, 'comunes/alias') || value_at_xpath(data, 'comunes/descContrato'),
-          contract_id: data.at_xpath('contratoIDViejo').children.to_s
+          id: account['cviejo']['numerodecontrato'],
+          name: account.fetch('descripcion', '').strip(),
+          available_balance: money(account['saldoActual']),
+          balance: money(account['saldoActual']),
+          iban: iban['codIban'].values().join.strip,
+          description: account.fetch('descripcion', '').strip(),
+          contract_id: account['cviejo']['subgrupo']
         )
       end
 
@@ -111,53 +106,31 @@ module Bankscrap
       def build_card(data)
         Card.new(
           bank: self,
-          id: value_at_xpath(data, 'pan'),
-          name: value_at_xpath(data, 'comunes/descContrato'),
-          available_balance: money(data, 'impDisponible'),
-          balance: money(data, 'impSaldoDispuesto'),
-          iban: value_at_xpath(data, 'comunes/contratoID'),
-          description: "#{value_at_xpath(data, 'comunes/alias') || value_at_xpath(data, 'comunes/descContrato')} (#{value_at_xpath(data, 'descTipoTarjeta')})",
-          contract_id: data.at_xpath('comunes/contratoID').children.to_s
+          id: data['contrato']['numerodecontrato'],
+          name: data['panmdp'],
+          avaliable: money(data['saldoDisponible']),
+          amount: money(data['saldoDispuesto']),
+          pan: data['panmdp'],
+          description: data['descripcion'],
+          contract_id: data['contrato']['producto'],
+          is_credit: data['tipoTarjeta'].to_s == "credit"
         )
       end
 
-      def parse_context(xml)
-        document = Nokogiri::XML(xml)
-        @cookie_credential = value_at_xpath(document, '//cookieCredential', @cookie_credential)
-        @token_credential = value_at_xpath(document, '//tokenCredential', @token_credential)
-        self.user_data = document.at_xpath('//methodResult/datosUsuario') || user_data
-        document
-      end
-
-      def public_ip
-        log 'getting public ip'
-        ip = open('http://api.ipify.org').read
-        log "public ip: [#{ip}]"
-        ip
+      def parse_context(data)
+        context = JSON.parse(data)
+        @token_credential = context.fetch('tokenCredential', @token_credential)
+        context
       end
 
       def format_user(user)
         user.upcase
       end
 
-      def xml_login(public_ip)
-        <<-login
-      <v:Envelope xmlns:v="http://schemas.xmlsoap.org/soap/envelope/"  xmlns:c="http://schemas.xmlsoap.org/soap/encoding/"  xmlns:d="http://www.w3.org/2001/XMLSchema"  xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-        <v:Header />
-        <v:Body>
-          <n0:authenticateCredential xmlns:n0="http://www.isban.es/webservices/TECHNICAL_FACADES/Security/F_facseg_security/internet/loginServicesNSegWS/v1" facade="loginServicesNSegWS">
-            <CB_AuthenticationData i:type=":CB_AuthenticationData">
-              <documento i:type=":documento">
-                <CODIGO_DOCUM_PERSONA_CORP i:type="d:string">#{@user}</CODIGO_DOCUM_PERSONA_CORP>
-                <TIPO_DOCUM_PERSONA_CORP i:type="d:string">N</TIPO_DOCUM_PERSONA_CORP>
-              </documento>
-              <password i:type="d:string">#{@password}</password>
-            </CB_AuthenticationData>
-            <userAddress i:type="d:string">#{public_ip}</userAddress>
-          </n0:authenticateCredential>
-        </v:Body>
-      </v:Envelope>
-        login
+      def set_auth_headers
+        headers = {}
+        headers['openbankauthtoken'] = @token_credential unless @token_credential.nil?
+        add_headers(headers) unless headers.empty?
       end
     end
   end

data/lib/bankscrap/openbank/card.rb

@@ -2,10 +2,12 @@ require_relative 'utils.rb'
 
 module Bankscrap
   module Openbank
-    class Card < Account
+    class Card < ::Bankscrap::Card
       include Utils
 
-      CARD_ENDPOINT = '/OPB_BAMOBI_WS_ENS/ws/BAMOBI_WS_Def_Listener'.freeze
+      attr_accessor :contract_id
+
+      CARD_ENDPOINT = '/my-money/tarjetas/movimientosCategoria'.freeze
 
       # Fetch transactions for the given account.
       # By default it fetches transactions for the last month,
@@ -13,60 +15,36 @@ module Bankscrap
       # Returns an array of BankScrap::Transaction objects
       def fetch_transactions_for(connection, start_date: Date.today - 1.month, end_date: Date.today)
         transactions = []
-        end_page = false
-        repos = nil
-
+        fields = { producto: contract_id,
+                   numeroContrato: id,
+                   pan: pan,
+                   fechaDesde: format_date(start_date),
+                   fechaHasta: format_date(end_date)
+                 }
         # Loop over pagination
-        until end_page
-          document = connection.post(CARD_ENDPOINT, fields: xml_card(connection, start_date, end_date, repos))
-
-          transactions += document.xpath('//lista/dato').map { |data| build_transaction(data) }
-
-          repos = document.at_xpath('//methodResult/repos')
-          end_page = value_at_xpath(document, '//methodResult/finLista') != 'N'
+        until fields.empty?
+          data = connection.get(CARD_ENDPOINT, fields: fields)
+          transactions += data['lista']['movimientos'].map { |data| build_transaction(data) }.compact
+          fields = next_page_fields(data)
         end
 
         transactions
       end
 
-      def xml_card(connection, from_date, to_date, repos)
-        is_pagination = repos ? 'S' : 'N'
-        xml_from_date = xml_date(from_date)
-        xml_to_date = xml_date(to_date)
-        <<-card
-      <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"   xmlns:v1="http://www.isban.es/webservices/BAMOBI/Tarjetas/F_bamobi_tarjetas_lip/internet/BAMOBITAJ/v1">
-        #{connection.xml_security_header}
-        <soapenv:Body>
-          <v1:listaMovTarjetasFechas_LIP facade="BAMOBITAJ">
-            <entrada>
-              <datosConexion>#{connection.user_data.children}</datosConexion>
-              #{connection.xml_datos_cabecera}
-              <contratoTarjeta>#{contract_id}</contratoTarjeta>
-              <numeroTarj>#{id}</numeroTarj>
-              <fechaDesde>#{xml_from_date}</fechaDesde>
-              <fechaHasta>#{xml_to_date}</fechaHasta>
-              <esUnaPaginacion>#{is_pagination}</esUnaPaginacion>
-              #{repos}
-            </entrada>
-          </v1:listaMovTarjetasFechas_LIP>
-        </soapenv:Body>
-      </soapenv:Envelope>
-        card
-      end
-
-      def xml_date(date)
-        "<dia>#{date.day}</dia><mes>#{date.month}</mes><anyo>#{date.year}</anyo>"
+      def fetch_transactions(start_date: Date.today - 2.years, end_date: Date.today)
+        fetch_transactions_for(bank, start_date: start_date, end_date: end_date)
       end
 
       # Build a transaction object from API data
       def build_transaction(data)
+        return if data['estadoPeticion'] == 'L'
         Transaction.new(
           account: self,
-          id: value_at_xpath(data, 'movimDia'),
-          amount: money(data, 'importeMovto'),
-          description: value_at_xpath(data, 'descMovimiento'),
-          effective_date: Date.strptime(value_at_xpath(data, 'fechaAnota'), '%Y-%m-%d'),
-          # operation_date: Date.strptime(value_at_xpath(data, 'fechaOpera'), "%Y-%m-%d"),
+          id: data['numeroMovimintoEnDia'],
+          amount: money(data['impOperacion']),
+          description: data['txtCajero'],
+          effective_date: parse_date(data['fechaAnotacionMovimiento']),
+          operation_date: parse_date(data['fechaMovimiento']),
           balance: Money.new(0, 'EUR') # TODO: Prepaid/debit cards don't have a Balance - maybe Credit ones do.
         )
       end

data/lib/bankscrap/openbank/utils.rb

@@ -1,17 +1,28 @@
 module Bankscrap
   module Openbank
     module Utils
-      def value_at_xpath(node, xpath, default = '')
-        value = node.at_xpath(xpath)
-        value ? value.content.strip : default
-      end
 
-      def money(data, xpath)
+      def money(data)
         Money.new(
-          value_at_xpath(data, xpath + '/IMPORTE').delete('.'),
-          value_at_xpath(data, xpath + '/DIVISA')
+          data['importe'] * 100.0,
+          data['divisa'].presence || 'EUR'
         )
       end
+
+      def parse_date(date)
+        Date.strptime(date, '%Y-%m-%d')
+      end
+
+      def format_date(date)
+        "%04d-%02d-%02d" % [date.year, date.month, date.day]
+      end
+
+      def next_page_fields(data)
+        link = data&.fetch('_links', nil)&.fetch('nextPage', nil)&.fetch('href', nil)
+        return {} unless link
+        uri = URI.parse(link)
+        URI::decode_www_form(uri.query).to_h
+      end
     end
   end
 end

data/lib/bankscrap/openbank/version.rb

@@ -1,5 +1,5 @@
 module Bankscrap
   module Openbank
-    VERSION = '2.0.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bankscrap-openbank
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - zjuanma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bankscrap
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Openbank adapter for Bankscrap