summaryrefslogtreecommitdiff
path: root/ui/app/models
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-11-08 13:55:08 -0800
committerelijah <elijah@riseup.net>2016-11-08 13:55:08 -0800
commit9d845e98a2a5cda8aaa22f581e28506a627dca43 (patch)
tree0f4807a7b76a4218c3c86420969a6f993428d715 /ui/app/models
parent395612dffea06b52153b7a6acf22ab33207c9346 (diff)
ui: auto-initialize provider when logging in from the greeter
Diffstat (limited to 'ui/app/models')
-rw-r--r--ui/app/models/account.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/app/models/account.js b/ui/app/models/account.js
index cb008cc0..e93d7572 100644
--- a/ui/app/models/account.js
+++ b/ui/app/models/account.js
@@ -53,8 +53,8 @@ export default class Account {
//
// returns a promise, fulfill is passed account object
//
- login(password) {
- return bitmask.bonafide.user.auth(this.address, password).then(
+ login(password, autoSetupProvider=false) {
+ return bitmask.bonafide.user.auth(this.address, password, autoSetupProvider).then(
response => {
if (response.uuid) {
this._uuid = response.uuid
@@ -145,7 +145,9 @@ export default class Account {
Account.list = Account.list.filter(i => {
return i.id != account.id
})
- if (index >= Account.list.length) {
+ if (Account.list.length == 0) {
+ return null
+ } else if (index >= Account.list.length) {
index = index - 1
} else if (index == -1) {
index = 0