Skip to content

Commit

Permalink
Merge pull request #11687 from gonzaloleon/fix/refactor-addressbook
Browse files Browse the repository at this point in the history 
ref/Fix undefined address
  • Loading branch information
@cmgustavo
cmgustavo authored May 28, 2021
2 parents 8bf1527 + 0d47e51 commit a91f48b
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 40 deletions.
8 changes: 6 additions & 2 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Observable, Subscription } from 'rxjs';

// Providers
import {
AddressBookProvider,
AnalyticsProvider,
AppProvider,
BitPayCardProvider,
Expand Down Expand Up @@ -159,8 +160,9 @@ export class CopayApp {
private themeProvider: ThemeProvider,
private logsProvider: LogsProvider,
private dynamicLinksProvider: DynamicLinksProvider,
private analyticsProvider: AnalyticsProvider,
private locationProvider: LocationProvider
private locationProvider: LocationProvider,
private addressBookProvider: AddressBookProvider,
private analyticsProvider: AnalyticsProvider
) {
this.imageLoaderConfig.setFileNameCachedWithExtension(true);
this.imageLoaderConfig.useImageTag(true);
Expand Down Expand Up @@ -442,6 +444,8 @@ export class CopayApp {
}
});
}

this.addressBookProvider.migrateOldContacts();
}

private updateDesktopOnFocus() {
Expand Down
4 changes: 2 additions & 2 deletions src/providers/address-book/address-book.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,14 @@ describe('AddressBookProvider', () => {
});
it('If setAddressBook fails, remove function will reject', () => {
const response = {
'1Q2aGBWZHNuZ7WjB9komwj9fF9GmnK5AzU (btc)': {
'btc-1Q2aGBWZHNuZ7WjB9komwj9fF9GmnK5AzU': {
address: '1Q2aGBWZHNuZ7WjB9komwj9fF9GmnK5AzU',
email: '[email protected]',
name: 'test',
coin: 'btc',
network: 'livenet'
},
'mnH3XUZ8CmH8CMruEfCDXGc83XLSn8szbm (btc)': {
'btc-mnH3XUZ8CmH8CMruEfCDXGc83XLSn8szbm': {
address: 'mnH3XUZ8CmH8CMruEfCDXGc83XLSn8szbm',
email: '[email protected]',
name: 'jp',
Expand Down
76 changes: 41 additions & 35 deletions src/providers/address-book/address-book.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ export class AddressBookProvider {
private currencyProvider: CurrencyProvider
) {
this.logger.debug('AddressBookProvider initialized');
this.migrateOldContacts().then(() => {
this.logger.debug('Old AddressBook processed');
});
}

public get(addr: string, network: string): Promise<Contact> {
Expand Down Expand Up @@ -83,8 +80,10 @@ export class AddressBookProvider {
if (ab && _.isString(ab)) ab = JSON.parse(ab);
ab = ab || {};
_.each(ab, contact => {
const ctc = this.getContact(contact);
if (ctc) contacts.push(ctc);
if (contact.address) {
const ctc = this.getContact(contact);
if (ctc) contacts.push(ctc);
}
});
return resolve(contacts);
} catch (err) {
Expand All @@ -105,22 +104,24 @@ export class AddressBookProvider {
coin: contactStr.coin,
network: contactStr.network
}
: {
...this.addressProvider.getCoinAndNetwork(
contactStr.address,
contactStr.network
)
};
: this.addressProvider.getCoinAndNetwork(
contactStr.address,
contactStr.network
) || undefined;

const contact: Contact = {
address: contactStr.address,
coin: coinInfo.coin,
network: coinInfo.network,
name: _.isObject(contactStr) ? contactStr.name : contactStr,
tag: _.isObject(contactStr) ? contactStr.tag : null,
email: _.isObject(contactStr) ? contactStr.email : null
};
return contact;
if (!coinInfo) {
return undefined;
} else {
const contact: Contact = {
address: contactStr.address,
coin: coinInfo.coin,
network: coinInfo.network,
name: _.isObject(contactStr) ? contactStr.name : contactStr,
tag: _.isObject(contactStr) ? contactStr.tag : null,
email: _.isObject(contactStr) ? contactStr.email : null
};
return contact;
}
}

public add(entry: Contact): Promise<any> {
Expand Down Expand Up @@ -164,7 +165,7 @@ export class AddressBookProvider {
let msg = this.translate.instant('Entry already exist');
return reject(msg);
}
ab[entry.address + ' (' + entry.coin.toLowerCase() + ')'] = addrData;
ab[entry.coin.toLowerCase() + '-' + entry.address] = addrData;
this.persistenceProvider
.setAddressBook(addrData.network, JSON.stringify(ab))
.then(() => {
Expand Down Expand Up @@ -208,11 +209,11 @@ export class AddressBookProvider {
let msg = this.translate.instant('Addressbook is empty');
return reject(msg);
}
if (!ab[addr + ' (' + coin.toLowerCase() + ')']) {
if (!ab[coin.toLowerCase() + '-' + addr]) {
let msg = this.translate.instant('Entry does not exist');
return reject(msg);
}
delete ab[addr + ' (' + coin.toLowerCase() + ')'];
delete ab[coin.toLowerCase() + '-' + addr];
this.persistenceProvider
.setAddressBook(network, JSON.stringify(ab))
.then(() => {
Expand All @@ -236,7 +237,6 @@ export class AddressBookProvider {
}

public migrateOldContacts(): Promise<boolean> {
this.logger.info('AddressBookProvider: migrating old contacts');
return Promise.all([
this.processNetworkContacts('livenet'),
this.processNetworkContacts('testnet')
Expand All @@ -247,6 +247,7 @@ export class AddressBookProvider {
})
.catch(() => {
this.migratingContactsSubject.next(false);
this.logger.debug('Failed to migrate old AddressBook');
return Promise.reject(false);
});
}
Expand All @@ -267,13 +268,18 @@ export class AddressBookProvider {
}

private processNetworkContacts(network: string): Promise<boolean> {
return new Promise(async resolve => {
return new Promise(async (resolve, reject) => {
try {
const newABFile = await this.persistenceProvider.existsNewAddressBook(
network
);

if (!newABFile) {
const oldABFile = await this.persistenceProvider.existsOldAddressBook(
network
);
if (oldABFile && !newABFile) {
this.logger.info(
`AddressBookProvider: migrating old ${network} contacts.`
);
this.migratingContactsSubject.next(true);
const oldContacts = await this.list(network, false);
if (oldContacts) {
Expand All @@ -284,26 +290,26 @@ export class AddressBookProvider {
);
let newContactJson = {};
_.each(oldContacts, old => {
newContactJson[
old.address + ' (' + old.coin.toLowerCase() + ')'
] = old;
newContactJson[old.coin.toLowerCase() + '-' + old.address] = old;
});
this.persistenceProvider
.setAddressBook(network, JSON.stringify(newContactJson), true)
.then(() => resolve(true))
.then(() => {
this.logger.debug(`Old ${network} AddressBook processed.`);
return resolve(true);
})
.catch(err => {
this.logger.error(err);
resolve(false);
return reject(err);
});
}
} else {
this.logger.info('AddressBookProvider: Using new addressBook');
}
return resolve(true);
} catch {
err => {
this.logger.error(`Failed to process old ${network} AddressBook.`);
this.logger.error(err);
resolve(false);
return reject(err);
};
}
});
Expand Down
6 changes: 5 additions & 1 deletion src/providers/persistence/persistence.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface GiftCardMap {

const Keys = {
ADDRESS_BOOK: network => 'addressbook-' + network,
NEW_ADDRESS_BOOK: network => 'new-addressbook-' + network,
NEW_ADDRESS_BOOK: network => 'addressbook-v2-' + network,
AGREE_DISCLAIMER: 'agreeDisclaimer',
GIFT_CARD_USER_INFO: 'amazonUserInfo', // keeps legacy key for backwards compatibility
APP_IDENTITY: network => 'appIdentity-' + network,
Expand Down Expand Up @@ -428,6 +428,10 @@ export class PersistenceProvider {
return this.storage.exists(Keys.NEW_ADDRESS_BOOK(network));
}

existsOldAddressBook(network: string) {
return this.storage.exists(Keys.ADDRESS_BOOK(network));
}

setAddressBook(network: string, addressbook, newAddressBook: boolean = true) {
return this.storage.set(
newAddressBook
Expand Down

0 comments on commit a91f48b

Please sign in to comment.