Merge pull request #3791 from Countly/hotfix/push

[push] Missing indexes for token hashes

Author: ar2rsawseen

plugins/push/api/api-push.js

@@ -290,7 +290,7 @@ module.exports.onMerge = ({app_id, oldUser, newUser}) => {
                     update.$set = {};
                     for (let k in ou.tk) {
                         update.$set['tk.' + k] = ou.tk[k];
-                        newUser['tk' + k] = true;
+                        newUser['tk' + k] = oldUser['tk' + k];
                     }
                 }
                 if (ou.msgs && ou.msgs.length) {
@@ -314,7 +314,7 @@ module.exports.onMerge = ({app_id, oldUser, newUser}) => {
                 opts.upsert = true;
                 delete update.$set._id;
                 for (let k in ou.tk) {
-                    newUser['tk' + k] = true;
+                    newUser['tk' + k] = oldUser['tk' + k];
                 }
             }
             else if (ou && Object.keys(ou).length === 1 && !nu) {

plugins/push/frontend/app.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const log = require('../../../api/utils/common.js').log('push:frontend');
+const log = require('../../../api/utils/common.js').log('push:frontend'),
+    { FIELDS } = require('../api/send/platforms');
 
 module.exports = {
     init: (app, db) => {
@@ -14,6 +15,14 @@ module.exports = {
             {name: 'main', key: {_id: 1, m: 1, p: 1, f: 1}},
         ]).catch(() => {});
 
+        db.collection('apps').find().toArray(function(err, apps) {
+            if (apps && apps.length) {
+                apps.forEach(a => {
+                    db.collection(`app_users${a._id}`).createIndexes(Object.values(FIELDS).map(f => ({name: 'tk' + f, key: {['tk' + f]: 1}}))).catch(() => {});
+                });
+            }
+        });
+
         db.collection('plugins').updateMany({}, {$unset: {'push.proxyhttp': 1}}).catch(() => {});
     }
 };