From 52678621f97f45917977bc6fa26df790eb48685d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 21 Feb 2018 11:06:00 -0500
Subject: [PATCH] revising minimum password strength to be 1 instead of 0

---
 src/controllers/accounts/edit.js              |  2 +-
 src/controllers/index.js                      |  2 +-
 .../1.7.6/update_min_pass_strength.js         | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/upgrades/1.7.6/update_min_pass_strength.js

diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index 5e40b83ef2..08f5edfaf3 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -89,7 +89,7 @@ function renderRoute(name, req, res, next) {
 
 			if (name === 'password') {
 				userData.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
-				userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10);
+				userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10);
 			}
 
 			userData.title = '[[pages:account/edit/' + name + ', ' + userData.username + ']]';
diff --git a/src/controllers/index.js b/src/controllers/index.js
index f6bfc322f4..665be289c6 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -166,7 +166,7 @@ Controllers.register = function (req, res, next) {
 			data.minimumUsernameLength = parseInt(meta.config.minimumUsernameLength, 10);
 			data.maximumUsernameLength = parseInt(meta.config.maximumUsernameLength, 10);
 			data.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
-			data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10);
+			data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10);
 			data.termsOfUse = termsOfUse.postData.content;
 			data.breadcrumbs = helpers.buildBreadcrumbs([{
 				text: '[[register:register]]',
diff --git a/src/upgrades/1.7.6/update_min_pass_strength.js b/src/upgrades/1.7.6/update_min_pass_strength.js
new file mode 100644
index 0000000000..c051d1d72e
--- /dev/null
+++ b/src/upgrades/1.7.6/update_min_pass_strength.js
@@ -0,0 +1,22 @@
+'use strict';
+
+var db = require('../../database');
+
+var async = require('async');
+
+module.exports = {
+	name: 'Revising minimum password strength to 1 (from 0)',
+	timestamp: Date.UTC(2017, 1, 21),
+	method: function (callback) {
+		async.waterfall([
+			async.apply(db.getObjectField.bind(db), 'config', 'minimumPasswordStrength'),
+			function (strength, next) {
+				if (!strength) {
+					return db.setObjectField('config', 'minimumPasswordStrength', 1, next);
+				}
+
+				setImmediate(next);
+			},
+		], callback);
+	},
+};