From 9f6e358ed5bba1c2c1b98067bfcb36fa5cec40a3 Mon Sep 17 00:00:00 2001
From: Sergei Osminushkin <os@csgo.com>
Date: Mon, 7 Oct 2019 14:31:17 +0300
Subject: [PATCH] change sparse and unique index options values from 1 to true

---
 packages/accounts-base/accounts_server.js        | 14 +++++++-------
 packages/accounts-oauth/oauth_common.js          |  2 +-
 packages/accounts-password/password_server.js    | 12 ++++++------
 packages/oauth/pending_credentials.js            |  2 +-
 packages/oauth1/oauth1_pending_request_tokens.js |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index fc2a89dd2f..4ff12049d2 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1560,18 +1560,18 @@ const setupUsersCollection = users => {
   });
 
   /// DEFAULT INDEXES ON USERS
-  users._ensureIndex('username', {unique: 1, sparse: 1});
-  users._ensureIndex('emails.address', {unique: 1, sparse: 1});
+  users._ensureIndex('username', { unique: true, sparse: true });
+  users._ensureIndex('emails.address', { unique: true, sparse: true });
   users._ensureIndex('services.resume.loginTokens.hashedToken',
-    {unique: 1, sparse: 1});
+    { unique: true, sparse: true });
   users._ensureIndex('services.resume.loginTokens.token',
-    {unique: 1, sparse: 1});
+    { unique: true, sparse: true });
   // For taking care of logoutOtherClients calls that crashed before the
   // tokens were deleted.
   users._ensureIndex('services.resume.haveLoginTokensToDelete',
-    { sparse: 1 });
+    { sparse: true });
   // For expiring login tokens
-  users._ensureIndex("services.resume.loginTokens.when", { sparse: 1 });
+  users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
   // For expiring password tokens
-  users._ensureIndex('services.password.reset.when', { sparse: 1 });
+  users._ensureIndex('services.password.reset.when', { sparse: true });
 };
diff --git a/packages/accounts-oauth/oauth_common.js b/packages/accounts-oauth/oauth_common.js
index 05f6307331..cbf1273525 100644
--- a/packages/accounts-oauth/oauth_common.js
+++ b/packages/accounts-oauth/oauth_common.js
@@ -15,7 +15,7 @@ Accounts.oauth.registerService = name => {
     // so this should be a unique index. You might want to add indexes for other
     // fields returned by your service (eg services.github.login) but you can do
     // that in your app.
-    Meteor.users._ensureIndex(`services.${name}.id`, {unique: 1, sparse: 1});
+    Meteor.users._ensureIndex(`services.${name}.id`, {unique: true, sparse: true});
   }
 };
 
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index dcb8258dc1..9b0b708365 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -164,7 +164,7 @@ Accounts._findUserByQuery = query => {
  * @returns {Object} A user if found, else null
  * @importFromPackage accounts-base
  */
-Accounts.findUserByUsername = 
+Accounts.findUserByUsername =
   username => Accounts._findUserByQuery({ username });
 
 /**
@@ -592,7 +592,7 @@ Accounts.generateResetToken = (userId, email, reason, extraTokenData) => {
   }
 
   // make sure we have a valid email
-  if (!email || 
+  if (!email ||
     !(pluckAddresses(user.emails).includes(email))) {
     handleError("No such email for user.");
   }
@@ -654,7 +654,7 @@ Accounts.generateVerificationToken = (userId, email, extraTokenData) => {
   }
 
   // make sure we have a valid email
-  if (!email || 
+  if (!email ||
     !(pluckAddresses(user.emails).includes(email))) {
     handleError("No such email for user.");
   }
@@ -977,7 +977,7 @@ Accounts.addEmail = (userId, newEmail, verified) => {
       } else {
         return prev;
       }
-    }, 
+    },
     false
   );
 
@@ -1151,6 +1151,6 @@ Accounts.createUser = (options, callback) => {
 /// PASSWORD-SPECIFIC INDEXES ON USERS
 ///
 Meteor.users._ensureIndex('services.email.verificationTokens.token',
-                          {unique: 1, sparse: 1});
+                          { unique: true, sparse: true });
 Meteor.users._ensureIndex('services.password.reset.token',
-                          {unique: 1, sparse: 1});
+                          { unique: true, sparse: true });
diff --git a/packages/oauth/pending_credentials.js b/packages/oauth/pending_credentials.js
index bf29fb1d24..0d04785c50 100644
--- a/packages/oauth/pending_credentials.js
+++ b/packages/oauth/pending_credentials.js
@@ -16,7 +16,7 @@ OAuth._pendingCredentials = new Mongo.Collection(
     _preventAutopublish: true
   });
 
-OAuth._pendingCredentials._ensureIndex('key', {unique: 1});
+OAuth._pendingCredentials._ensureIndex('key', { unique: true });
 OAuth._pendingCredentials._ensureIndex('credentialSecret');
 OAuth._pendingCredentials._ensureIndex('createdAt');
 
diff --git a/packages/oauth1/oauth1_pending_request_tokens.js b/packages/oauth1/oauth1_pending_request_tokens.js
index 57663fdabb..c4552748fb 100644
--- a/packages/oauth1/oauth1_pending_request_tokens.js
+++ b/packages/oauth1/oauth1_pending_request_tokens.js
@@ -25,7 +25,7 @@ OAuth._pendingRequestTokens = new Mongo.Collection(
     _preventAutopublish: true
   });
 
-OAuth._pendingRequestTokens._ensureIndex('key', {unique: 1});
+OAuth._pendingRequestTokens._ensureIndex('key', { unique: true });
 OAuth._pendingRequestTokens._ensureIndex('createdAt');