nodebb-plugin-session-sharing 7.1.5 → 7.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-session-sharing",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "description": "Allows login sessions from your app to persist in NodeBB",
   "main": "library.js",
   "repository": {

package/static/lib/main.js

@@ -49,7 +49,8 @@ $(document).ready(function () {
 		}
 
 		if (config.sessionSharing.loginOverride) {
-			if (data.url === 'login') {
+			const params = utils.params();
+			if (data.url === 'login' && params && !params.local) {
 				$('#content').html('');
 				redirect(config.sessionSharing.loginOverride, e);
 			}
@@ -79,8 +80,8 @@ $(document).ready(function () {
 			data.url = null;
 			redirect(config.sessionSharing.registerOverride, e);
 		}
-
-		if (config.sessionSharing.loginOverride && data.url.startsWith('login')) {
+		const params = utils.params();
+		if (config.sessionSharing.loginOverride && data.url.startsWith('login') && params && !params.local) {
 			data.url = null;
 			redirect(config.sessionSharing.loginOverride, e);
 		}

package/upgrades/session_sharing_hash_to_zset.js

@@ -1,68 +1,47 @@
 'use strict';
 
-var db = module.parent.require('./database');
+const winston = require.main.require('winston');
 
-var async = module.parent.require('async');
-var winston = module.parent.require('winston');
-
-var meta = module.parent.require('./meta');
-
-var settings;
+const db = require.main.require('./src/database');
+const batch = require.main.require('./src/batch');
+const meta = require.main.require('./src/meta');
 
 module.exports = {
 	name: 'Convert remote-to-local user ID from hash to sorted set',
 	timestamp: Date.UTC(2017, 9, 19),
-	method: function (callback) {
-		var progress = this.progress;
-		async.waterfall([
+	method: async function () {
+		try {
+			const progress = this.progress;
 			// Reload plugin settings and grab appID setting
-			async.apply(meta.settings.get, 'session-sharing'),
-			function (_settings, next) {
-				settings = _settings;
-				winston.verbose('getting data');
-				if (settings.secret) {
-					// session-sharing is set up, execute upgrade
-					db.getObject((settings.name || 'appId') + ':uid', next);
-				} else {
-					// No secret set, skip upgrade as completed.
-					setImmediate(next, true);
-				}
-			},
-
-			// Save a backup of the hash data in another key
-			function (hashData, next) {
-				db.rename((settings.name || 'appId') + ':uid', 'backup:' + (settings.name || 'appId') + ':uid', function (err) {
-					next(err, hashData);
-				});
-			},
+			const settings = await meta.settings.get('session-sharing');
+			winston.verbose('getting data');
 
-			// Save new zset
-			function (hashData, next) {
-				winston.verbose('constructing array');
-				var values = [];
-
-				for(var remoteId in hashData) {
-					if (hashData.hasOwnProperty(remoteId)) {
-						values.push(remoteId);
-					}
-				}
-				progress.total = values.length;
-				winston.verbose('saving into db');
-				async.eachSeries(values, function (value, next) {
-					progress.incr();
-					db.sortedSetAdd((settings.name || 'appId') + ':uid', hashData[value], value, next);
-				}, next);
-			}
-		], function (err) {
-			if (typeof err === 'boolean') {
-				// No upgrade needed
-				return callback();
-			} else if (err && err.message === 'WRONGTYPE Operation against a key holding the wrong kind of value') {
-				// Likely script already run, all is well
-				err = null;
+			if (!settings.secret) {
+				// No secret set, skip upgrade as completed.
+				return;
 			}
 
-			callback(err);
-		});
+			const pluginKey = (settings.name || 'appId') + ':uid';
+			// session-sharing is set up, execute upgrade
+			const hashData = await db.getObject(pluginKey);
+
+			await db.rename(pluginKey, 'backup:' + pluginKey);
+
+			winston.verbose('constructing array');
+			const values = Object.keys(hashData);
+
+			progress.total = values.length;
+			winston.verbose('saving into db');
+			await batch.processArray(values, async (batchValues) => {
+				progress.incr(batchValues.length);
+				await db.sortedSetAdd(pluginKey, batchValues.map(v => hashData[v]), batchValues);
+			}, {
+				batch: 500,
+			});
+		} catch (err) {
+			if (err && err.message !== 'WRONGTYPE Operation against a key holding the wrong kind of value') {
+				throw err;
+			}
+		}
 	},
 };