taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

store ToS acceptance timestamp, remove unused backup attributes

Browse Source
This commit is contained in:
Florian Dold 2021-06-14 11:45:05 +02:00
parent 6e11b69cf5
commit cc795f350a
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/taler-util/src/backupTypes.ts
View File

@ -806,12 +806,6 @@ export interface BackupPurchase {
*/
refunds: BackupRefundItem[];
/**
* Is the purchase considered defunct (either during payment
* or during abort if abort_status is set).
*/
defunct?: boolean;
/**
* Abort status of the payment.
*/
@ -1006,8 +1000,6 @@ export interface BackupReserve {
* Groups of withdrawal operations for this reserve. Typically just one.
*/
withdrawal_groups: BackupWithdrawalGroup[];
defective?: boolean;
}
/**
@ -1179,12 +1171,12 @@ export interface BackupExchangeDetails {
/**
* ETag for last terms of service download.
*/
tos_etag_last: string | undefined;
tos_accepted_etag: string | undefined;
/**
* ETag for last terms of service download.
* Timestamp when the ToS has been accepted.
*/
tos_etag_accepted: string | undefined;
tos_accepted_timestamp: Timestamp | undefined;
}
export enum BackupProposalStatus {

9
packages/taler-wallet-core/src/db.ts
View File

@ -570,10 +570,17 @@ export interface ExchangeDetailsRecord {
termsOfServiceLastEtag: string | undefined;
/**
* ETag for last terms of service download.
* ETag for last terms of service accepted.
*/
termsOfServiceAcceptedEtag: string | undefined;
/**
* Timestamp when the ToS was accepted.
*
* Used during backup merging.
*/
termsOfServiceAcceptedTimestamp: Timestamp | undefined;
wireInfo: WireInfo;
}

4
packages/taler-wallet-core/src/operations/backup/export.ts
View File

@ -311,8 +311,8 @@ export async function exportBackup(
stamp_expire: x.stamp_expire,
stamp_start: x.stamp_start,
})),
tos_etag_accepted: ex.termsOfServiceAcceptedEtag,
tos_etag_last: ex.termsOfServiceLastEtag,
tos_accepted_etag: ex.termsOfServiceAcceptedEtag,
tos_accepted_timestamp: ex.termsOfServiceAcceptedTimestamp,
denominations:
backupDenominationsByExchange[ex.exchangeBaseUrl] ?? [],
reserves: backupReservesByExchange[ex.exchangeBaseUrl] ?? [],

6
packages/taler-wallet-core/src/operations/backup/import.ts
View File

@ -297,9 +297,11 @@ export async function importBackup(
}
await tx.exchangeDetails.put({
exchangeBaseUrl: backupExchangeDetails.base_url,
termsOfServiceAcceptedEtag: backupExchangeDetails.tos_etag_accepted,
termsOfServiceAcceptedEtag: backupExchangeDetails.tos_accepted_etag,
termsOfServiceText: undefined,
termsOfServiceLastEtag: backupExchangeDetails.tos_etag_last,
termsOfServiceLastEtag: undefined,
termsOfServiceAcceptedTimestamp:
backupExchangeDetails.tos_accepted_timestamp,
wireInfo,
currency: backupExchangeDetails.currency,
auditors: backupExchangeDetails.auditors.map((x) => ({

1
packages/taler-wallet-core/src/operations/exchanges.ts
View File

@ -496,6 +496,7 @@ async function updateExchangeFromUrlImpl(
termsOfServiceText: tosDownload.tosText,
termsOfServiceAcceptedEtag: undefined,
termsOfServiceLastEtag: tosDownload.tosEtag,
termsOfServiceAcceptedTimestamp: getTimestampNow(),
};
// FIXME: only update if pointer got updated
r.lastError = undefined;