Skip to content

WIP debugging fetch last operations #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucomsky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP debugging fetch last operations #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/plugins/bankofgeorgia-ge/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
fetchCards,
fetchCheckOperation,
fetchDepositsAndBondsWithDetails,
fetchGetClientInfo,

Check failure on line 12 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

'fetchGetClientInfo' is defined but never used
fetchGetCustomerDeviceInfoQuery,
fetchGetToken,
fetchGetUserContacts,
Expand All @@ -20,21 +21,22 @@
fetchRequestOTP,
fetchSaveUserOnDevice,
fetchSetupSecurityParameters,
fetchStatements,
fetchTriggerLogin,
fetchVerifyOTP
} from './fetchApi'
import { getNumber, getOptArray } from '../../types/get'
import { generateDevice, generateECDSAKey } from './utils'

async function askOtpCode (text: string): Promise<string> {
async function askOtpCode(text: string): Promise<string> {

Check failure on line 31 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
const sms = await ZenMoney.readLine(text, { inputType: 'number' })
if (sms == null) {
throw new InvalidOtpCodeError()
}
return sms
}

async function chooseContact (contacts: Contact[]): Promise<Contact> {
async function chooseContact(contacts: Contact[]): Promise<Contact> {

Check failure on line 39 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
if (contacts.length === 1) {
return contacts[0]
}
Expand All @@ -54,7 +56,7 @@
}
}

export async function login (preferences: Preferences, auth?: Auth): Promise<Session> {
export async function login(preferences: Preferences, auth?: Auth): Promise<Session> {

Check failure on line 59 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
let session: Session
if (auth?.tmp != null) {
const { authorizationBearer } = await fetchAuth({ auth })
Expand Down Expand Up @@ -93,12 +95,13 @@
authorizationBearer,
requestIndex: lightSession2.requestIndex
}
// await fetchGetClientInfo(processReference, session)
}

return session
}

export async function fetchAccounts (session: Session): Promise<FetchedAccount[]> {
export async function fetchAccounts(session: Session): Promise<FetchedAccount[]> {

Check failure on line 104 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
const accountsWithDetails = await fetchAccountsWithDetails(session)
const cards = await fetchCards(session)
const accounts = accountsWithDetails.map(x => {
Expand All @@ -111,13 +114,15 @@
return [...accounts, ...deposits, ...loans]
}

export async function fetchTransactions (
export async function fetchTransactions(

Check failure on line 117 in src/plugins/bankofgeorgia-ge/api.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
clientKey: string,
product: ConvertedProduct,
fromDate: Date,
toDate: Date,
session: Session
): Promise<unknown[]> {
if (product.tag === 'account' || product.tag === 'deposit' || product.tag === 'loan') { // not yet implemented for loans
await fetchStatements(clientKey, fromDate, toDate, session)
return await fetchAccountOperations(product.acctKey, fromDate, toDate, session)
}
return []
Expand Down
92 changes: 67 additions & 25 deletions src/plugins/bankofgeorgia-ge/fetchApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}
}

async function fetchAccountApi (request: AccountApiRequest, session: SessionData): Promise<unknown> {
async function fetchAccountApi(request: AccountApiRequest, session: SessionData): Promise<unknown> {

Check failure on line 30 in src/plugins/bankofgeorgia-ge/fetchApi.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
const now = new Date()
const response = await fetch('https://account-api.bog.ge/account-api-1.0/graphql', {
method: 'POST',
Expand Down Expand Up @@ -77,7 +77,7 @@
return errors != null && errors.length > 0 ? errors[0] : get(response.body, 'data')
}

export async function fetchAuth (session: SessionData): Promise<{ authorizationBearer: string }> {
export async function fetchAuth(session: SessionData): Promise<{ authorizationBearer: string }> {

Check failure on line 80 in src/plugins/bankofgeorgia-ge/fetchApi.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
const response = await fetchAccountApi({
operationName: 'auth',
operationId: 'ce6334938ad3bb9c266d76a18cfa4d89308bb49fc5fb56f23ce0cd51d1fa58b8',
Expand All @@ -89,7 +89,7 @@
return { authorizationBearer: getString(response, 'auth.token') }
}

export async function fetchRegisterDevice (data: { publicKey: string },
export async function fetchRegisterDevice(data: { publicKey: string },

Check failure on line 92 in src/plugins/bankofgeorgia-ge/fetchApi.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
session: { authorizationBearer: string, auth: { device: Device } }): Promise<{ extCustomerId: string, extDeviceId: string }> {
const response = await fetchAccountApi({
operationName: 'registerDevice',
Expand All @@ -116,7 +116,7 @@
}
}

export async function fetchLogIn (preferences: Preferences,
export async function fetchLogIn(preferences: Preferences,

Check failure on line 119 in src/plugins/bankofgeorgia-ge/fetchApi.ts

View workflow job for this annotation

GitHub Actions / test 

Missing space before function parentheses
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ processReference: string }> {
const response = await fetchAccountApi({
operationName: 'logInQuery',
Expand All @@ -142,7 +142,7 @@
contactType: string
}

export async function fetchGetUserContacts ({ processReference }: { processReference: string },
export async function fetchGetUserContacts({ processReference }: { processReference: string },
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<Contact[]> {
const response = await fetchAccountApi({
operationName: 'getUserContactsQuery',
Expand All @@ -162,11 +162,11 @@
})
}

export async function fetchRequestOTP ({
export async function fetchRequestOTP({
processReference,
contact
}: { processReference: string, contact: Contact },
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
const response = await fetchAccountApi({
operationName: 'requestOTP',
operationId: '49d18bf00c84f1d112bd898e88e403807a6342306a99112762772eda4e9568a8',
Expand All @@ -183,7 +183,7 @@
assert(get(response, 'commonServices.requestOTP') === null, 'unexpected response', response)
}

export async function fetchVerifyOTP ({ smsCode, processReference }: { smsCode: string, processReference: string },
export async function fetchVerifyOTP({ smsCode, processReference }: { smsCode: string, processReference: string },
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
const response = await fetchAccountApi({
operationName: 'verifyOTP',
Expand All @@ -199,7 +199,7 @@
assert(get(response, 'commonServices.verifyOTP') === null, 'unexpected response', response)
}

export async function fetchGetToken ({ processReference }: { processReference: string },
export async function fetchGetToken({ processReference }: { processReference: string },
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ accessToken: string, refreshToken: string }> {
const response = await fetchAccountApi({
operationName: 'getTokenQuery',
Expand All @@ -215,7 +215,7 @@
}
}

export async function fetchSaveUserOnDevice (session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
export async function fetchSaveUserOnDevice(session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
const response = await fetchAccountApi({
operationName: 'saveUserOnDevice',
operationId: 'da13b80d2e2098e78dc884a6f3b941b8ae7851f7966bb38184531368d625bf5c',
Expand All @@ -235,7 +235,7 @@
assert(get(response, 'commonServices.saveUserOnDevice') === null, 'unexpected response', response)
}

export async function fetchGetClientInfo ({ processReference }: { processReference: string },
export async function fetchGetClientInfo({ processReference }: { processReference: string },
session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ userName: string }> {
const response = await fetchAccountApi({
operationName: 'getClientInfo',
Expand All @@ -249,7 +249,7 @@
return { userName: getString(response, 'commonServices.getClientInfo.username') }
}

export async function fetchRefreshToken (refreshToken: string, processReference: string,
export async function fetchRefreshToken(refreshToken: string, processReference: string,
session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ accessToken: string, refreshToken: string }> {
const response = await fetchAccountApi({
operationName: 'refreshToken',
Expand All @@ -268,7 +268,7 @@
}
}

export async function fetchCheckOperation ({ passCode, processReference }: { passCode: string, processReference: string },
export async function fetchCheckOperation({ passCode, processReference }: { passCode: string, processReference: string },
session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ operationReference: string }> {
const response = await fetchAccountApi({
operationName: 'checkOperationQuery',
Expand All @@ -294,7 +294,7 @@
return { operationReference: getString(response, 'scaServices.checkOperation.operationReference') }
}

export async function fetchPerformScaQuery ({ smsCode, operationReference }: { smsCode: string, operationReference: string },
export async function fetchPerformScaQuery({ smsCode, operationReference }: { smsCode: string, operationReference: string },
session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<{ scaAuthCode: string }> {
const response = await fetchAccountApi({
operationName: 'performScaQuery',
Expand All @@ -314,7 +314,7 @@
return { scaAuthCode: getString(response, 'scaServices.performSca') }
}

export async function fetchSetupSecurityParameters (data: { passCode: string, operationReference: string, processReference: string, scaAuthCode: string },
export async function fetchSetupSecurityParameters(data: { passCode: string, operationReference: string, processReference: string, scaAuthCode: string },
session: { authorizationBearer: string, accessToken: string, auth: { device: Device, extCustomerId: string, extDeviceId: string, privateKey: string } }): Promise<{ passcodeAuthToken: string }> {
const response = await fetchAccountApi({
operationName: 'setupSecurityParametersQuery',
Expand All @@ -338,7 +338,7 @@
return { passcodeAuthToken: getString(response, 'loginServices.setupSecurityParameters.passcodeAuthToken') }
}

export async function fetchGetCustomerDeviceInfoQuery ({ username }: { username: string },
export async function fetchGetCustomerDeviceInfoQuery({ username }: { username: string },
session: { authorizationBearer: string, auth: { device: Device, extCustomerId: string, extDeviceId: string } }): Promise<void> {
const response = await fetchAccountApi({
operationName: 'getCustomerDeviceInfoQuery',
Expand All @@ -353,7 +353,7 @@
assert(getString(response, 'deviceManagementServices.getCustomerDeviceInfo.isTrusted') === 'Y', 'device should be trusted')
}

export async function fetchPasscodeLogin (data: { username: string }, session: { auth: Auth, authorizationBearer: string }): Promise<{ processReference: string }> {
export async function fetchPasscodeLogin(data: { username: string }, session: { auth: Auth, authorizationBearer: string }): Promise<{ processReference: string }> {
const response = await fetchAccountApi({
operationName: 'passcodeLoginQuery',
operationId: 'b63a56186be120a8f8178ca33c8afb8a6a93882f26f2017a966e3ba9d41a2bc4',
Expand All @@ -373,8 +373,12 @@
return { processReference: getString(response, 'loginServices.login.processReference') }
}

async function fetchApiConnector (serviceId: string, params: Record<string, unknown>,
session: {accessToken: string, requestIndex: number, auth: {device: Device}}): Promise<unknown> {
// async function fetchClientKey(session: { accessToken: string, requestIndex: number, auth: { device: Device } }) Promise<string>: {
// return "60588505"
// }

async function fetchApiConnector(serviceId: string, params: Record<string, unknown>,
session: { accessToken: string, requestIndex: number, auth: { device: Device } }): Promise<unknown> {
const query = {
appVersion: APP_BUILD,
channel: 'MOBILE',
Expand Down Expand Up @@ -403,15 +407,15 @@
return response.body
}

export async function fetchTriggerLogin (session: {accessToken: string, requestIndex: number, auth: {extCustomerId: string, device: Device}}): Promise<void> {
export async function fetchTriggerLogin(session: { accessToken: string, requestIndex: number, auth: { extCustomerId: string, device: Device } }): Promise<void> {
const response = await fetchApiConnector('COMMON_TRIGGER_LOGIN_CHANGES', {
deviceId: session.auth.extCustomerId,
extCustomerId: session.auth.extCustomerId
}, session)
assert(getNumber(response, 'code') === 0, 'unsuccessful login trigger', response)
}

export async function fetchAccountsWithDetails (session: Session): Promise<FetchedChecking[]> {
export async function fetchAccountsWithDetails(session: Session): Promise<FetchedChecking[]> {
const response = await fetchApiConnector('ACCOUNTS_GET_ACCOUNTS_AND_DETAILS', {}, session)
const accounts = getArray(response, 'result.accounts.accounts')
const accountsDetails = getArray(response, 'result.details')
Expand All @@ -424,14 +428,14 @@
})
}

export async function fetchCards (session: Session): Promise<unknown> {
export async function fetchCards(session: Session): Promise<unknown> {
const response = await fetchApiConnector('CARDS_GET_CARDS_AND_DETAILS', {}, session)
const cards = get(response, 'result.cards')
assert(cards != null, 'cant get cards', response)
return cards
}

export async function fetchDepositsAndBondsWithDetails (session: Session): Promise<FetchedLoanDeposit[]> {
export async function fetchDepositsAndBondsWithDetails(session: Session): Promise<FetchedLoanDeposit[]> {
const response = await fetchApiConnector('COLLECTOR_GET_DEPOSITS_AND_BONDS_DETAILS', {}, session)
const bonds = getArray(response, 'result.bonds.bonds.bonds')
const bondsDetails = getArray(response, 'result.bonds.details')
Expand All @@ -447,7 +451,7 @@
})
}

export async function fetchLoans (session: Session): Promise<FetchedLoanDeposit[]> {
export async function fetchLoans(session: Session): Promise<FetchedLoanDeposit[]> {
const response = await fetchApiConnector('LOANS_GET_LOANS_WITH_DETAILS', {}, session)
const loans = getArray(response, 'result.loans')
const loansDetails = getArray(response, 'result.details')
Expand All @@ -460,7 +464,7 @@
})
}

export async function fetchAccountOperations (acctKey: string, fromDate: Date, toDate: Date, session: Session): Promise<unknown[]> {
export async function fetchAccountOperations(acctKey: string, fromDate: Date, toDate: Date, session: Session): Promise<unknown[]> {
const batchSize = 20
let current = 0
const result = []
Expand All @@ -482,3 +486,41 @@
}
return result
}

export async function fetchStatements(clientKey: string, fromDate: Date, toDate: Date,
session: { accessToken: string, requestIndex: number, auth: { device: Device } }): Promise<unknown> {
const query = {
clientKey,
operationDateTimeUpperBound: toDate.getTime().toString(),
operationDateTimeLowerBound: fromDate.getTime().toString(),
lastOperationsFlag: "Y",
limit: 10,
isInternalOperation: "N",
includeAggregations: "docDirection",
pfmComputable: "1",
includeFields: "canSplitUntil,clientKey,prodGroup,docKey,entryId,essId,operationTitle,nominationOriginal,beneficiary,docNomination,nomination,merchantId,essServiceId,groupImageId,postDate,authDate,operationDate,bonusPoint,status,canCopy,amount,ccy,merchantName,entryGroupNameId,sourceEntryGroup,cashbackAmount,productName,prodGroup,entryType,printSwift,isInternalOperation,transferBankBic,printFormType,sourceEntryGroup,merchantNameInt,counterPartyClient,hasTransferBack,essId,bonusInfo,essServiceId,bonusPoint,amountBase,pfmId,pfmTags,pfmSplit,pfmTagId,pfmTagName,pfmCatName,pfmForecast,pfmRecurring,pfmComputable,pfmParentCatId,pfmParentCatName,pfmCatId,bonusType,accountKey,bonusPoint,bonusType,beneficiaryAccount,bonusType,bonusPoint,authDate,merchantClientId,printAccountNo,mccCode",
// amountLowerBound: 0,
// amountUpperBound: 10,
// nomination: "",
// accountKeys: "",
// cardIds: "",
// pfmCatIds: "",
// ccys: "",
// searchAndSort: "",
printAccountNos: "Y",
}
const response = await fetch(`https://rb-api.bog.ge/transactional/statements?${qs.stringify(query)}`, {
method: 'GET',
headers: {
Authorization: `Bearer ${session.accessToken}`,
"Lang-Code": "EN",
"Accept-Encoding": "gzip",
"User-Agent": "okhttp/4.12.0"
},
parse: JSON.parse,
sanitizeRequestLog: { headers: { Authorization: true } },
sanitizeResponseLog: { headers: { Authorization: true } }
})

return response.body
}
5 changes: 4 additions & 1 deletion src/plugins/bankofgeorgia-ge/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ export const scrape: ScrapeFunc<Preferences> = async ({ preferences, fromDate, t
ZenMoney.setData('auth', session.auth)
ZenMoney.saveData()

// const clientKey = await getClientKey(session)
const clientKey = "60588505"

const accounts: Account[] = []
const transactions: ExtendedTransaction[] = []
await Promise.all(convertAccounts(await fetchAccounts(session)).map(async product => {
accounts.push(product.account)
if (ZenMoney.isAccountSkipped(product.account.id)) {
return
}
const apiTransactions = await fetchTransactions(product, fromDate, toDate!, session)
const apiTransactions = await fetchTransactions(clientKey, product, fromDate, toDate!, session)
for (const apiTransaction of apiTransactions) {
const transaction = convertTransaction(apiTransaction, product)
if (transaction != null) {
Expand Down