diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:19:48 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:19:48 +0300 |
commit | 1984a6b1c80dbd8b4eff89aa92913f943bacc63b (patch) | |
tree | 5ab5ade69721a03896ba1bfa6e19879dffee59b7 /sandstorm.js | |
parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
parent | 1d904adc610afa3106acc00886a0a848e26e1cb1 (diff) | |
download | wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.gz wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.tar.bz2 wekan-1984a6b1c80dbd8b4eff89aa92913f943bacc63b.zip |
Merge branch 'feuerball11-feature-custom-fields' into devel
Diffstat (limited to 'sandstorm.js')
-rw-r--r-- | sandstorm.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sandstorm.js b/sandstorm.js index 3ea85fef..d34bc015 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -75,7 +75,7 @@ if (isSandstorm && Meteor.isServer) { session.claimRequest(token).then((response) => { const identity = response.cap.castAs(Identity.Identity); const promises = [api.getIdentityId(identity), identity.getProfile(), - httpBridge.saveIdentity(identity)]; + httpBridge.saveIdentity(identity)]; return Promise.all(promises).then((responses) => { const identityId = responses[0].id.toString('hex').slice(0, 32); const profile = responses[1].profile; @@ -115,9 +115,9 @@ if (isSandstorm && Meteor.isServer) { const identity = response.identity; return identity.getProfile().then(() => { return { identity, - mentioned: !!user.mentioned, - subscribed: !!user.subscribed, - }; + mentioned: !!user.mentioned, + subscribed: !!user.subscribed, + }; }); }).catch(() => { // Ignore identities that fail to restore. Either they were added before we set @@ -132,7 +132,7 @@ if (isSandstorm && Meteor.isServer) { return session.activity(event); }).then(() => done(), - (e) => done(e)); + (e) => done(e)); })(); } |