Skip to content
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

Jump to bottom

[Closes #47] Fix wallets creation #49

Merged
merged 10 commits into from
Mar 14, 2018
Merged

[Closes #47] Fix wallets creation #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b0b78e
Merge pull request #7 from JincorTech/develop
AlekNS Jan 25, 2018
8e25fd6
Merge branch 'develop'
AlekNS Jan 26, 2018
b49ec80
Merge pull request #15 from JincorTech/develop
AlekNS Feb 1, 2018
a58dc90
Merge pull request #18 from JincorTech/develop
AlekNS Feb 2, 2018
36ad180
Merge pull request #21 from JincorTech/develop
AlekNS Feb 7, 2018
1cd5e14
Merge pull request #24 from JincorTech/develop
AlekNS Feb 8, 2018
e466791
Merge pull request #40 from JincorTech/develop
AlekNS Feb 15, 2018
7b1f418
Merge pull request #46 from JincorTech/develop
hlogeon Mar 7, 2018
b5e659f
Try to fix new wallet creation
hlogeon Mar 14, 2018
d505dba
Fix err
hlogeon Mar 14, 2018
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
2 changes: 1 addition & 1 deletion src/entities/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class User {

getNextWalletIndex(): number {
let max = -1;
this.wallets.forEach(w => max = Math.max(max, w.index));
this.wallets.forEach((w, i) => max = Math.max(max, i));
return max + 1;
}

Expand Down
7 changes: 5 additions & 2 deletions src/services/app/user/user.account.app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class UserAccountApplication {
return transformers.transformCreatedUser(user, verifyInitiated);
}

private createNewWallet(logger: SubLogger, user: User, paymentPassword: string) {
private async createNewWallet(logger: SubLogger, user: User, paymentPassword: string) {
logger.debug('Create new wallet');

// should be created every time for fresh master key
Expand Down Expand Up @@ -124,8 +124,11 @@ export class UserAccountApplication {
tokens: []
});
newWallet.index = walletIndex;
logger.debug("Wallet index: " + walletIndex);

user.addWallet(newWallet);
logger.debug("Wallets: ", user.wallets);
await this.userRepository.save(user);

return newWallet;
}
Expand Down Expand Up @@ -173,7 +176,7 @@ export class UserAccountApplication {
});
user.passwordHash = bcrypt.hashSync(userData.password);

this.createNewWallet(logger, user, userData.paymentPassword);
await this.createNewWallet(logger, user, userData.paymentPassword);

logger.debug('Save user');

Expand Down