m1_api 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 880305cc13e0cde33cdabd9c30e1d4b8dff25a337cb6363bbb574deff09fd656
-  data.tar.gz: 03c84cca83c77623a41fe1715bcad2b5396fc440a3e0fccb0d2494017e81fa7f
+  metadata.gz: 475e1c6fb04452314313521cd450258bdbe267261bf832473296682027a35c9b
+  data.tar.gz: db5ebe7aaf45bed0c93ebc132d19d47017d5faba256ff489b6145c085d019c6d
 SHA512:
-  metadata.gz: 518a8c44b1dedba1c6790d4383bf22102588c1c45208c733c38c5520cb5da97b7e89a715df7346ee1c1a5b115da48a5f2ac241b22c7e73936de703479eaad47e
-  data.tar.gz: 61ad53f7ddac12bf53d60fe9eb4c6f78158f366ea45fd9ba8525746106bdb7f1f1e45ac81d32b00b27bf438f80329065818f5bcede0608cdf22a9507cb0b9fb7
+  metadata.gz: 25cf2ab1e505f41201feff61a3a02349531c8fd1bbc1a36259d80c4d1d9a4384e3759cf92832eaeb58bc7f6df306cdb2477f91cf895c0d801bf143265be4f885
+  data.tar.gz: 960d1e1f5650eead60a3a23396a37d8fd7e2fcaf7cf9324e38eef2b90ea24b8eb7c7addb533ee7e331a0f3ee4c3b6fb46d648ca01bf6c9899a97d78f238ec091

data/lib/m1_api.rb

@@ -1,21 +1,38 @@
 require_relative './m1_api/yaml_helpers.rb'
 
+# open browser
+# open network logs
+# save entire thing as har
+# parse
+# should match the logs against when the actions were performed
+
 class M1API
 #  autoload :CLI, 'm1_api/cli'
   autoload :VERSION, 'm1_api/version'
 
-  attr_accessor :api_config_file, :token
+  attr_accessor :api_config_file, :api_configs, :token, :accounts, :accounts_detail
+  
 
-  api_config_file = "#{__dir__}/m1_api/api_configs.yml"
+  def output(string)
+    puts string
+  end
 
-  def initialize(username, password, api_config_file = nil)
-    @api_config_file = api_config_file || "#{__dir__}/m1_api/api_configs.yml"
+  def initialize(username, password, api_config_file = "#{__dir__}/m1_api/api_configs.yml")
+    @accounts = {}
+    @accounts_detail = {}
+    load_config_file(api_config_file)
     credentials = { username: username, password: password }
-    res = YamlHelpers.call_api_from_yml(@api_config_file, 'authenticate', credentials)
+    res = YamlHelpers.call_api_from_config(@api_configs, :authenticate, credentials)
     raise "failed to authenticate:\n\t#{res}" unless res[:code] == 200 && res[:body]['data']['authenticate']['result']['didSucceed']
     @token = res[:body]['data']['authenticate']['accessToken'] 
   end
 
+  def load_config_file(api_config_file)
+    # change it to reject both if either fails
+    @api_config_file = api_config_file
+    @api_configs = YamlHelpers.load_yaml(@api_config_file)
+  end
+
   def self.read_credentials(credentials_file=nil)
     if credentials_file
       credentials = YamlHelpers.load_yaml(credentials_file)
@@ -25,21 +42,50 @@ class M1API
     end
   end
 
-  def check_status
-    res = call_api_from_yml(@@api_config_file, 'check_status', token)
-    puts res.inspect
-  end
-
   def query_accounts
     accounts = {}
     data = { token: @token }
-    id_res = YamlHelpers.call_api_from_yml(@api_config_file, 'list_account_ids', data)
-    ids = id_res[:body]['data']['viewer']['_accounts1NFCow']['edges'].map { |account| account['node']['id'] }
-    ids.each do |id|
-      data[:account_id] = id
-      account_res = YamlHelpers.call_api_from_yml(@api_config_file, 'query_account', data)
-      accounts[id] = account_res[:body]['data']['node']
+    id_res = YamlHelpers.call_api_from_config(@api_configs, :list_account_ids, data)
+    ids = id_res[:body]['data']['viewer']['accounts']['edges'].each do |account|
+      accounts[account['node']['nickname']] = account['node']['id']
+    end
+    @accounts = accounts
+  end
+
+  def query_account_detail(account_id)
+    data = { token: @token, account_id: account_id }
+    detail = YamlHelpers.call_api_from_config(@api_configs, :query_account_detail, data)[:body]['data']['node']
+    @accounts_detail[account_id] = {
+      status: detail['status'],
+      bank: detail['lastAchRelationship'],
+      transfers: detail['_achTransfers']['edges']
+    }
+    @accounts_detail
+  end
+
+  def deposit(action, account_id, bank_id, transaction)
+    case action
+    when 'deposit'
+      data = { token: @token, account_id: account_id, bank_id: bank_id, amount: transaction }
+      YamlHelpers.call_api_from_config(@api_configs, :deposit, data)
+    when 'cancel'
+      data = { token: @token, account_id: account_id, bank_id: bank_id, transfer_id: transaction }
+      YamlHelpers.call_api_from_config(@api_configs, :cancel_deposit, data)
+    else
+      output "Invalid deposit action: '#{action}'"
+    end
+  end
+
+  def withdraw(action, account_id, bank_id, transaction)
+    case action
+    when 'withdraw'
+      data = { token: @token, account_id: account_id, bank_id: bank_id, amount: transaction }
+      YamlHelpers.call_api_from_config(@api_configs, :withdraw, data)
+    when 'cancel'
+      data = { token: @token, account_id: account_id, bank_id: bank_id, transfer_id: transaction }
+      YamlHelpers.call_api_from_config(@api_configs, :cancel_withdraw, data)
+    else
+      output "Invalid withdraw action: '#{action}'"
     end
-    accounts
   end
 end

data/lib/m1_api/api_configs.yml

@@ -7,7 +7,7 @@
   :Content-Type: application/json
   :Accept-Encoding: gzip, deflate, br
   :Accept-Language: en-GB,en-US;q=0.9,en;q=0.8
-  :X-Client-Id: m1-web/3.20.1 #might have to update in real time
+  :X-Client-Id: m1-web/3.20.10 # changes regularly, hasn't broken anything yet
   :X-Client-Sentinel: <%= ((Time.new).to_i * 1000).to_s %>
 
 :authenticate:
@@ -17,8 +17,9 @@
     :Accept: application/json
     :Referer: https://dashboard.m1finance.com/login
     <<: *common_headers
-  :body: '{"query":"\n      mutation M($input: AuthenticateInput!) {\n        authenticate(input: $input) {\n      result {\n        didSucceed\n        inputError\n      }\n      accessToken\n      refreshToken\n      viewer {\n        user {\n          id\n          correlationKey\n        }\n      }\n    }\n      }\n    ","variables":{"input":{"clientMutationId":"authenticate19","username":"<<<username>>>","password":"<<<password>>>"}}}'
+  :body: '{"query":"mutation M($input: AuthenticateInput!) {authenticate(input: $input) {result {didSucceed inputError} accessToken refreshToken viewer {user {id correlationKey}}}} ","variables":{"input":{"clientMutationId":"authenticate19","username":"<<<username>>>","password":"<<<password>>>"}}}'
 
+# lists first 1000 accounts - need to paginate if there are more
 :list_account_ids:
   :method: post
   :url: *base_url
@@ -27,7 +28,7 @@
     :Accept: '*/*'
     :Referer: https://dashboard.m1finance.com/login
     <<: *common_headers
-  :body: '{"query":"query Active($first_0:Int!,$filterStatus_1:[AccountStatusEnum!]!) {viewer {_accounts1NFCow:accounts(first:$first_0,filterStatus:$filterStatus_1) {edges {node {id},cursor},pageInfo {hasNextPage,hasPreviousPage}},id}}","variables":{"first_0":1,"filterStatus_1":["NEW","OPENED","REJECTED"]}}'
+  :body: '{"query":"query Routes($first_0:Int!) {viewer {id,...F1}} fragment F0 on Account {nickname,id} fragment F1 on Viewer {profile {primary {firstName,lastName}},accounts:accounts(first:$first_0) {edges {node {id,...F0},cursor},pageInfo {hasNextPage,hasPreviousPage}},id}","variables":{"first_0":1000}}'
 
 :query_account:
   :method: post
@@ -39,27 +40,65 @@
     <<: *common_headers
   :body: '{"query":"query Routes($id_0:ID!) {node(id:$id_0) {id,__typename,...F1}} fragment F0 on Account {isRetirement,achTransferLimit,lastAchRelationship {id,nickname,__typename},balance {totalValue {value}},id} fragment F1 on Account {registration,id,...F0}","variables":{"id_0":"<<<account_id>>>"}}'
 
+:query_bank_id:
+  :method: post
+  :url: *base_url
+  :headers:
+    :Accept: '*/*'
+    :Referer: https://dashboard.m1finance.com/d/invest/portfolio
+    :Authorization: Bearer <<<token>>>
+    <<: *common_headers
+  :body: '{"query":"query Routes($id_0:ID!) {node(id:$id_0) {id,__typename,...F1}} fragment F0 on Account {isLiquidating,lastAchRelationship {__typename,status,isActive,id},id} fragment F1 on Account {id,...F0}","variables":{"id_0":"<<<account_id>>>"}}'
+
+:query_account_detail:
+  :method: post
+  :url: *base_url
+  :headers:
+    :Accept: '*/*'
+    :Referer: https://dashboard.m1finance.com/d/funding
+    :Authorization: Bearer <<<token>>>
+    <<: *common_headers
+  :body: '{"query":"query Routes($id_0:ID!,$first_1:Int!,$number_2:Int!) {node(id:$id_0) {id,__typename,...Fc}} fragment F0 on AchRelationshipViaLink {toExternalAccount {id,name,accountNumber,institutionCode},id} fragment F1 on AchRelationshipViaDeposits {id,nickname,bankAccountNumber,bankAccountType} fragment F2 on AchRelationship {__typename,id,internalId,rejectionReason,nickname,...F0,...F1} fragment F3 on AchRelationship {__typename,id,isActive} fragment F4 on AchRelationship {id,isActive,__typename} fragment F5 on Account {id,balance {cash {available}},maxCashThreshold} fragment F6 on Account {id,status,isRetirement,isLiquidating,balance {totalValue {hasValue}}} fragment F7 on Account {id,fundingTotals {totalsByYear {year,totalDeposits,totalWithdrawals}}} fragment F8 on Account {iraContributionTotals {totalsByYear {year,totalContribution,maxContribution}},id} fragment F9 on Account {isRetirement,id,...F7,...F8} fragment Fa on Account {nickname,id} fragment Fb on Account {id,registration,isRetirement,balance {margin {availableForWithdrawal}},_achTransfers:achTransfers(first:$first_1) {pageInfo {hasNextPage,hasPreviousPage},edges {node {__typename,id,direction,status,isComplete,isCreatedBySchedule,amount,contributionYear,forLiquidation,lastUpdate,viaAchRelationship {id,nickname,__typename}},cursor}},_achTransferSchedules1pTWSD:achTransferSchedules(first:$first_1) {pageInfo {hasNextPage,hasPreviousPage},edges {node {__typename,id,isDeposit,amount,description {description,_nextInstances1zNmZ6:nextInstances(number:$number_2,ofTrading:true,inTradingTimezone:true)},viaAchRelationship {id,nickname,__typename}},cursor}},...Fa} fragment Fc on Account {id,status,balance {totalValue {value}},lastAchRelationship {__typename,id,...F2,...F3,...F4},...F5,...F6,...F9,...Fb}","variables":{"id_0":"<<<account_id>>>","first_1":8,"number_2":10}}'
+
 :deposit:
-  :method:
+  :method: post
   :url: *base_url
   :headers:
     :Accept: application/json
     :Referer: https://dashboard.m1finance.com/d/c/deposit-funds
     :Authorization: Bearer <<<token>>>
-  :body: '{"query":"mutation CreateImmediateAchDeposit($input_0:CreateImmediateAchDepositInput!,$first_1:Int!) {createImmediateAchDeposit(input:$input_0) {clientMutationId,...F1,...F2}} fragment F0 on Account {lastAchRelationship {__typename,status,id,isActive,nickname},id,rootPortfolioSlice {id},estimatedTrading {id,hasTrades},_achTransferSchedules2RSrrY:achTransferSchedules(first:$first_1) {edges {node {id},cursor},pageInfo {hasNextPage,hasPreviousPage}}} fragment F1 on CreateImmediateAchDepositPayload {account {id,...F0}} fragment F2 on CreateImmediateAchDepositPayload {result {didSucceed,inputError}}","variables":{"input_0":{"accountId":"<<<account_id>>>","achRelationshipId":"<<<bank_id>>>","amount":"<<<deposit_amount>>>","clientMutationId":"1"},"first_1":1}}'
+    <<: *common_headers
+  :body: '{"query":"mutation CreateImmediateAchDeposit($input_0:CreateImmediateAchDepositInput!,$first_1:Int!) {createImmediateAchDeposit(input:$input_0) {clientMutationId,...F1,...F2}} fragment F0 on Account {lastAchRelationship {__typename,status,id,isActive,nickname},id,rootPortfolioSlice {id},estimatedTrading {id,hasTrades},_achTransferSchedules2RSrrY:achTransferSchedules(first:$first_1) {edges {node {id},cursor},pageInfo {hasNextPage,hasPreviousPage}}} fragment F1 on CreateImmediateAchDepositPayload {account {id,...F0}} fragment F2 on CreateImmediateAchDepositPayload {result {didSucceed,inputError}}","variables":{"input_0":{"accountId":"<<<account_id>>>","achRelationshipId":"<<<bank_id>>>","amount":"<<<amount>>>","clientMutationId":"1"},"first_1":1}}'
 
 :cancel_deposit:
-  :method:
+  :method: post
   :url: *base_url
   :headers:
     :Accept: application/json
-    :Referer: https://dashboard.m1finance.com/d/c/deposit-funds
+    :Referer: https://dashboard.m1finance.com/d/funding
     :Authorization: Bearer <<<token>>>
-  :body: ''
+    <<: *common_headers
+  :body: '{"query":"mutation CancelAchTransfer($input_0:CancelAchTransferInput!,$first_1:Int!) {cancelAchTransfer(input:$input_0) {clientMutationId,...F1,...F2}} fragment F0 on Account {id,isLiquidating,_achTransfers1iwpJk:achTransfers(first:$first_1) {pageInfo {hasNextPage,hasPreviousPage},edges {node {__typename,id,direction,status,isComplete,isCreatedBySchedule,amount,contributionYear,forLiquidation,lastUpdate,viaAchRelationship {id,nickname,__typename}},cursor}}} fragment F1 on CancelAchTransferPayload {account {id,...F0}} fragment F2 on CancelAchTransferPayload {result {didSucceed,inputError}}","variables":{"input_0":{"accountId":"<<<account_id>>>","achRelationshipId":"<<<bank_id>>>","achTransferId":"<<<transfer_id>>>","clientMutationId":"2"},"first_1":8}}'
 
-:check_status:
-  :method:
+:withdraw:
+  :method: post
   :url: *base_url
+  :headers:
+    :Accept: application/json
+    :Referer: https://dashboard.m1finance.com/d/c/withdraw-funds/confirm
+    :Authorization: Bearer <<<token>>>
+    <<: *common_headers
+  :body: '{"query":"mutation CreateImmediateAchWithdrawal($input_0:CreateImmediateAchWithdrawalInput!) {createImmediateAchWithdrawal(input:$input_0) {clientMutationId,...F1,...F2}} fragment F0 on Account {id} fragment F1 on CreateImmediateAchWithdrawalPayload {achTransferEdge {cursor,__typename,node {__typename,id,direction,status,isComplete,isCreatedBySchedule,amount,contributionYear,forLiquidation,lastUpdate,viaAchRelationship {id,nickname,__typename}}},account {id,...F0}} fragment F2 on CreateImmediateAchWithdrawalPayload {result {didSucceed,inputError}}","variables":{"input_0":{"accountId":"<<<account_id>>>","achRelationshipId":"<<<bank_id>>>","amount":"<<<amount>>>","clientMutationId":"3"}}}'
+
+:cancel_withdraw:
+  :method: post
+  :url: *base_url
+  :headers:
+    :Accept: application/json
+    :Referer: https://dashboard.m1finance.com/d/funding
+    :Authorization: Bearer <<<token>>>
+    <<: *common_headers
+  :body: '{"query":"mutation CancelAchTransfer($input_0:CancelAchTransferInput!,$first_1:Int!) {cancelAchTransfer(input:$input_0) {clientMutationId,...F1,...F2}} fragment F0 on Account {id,isLiquidating,_achTransfers1iwpJk:achTransfers(first:$first_1) {pageInfo {hasNextPage,hasPreviousPage},edges {node {__typename,id,direction,status,isComplete,isCreatedBySchedule,amount,contributionYear,forLiquidation,lastUpdate,viaAchRelationship {id,nickname,__typename}},cursor}}} fragment F1 on CancelAchTransferPayload {account {id,...F0}} fragment F2 on CancelAchTransferPayload {result {didSucceed,inputError}}","variables":{"input_0":{"accountId":"<<<account_id>>>","achRelationshipId":"<<<bank_id>>>","achTransferId":"<<<transfer_id>>>","clientMutationId":"4"},"first_1":8}}'
 
 :test_get:
   :method: get

data/lib/m1_api/maintenance_helpers.rb

@@ -0,0 +1,46 @@
+require 'json'
+
+# need some semi automated way of maintaining apis as they change
+# start selenium web session, authenticate manually, then run scripts to go through flows
+# parse the generated .har file and compare against current api configs file
+# might have to do fuzzy matching of the schema?
+
+# create git conflict for each call list as an accept/reject
+
+# to do the replace string, should convert this to a class
+
+module MaintenanceHelpers
+  module_function
+
+  def load_har(path_to_file)
+    out = []
+    JSON.parse(File.read(path_to_file))['log']['entries'].each do |call|
+      out << {
+        start_time: call['startTime'],
+        request: {
+          method: call['request']['method'],
+          url: call['request']['url'],
+          headers: call['request']['headers'],
+          body: call['request']['postData']
+        },
+        response: {
+          status: call['response']['status'],
+          content: call['response']['content']
+        }
+      }
+    end
+    out
+  end
+
+  def filter_by_top_value(calls, key, value)
+    if value.is_a? Regexp
+      calls.select { |call| call if call[:request][key].match?(value) }
+    else
+      calls.select { |call| call if call[:request][key].include?(value) }
+    end
+  end
+
+  def replace_value_with_key(data, matcher, key)
+
+  end
+end

data/lib/m1_api/version.rb

@@ -1,3 +1,3 @@
 class M1API
-  VERSION = Version = '0.0.4'
+  VERSION = Version = '0.1.0'
 end

data/lib/m1_api/yaml_helpers.rb

@@ -35,7 +35,13 @@ module YamlHelpers
       raise 'input is not a array' unless array.is_a?(Array)
       dup = array.clone
       dup.each_with_index do |value, index|
-        dup[index] = replace_dynamic_string(value, context)
+        if value.is_a?(String)
+          dup[index] = replace_dynamic_string(value, context)
+        elsif value.is_a?(Array)
+          dup[index] = replace_dynamic_array(value, context)
+        elsif value.is_a?(Hash)
+          dup[index] = replace_dynamic_hash(value, context)
+        end
       end
       dup.join
     end
@@ -54,8 +60,8 @@ module YamlHelpers
       hash
     end
 
-    def call_api_from_yml(config_file, api, data = {})
-      config = load_yaml(config_file)[api.to_sym]
+    def call_api_from_config(configs, api, data = {})
+      config = configs[api].dup
       raise "no api defined for #{api}" unless config
       context = config.merge data
       parsed_config = replace_dynamic_hash(context)
@@ -67,4 +73,9 @@ module YamlHelpers
       return { code: res.code, body: res.body } if res
       puts "failed to call api for api #{api}: #{e}"
     end
+
+    def call_api_from_yml(config_file, api, data = {})
+      configs = load_yaml(config_file)
+      call_api_from_config(configs, api, data)
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m1_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuan Feng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -47,6 +47,7 @@ files:
 - Readme.md
 - lib/m1_api.rb
 - lib/m1_api/api_configs.yml
+- lib/m1_api/maintenance_helpers.rb
 - lib/m1_api/version.rb
 - lib/m1_api/yaml_helpers.rb
 homepage: http://github.com/ynotgnef/m1_api