closes #1425

src/server/package.json

@@ -4,19 +4,19 @@
   "description": "isleward",
   "dependencies": {
     "bcrypt-nodejs": "0.0.3",
-    "compression": "^1.7.3",
-    "express": "^4.16.4",
+    "compression": "^1.7.4",
+    "express": "^4.17.1",
     "express-minify": "^1.0.0",
-    "google-spreadsheet": "^2.0.7",
+    "google-spreadsheet": "^3.0.10",
     "less-middleware": "^3.1.0",
     "rethinkdbdash": "^2.3.31",
-    "socket.io": "^2.2.0",
+    "socket.io": "^2.3.0",
     "universal-analytics": "^0.4.20"
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",
     "eslint": "^6.8.0",
     "eslint-plugin-prettier": "^3.1.2",
-    "sqlite3": "^4.1.0"
+    "sqlite3": "^4.1.1"
   }
 }

src/server/security/sheets.js

@@ -1,4 +1,4 @@
-let googleSheets = require('google-spreadsheet');
+const { GoogleSpreadsheet: googleSheets } = require('google-spreadsheet');
 let creds = require('./creds');
 let sheetsConfig = require('./sheetsConfig');
 
@@ -8,7 +8,7 @@ module.exports = {
 
 	records: null,
 
-	init: function () {
+	init: async function () {
 		if (sheetsConfig.roles) {
 			this.update = function () {};
 			this.onGetRows(null, sheetsConfig.roles);
@@ -16,21 +16,23 @@ module.exports = {
 		}
 
 		this.doc = new googleSheets(sheetsConfig.sheetId);
-		this.doc.useServiceAccountAuth(creds, this.onAuth.bind(this));
+		await this.doc.useServiceAccountAuth(creds);
+		await this.loadInfo();
 	},
 
-	onAuth: function () {
-		this.doc.getInfo(this.onGetInfo.bind(this));
+	loadInfo: async function () {
+		await this.doc.loadInfo();
+		this.onGetInfo();
 	},
 
 	onGetInfo: function () {
-		if (!this.doc.worksheets) {
-			setTimeout(this.onAuth.bind(this), 300000);
+		this.sheet = this.doc.sheetsByIndex[0];
+
+		if (!this.sheet) {
+			setTimeout(this.loadInfo.bind(this), 300000);
 			return;
 		}
 
-		this.sheet = this.doc.worksheets[0];
-
 		this.update();
 	},
 
@@ -72,7 +74,8 @@ module.exports = {
 		setTimeout(this.update.bind(this), 300000);
 	},
 
-	update: function () {
-		this.sheet.getRows({}, this.onGetRows.bind(this));
+	update: async function () {
+		const records = await this.sheet.getRows();
+		this.onGetRows(null, records);
 	}
 };