Skip to content

Commit c0d460f

Browse files
author
Peter Marton
committed
fix(destroyUser): remove only existing data
1 parent 434bbdc commit c0d460f

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/thorken.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,23 @@ Thorken.prototype.destroyUser = function (uid) {
215215

216216
keysForDel.push(userKey)
217217

218-
var listMembers = tokens.map(function (token) {
218+
var userTokens = tokens.map(function (token) {
219219
return uid + ':' + token
220220
})
221221

222-
return _this.redis.multi()
223-
.del(keysForDel)
224-
.zrem(tokenListKey, listMembers)
222+
var multi = _this.redis.multi()
223+
224+
// remove tokens
225+
if (keysForDel.length) {
226+
multi = multi.del(keysForDel)
227+
}
228+
229+
// remove user's tokens from token list
230+
if (userTokens.length) {
231+
multi = multi.zrem(tokenListKey, userTokens)
232+
}
233+
234+
return multi
225235
.exec()
226236
.then(function (results) {
227237
return results.every(function (result) {

0 commit comments

Comments
 (0)