Merge branch 'master' into feat/feed

This commit is contained in:
Daniel Lugo 2020-06-28 00:11:38 -04:00
commit ad2cf69c3e

View file

@ -1286,7 +1286,7 @@ const register = async (alias, pass) => {
if (typeof ack.err === 'string') { if (typeof ack.err === 'string') {
throw new Error(ack.err) throw new Error(ack.err)
} else if (typeof ack.pub === 'string') { } else if (typeof ack.pub === 'string' || typeof user._.sea === 'object') {
const mySecret = await mySEA.secret(user._.sea.epub, user._.sea) const mySecret = await mySEA.secret(user._.sea.epub, user._.sea)
_currentAlias = alias _currentAlias = alias
_currentPass = await mySEA.encrypt(pass, mySecret) _currentPass = await mySEA.encrypt(pass, mySecret)