diff --git a/.babelrc b/.babelrc
index 0bddca3824..29a41a8166 100644
--- a/.babelrc
+++ b/.babelrc
@@ -9,4 +9,4 @@
}
]
]
-}
\ No newline at end of file
+}
diff --git a/gulp/gulp-start.js b/gulp/gulp-start.js
deleted file mode 100644
index 736f5cb325..0000000000
--- a/gulp/gulp-start.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import gulp from 'gulp';
-import nodemon from 'gulp-nodemon';
-
-import pkg from '../package.json';
-
-gulp.task('nodemon', done => {
- nodemon({
- script: pkg.main,
- });
- done();
-});
diff --git a/gulp/gulp-tests.js b/gulp/gulp-tests.js
index 64ac63902f..3a85cb59ca 100644
--- a/gulp/gulp-tests.js
+++ b/gulp/gulp-tests.js
@@ -49,12 +49,6 @@ function integrationTestCommand (testDir) {
}
/* Test task definitions */
-gulp.task('test:nodemon', gulp.series(done => {
- process.env.PORT = TEST_SERVER_PORT; // eslint-disable-line no-process-env
- process.env.NODE_DB_URI = TEST_DB_URI; // eslint-disable-line no-process-env
- done();
-}, 'nodemon'));
-
gulp.task('test:prepare:mongo', cb => {
const mongooseOptions = getDefaultConnectionOptions();
const connectionUrl = getDevelopmentConnectionUrl(TEST_DB_URI);
diff --git a/gulpfile.js b/gulpfile.js
index 86c9f32a38..bc1132913c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,7 +21,6 @@ if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-e
require('./gulp/gulp-build'); // eslint-disable-line global-require
require('./gulp/gulp-console'); // eslint-disable-line global-require
require('./gulp/gulp-sprites'); // eslint-disable-line global-require
- require('./gulp/gulp-start'); // eslint-disable-line global-require
require('./gulp/gulp-tests'); // eslint-disable-line global-require
require('./gulp/gulp-transifex-test'); // eslint-disable-line global-require
require('gulp').task('default', gulp.series('test')); // eslint-disable-line global-require
diff --git a/migrations/archive/api_v3/groups.js b/migrations/archive/api_v3/groups.js
index 1d1d7e3b0c..43db848add 100644
--- a/migrations/archive/api_v3/groups.js
+++ b/migrations/archive/api_v3/groups.js
@@ -37,7 +37,7 @@ let consoleStamp = require('console-stamp');
consoleStamp(console);
// Initialize configuration
-require('../../website/server/libs/api-v3/setupNconf')();
+require('../../website/server/libs/api-v3/setupNconf').default();
let MONGODB_OLD = nconf.get('MONGODB_OLD');
let MONGODB_NEW = nconf.get('MONGODB_NEW');
diff --git a/migrations/archive/api_v3/users.js b/migrations/archive/api_v3/users.js
index 1560c9d3dd..2511175071 100644
--- a/migrations/archive/api_v3/users.js
+++ b/migrations/archive/api_v3/users.js
@@ -32,7 +32,7 @@ let moment = require('moment');
consoleStamp(console);
// Initialize configuration
-require('../../website/server/libs/api-v3/setupNconf')();
+require('../../website/server/libs/api-v3/setupNconf').default();
let MONGODB_OLD = nconf.get('MONGODB_OLD');
let MONGODB_NEW = nconf.get('MONGODB_NEW');
diff --git a/migrations/migration-runner.js b/migrations/migration-runner.js
index c66ac2014a..e3125c8be1 100644
--- a/migrations/migration-runner.js
+++ b/migrations/migration-runner.js
@@ -6,7 +6,7 @@ require('@babel/register'); // eslint-disable-line import/no-extraneous-dependen
function setUpServer () {
const nconf = require('nconf'); // eslint-disable-line global-require, no-unused-vars
const mongoose = require('mongoose'); // eslint-disable-line global-require, no-unused-vars
- const setupNconf = require('../website/server/libs/setupNconf'); // eslint-disable-line global-require
+ const setupNconf = require('../website/server/libs/setupNconf').default; // eslint-disable-line global-require
setupNconf();
diff --git a/package-lock.json b/package-lock.json
index 0d4ad6223e..1b9ddf57ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "habitica",
- "version": "5.36.5",
+ "version": "5.38.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "habitica",
- "version": "5.36.5",
+ "version": "5.38.2",
"hasInstallScript": true,
"dependencies": {
"@babel/core": "^7.22.10",
@@ -43,7 +43,6 @@
"gulp-babel": "^8.0.0",
"gulp-filter": "^7.0.0",
"gulp-imagemin": "^7.1.0",
- "gulp-nodemon": "^2.5.0",
"gulp.spritesmith": "^6.13.0",
"habitica-markdown": "^3.0.0",
"helmet": "^4.6.0",
@@ -55,12 +54,11 @@
"merge-stream": "^2.0.0",
"method-override": "^3.0.0",
"moment": "^2.29.4",
- "moment-recur": "^1.0.7",
+ "moment-recur": "git://github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
"mongoose": "^8.9.5",
"morgan": "^1.10.0",
"nconf": "^0.12.1",
"node-gcm": "^1.0.5",
- "nodemon": "^2.0.20",
"on-headers": "^1.0.2",
"passport": "^0.5.3",
"passport-facebook": "^3.0.0",
@@ -151,14 +149,6 @@
"node": ">=4"
}
},
- "node_modules/@babel/code-frame/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/code-frame/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -542,14 +532,6 @@
"node": ">=4"
}
},
- "node_modules/@babel/highlight/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/highlight/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1787,231 +1769,6 @@
"node": ">=10.0.0"
}
},
- "node_modules/@esbuild/android-arm": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
- "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
- "cpu": [
- "arm"
- ],
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/android-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
- "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
- "cpu": [
- "arm64"
- ],
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/android-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
- "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/darwin-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
- "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
- "cpu": [
- "arm64"
- ],
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/darwin-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
- "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/freebsd-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
- "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
- "cpu": [
- "arm64"
- ],
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/freebsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
- "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-arm": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
- "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
- "cpu": [
- "arm"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
- "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
- "cpu": [
- "arm64"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-ia32": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
- "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
- "cpu": [
- "ia32"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-loong64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
- "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
- "cpu": [
- "loong64"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-mips64el": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
- "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
- "cpu": [
- "mips64el"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-ppc64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
- "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
- "cpu": [
- "ppc64"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-riscv64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
- "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
- "cpu": [
- "riscv64"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/linux-s390x": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
- "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
- "cpu": [
- "s390x"
- ],
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@esbuild/linux-x64": {
"version": "0.16.17",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
@@ -2027,96 +1784,6 @@
"node": ">=12"
}
},
- "node_modules/@esbuild/netbsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
- "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "netbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/openbsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
- "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "openbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/sunos-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
- "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "sunos"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/win32-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
- "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
- "cpu": [
- "arm64"
- ],
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/win32-ia32": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
- "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
- "cpu": [
- "ia32"
- ],
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/@esbuild/win32-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
- "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
- "cpu": [
- "x64"
- ],
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -4171,6 +3838,14 @@
"node": ">=6"
}
},
+ "node_modules/apidoc/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
"node_modules/apidoc/node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -4201,6 +3876,41 @@
"node": ">=10"
}
},
+ "node_modules/apidoc/node_modules/nodemon": {
+ "version": "2.0.22",
+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+ "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
+ "dependencies": {
+ "chokidar": "^3.5.2",
+ "debug": "^3.2.7",
+ "ignore-by-default": "^1.0.1",
+ "minimatch": "^3.1.2",
+ "pstree.remy": "^1.1.8",
+ "semver": "^5.7.1",
+ "simple-update-notifier": "^1.0.7",
+ "supports-color": "^5.5.0",
+ "touch": "^3.1.0",
+ "undefsafe": "^2.0.5"
+ },
+ "bin": {
+ "nodemon": "bin/nodemon.js"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/nodemon"
+ }
+ },
+ "node_modules/apidoc/node_modules/nodemon/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
"node_modules/apidoc/node_modules/semver": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
@@ -4215,6 +3925,36 @@
"node": ">=10"
}
},
+ "node_modules/apidoc/node_modules/simple-update-notifier": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+ "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+ "dependencies": {
+ "semver": "~7.0.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/apidoc/node_modules/simple-update-notifier/node_modules/semver": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+ "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/apidoc/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/apidoc/node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -6195,7 +5935,7 @@
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
- "devOptional": true,
+ "dev": true,
"dependencies": {
"file-uri-to-path": "1.0.0"
}
@@ -7015,15 +6755,6 @@
"node": ">=4"
}
},
- "node_modules/coa/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "optional": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/coa/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -7117,6 +6848,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+ "dev": true,
"engines": {
"node": ">=0.1.90"
}
@@ -8995,14 +8727,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/eslint-config-habitrpg/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/eslint-config-habitrpg/node_modules/ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -10509,7 +10233,7 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
- "devOptional": true
+ "dev": true
},
"node_modules/filename-reserved-regex": {
"version": "2.0.0",
@@ -11595,24 +11319,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/glob-watcher/node_modules/fsevents": {
- "version": "1.2.13",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
- "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
- "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
- "hasInstallScript": true,
- "optional": true,
- "os": [
- "darwin"
- ],
- "dependencies": {
- "bindings": "^1.5.0",
- "nan": "^2.12.1"
- },
- "engines": {
- "node": ">= 4.0"
- }
- },
"node_modules/glob-watcher/node_modules/glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -12302,16 +12008,6 @@
"node": ">=8"
}
},
- "node_modules/gulp-nodemon": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/gulp-nodemon/-/gulp-nodemon-2.5.0.tgz",
- "integrity": "sha512-vXfaP72xo2C6XOaXrNcLEM3QqDJ1x21S3x97U4YtzN2Rl2kH57++aFkAVxe6BafGRSTxs/xVfE/jNNlCv5Ym2Q==",
- "dependencies": {
- "colors": "^1.2.1",
- "gulp": "^4.0.0",
- "nodemon": "^2.0.2"
- }
- },
"node_modules/gulp.spritesmith": {
"version": "6.13.0",
"resolved": "https://registry.npmjs.org/gulp.spritesmith/-/gulp.spritesmith-6.13.0.tgz",
@@ -12544,6 +12240,14 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/has-property-descriptors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
@@ -15337,15 +15041,6 @@
"node": "*"
}
},
- "node_modules/mocha/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/mocha/node_modules/minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -15409,9 +15104,10 @@
}
},
"node_modules/moment-recur": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/moment-recur/-/moment-recur-1.0.7.tgz",
- "integrity": "sha512-jpBQn6H62gCnEYjtYdLfK/VdPZHEXo1t8RrVItHVVS67SRvByyJBNBa3WQSGTe+8H0smcYO/79FYTA9LGMVdQw==",
+ "version": "1.0.8",
+ "resolved": "git+ssh://git@github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
+ "integrity": "sha512-LaqXV3izeVQjG0EKAEQQWdneMiff5JR6oBKcfgl0uFOTeaFzLKG62psk7r2VE7RTBdhYigt6KNaLZR7GdWPEIA==",
+ "license": "Unlicense",
"dependencies": {
"moment": "<3.0.0"
}
@@ -15951,7 +15647,7 @@
"version": "2.18.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
"integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
- "devOptional": true
+ "dev": true
},
"node_modules/nanomatch": {
"version": "1.2.13",
@@ -16314,68 +16010,6 @@
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
},
- "node_modules/nodemon": {
- "version": "2.0.22",
- "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
- "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
- "dependencies": {
- "chokidar": "^3.5.2",
- "debug": "^3.2.7",
- "ignore-by-default": "^1.0.1",
- "minimatch": "^3.1.2",
- "pstree.remy": "^1.1.8",
- "semver": "^5.7.1",
- "simple-update-notifier": "^1.0.7",
- "supports-color": "^5.5.0",
- "touch": "^3.1.0",
- "undefsafe": "^2.0.5"
- },
- "bin": {
- "nodemon": "bin/nodemon.js"
- },
- "engines": {
- "node": ">=8.10.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/nodemon"
- }
- },
- "node_modules/nodemon/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "dependencies": {
- "ms": "^2.1.1"
- }
- },
- "node_modules/nodemon/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/nodemon/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/nodemon/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/noop-logger": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
@@ -19216,15 +18850,6 @@
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
},
- "node_modules/run-rs/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/run-rs/node_modules/mongodb": {
"version": "3.6.12",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.12.tgz",
@@ -19748,25 +19373,6 @@
"is-arrayish": "^0.3.1"
}
},
- "node_modules/simple-update-notifier": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
- "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
- "dependencies": {
- "semver": "~7.0.0"
- },
- "engines": {
- "node": ">=8.10.0"
- }
- },
- "node_modules/simple-update-notifier/node_modules/semver": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
- "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
- "bin": {
- "semver": "bin/semver.js"
- }
- },
"node_modules/sinon": {
"version": "15.2.0",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-15.2.0.tgz",
@@ -20793,15 +20399,6 @@
"node": ">=4"
}
},
- "node_modules/svgo/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "optional": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/svgo/node_modules/sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
diff --git a/package.json b/package.json
index 32085c2f0c..cab727d710 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
- "version": "5.36.5",
+ "version": "5.38.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.22.10",
@@ -38,7 +38,6 @@
"gulp-babel": "^8.0.0",
"gulp-filter": "^7.0.0",
"gulp-imagemin": "^7.1.0",
- "gulp-nodemon": "^2.5.0",
"gulp.spritesmith": "^6.13.0",
"habitica-markdown": "^3.0.0",
"helmet": "^4.6.0",
@@ -50,12 +49,11 @@
"merge-stream": "^2.0.0",
"method-override": "^3.0.0",
"moment": "^2.29.4",
- "moment-recur": "^1.0.7",
+ "moment-recur": "git://github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
"mongoose": "^8.9.5",
"morgan": "^1.10.0",
"nconf": "^0.12.1",
"node-gcm": "^1.0.5",
- "nodemon": "^2.0.20",
"on-headers": "^1.0.2",
"passport": "^0.5.3",
"passport-facebook": "^3.0.0",
@@ -100,17 +98,16 @@
"test:sanity": "nyc --silent --no-clean mocha test/sanity --recursive",
"test:common": "nyc --silent --no-clean mocha test/common --recursive",
"test:content": "nyc --silent --no-clean mocha test/content --recursive",
- "test:nodemon": "gulp test:nodemon",
"coverage": "nyc report --reporter=html --report-dir coverage/results; open coverage/results/index.html",
"sprites": "gulp sprites:compile",
"client:dev": "cd website/client && npm run serve",
"client:build": "cd website/client && npm run build",
"client:unit": "cd website/client && npm run test:unit",
- "start": "gulp nodemon",
+ "start": "node --watch ./website/server/index.js",
"start:simple": "node ./website/server/index.js",
- "debug": "gulp nodemon --inspect",
- "mongo:dev": "run-rs -v 5.0.23 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet",
- "mongo:test": "run-rs -v 5.0.23 -l ubuntu1804 --keep --dbpath mongodb-data-testing --number 1 --quiet",
+ "debug": "node --watch --inspect ./website/server/index.js",
+ "mongo:dev": "run-rs -v 7.0.23 -l ubuntu2404 --keep --dbpath mongodb-data --number 1 --quiet",
+ "mongo:test": "run-rs -v 7.0.23 -l ubuntu2404 --keep --dbpath mongodb-data-testing --number 1 --quiet",
"postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install",
"apidoc": "gulp apidoc",
"heroku-postbuild": ".heroku/report_deploy.sh"
diff --git a/scripts/team-cron.js b/scripts/team-cron.js
index 11f67fbf4f..6e84acaa5f 100644
--- a/scripts/team-cron.js
+++ b/scripts/team-cron.js
@@ -8,7 +8,17 @@ const TASK_VALUE_CHANGE_FACTOR = 0.9747;
const MIN_TASK_VALUE = -47.27;
async function updateTeamTasks (team) {
+ if (team.purchased.plan.dateTerminated) {
+ const dateTerminated = new Date(team.purchased.plan.dateTerminated);
+ if (dateTerminated < new Date()) {
+ team.purchased.plan.customerId = undefined;
+ team.markModified('purchased.plan');
+ return team.save();
+ }
+ }
+
const toSave = [];
+
let teamLeader = await User.findOne({ _id: team.leader }, 'preferences').exec();
if (!teamLeader) { // why would this happen?
@@ -93,12 +103,7 @@ async function updateTeamTasks (team) {
export default async function processTeamsCron () {
const activeTeams = await Group.find({
'purchased.plan.customerId': { $exists: true },
- $or: [
- { 'purchased.plan.dateTerminated': { $exists: false } },
- { 'purchased.plan.dateTerminated': null },
- { 'purchased.plan.dateTerminated': { $gt: new Date() } },
- ],
- }).exec();
+ }, { cron: 1, leader: 1, purchased: 1 }).exec();
const cronPromises = activeTeams.map(updateTeamTasks);
return Promise.all(cronPromises);
diff --git a/test/api/unit/middlewares/auth.test.js b/test/api/unit/middlewares/auth.test.js
index f4a9324189..4ddd401abc 100644
--- a/test/api/unit/middlewares/auth.test.js
+++ b/test/api/unit/middlewares/auth.test.js
@@ -1,8 +1,11 @@
+import nconf from 'nconf';
+import requireAgain from 'require-again';
import {
generateRes,
generateReq,
} from '../../../helpers/api-unit.helper';
-import { authWithHeaders as authWithHeadersFactory } from '../../../../website/server/middlewares/auth';
+
+const authPath = '../../../../website/server/middlewares/auth';
describe('auth middleware', () => {
let res; let req; let
@@ -16,6 +19,7 @@ describe('auth middleware', () => {
describe('auth with headers', () => {
it('allows to specify a list of user field that we do not want to load', done => {
+ const authWithHeadersFactory = requireAgain(authPath).authWithHeaders;
const authWithHeaders = authWithHeadersFactory({
userFieldsToExclude: ['items'],
});
@@ -35,6 +39,7 @@ describe('auth middleware', () => {
});
it('makes sure some fields are always included', done => {
+ const authWithHeadersFactory = requireAgain(authPath).authWithHeaders;
const authWithHeaders = authWithHeadersFactory({
userFieldsToExclude: [
'items', 'auth.timestamps',
@@ -60,5 +65,57 @@ describe('auth middleware', () => {
return done();
});
});
+
+ it('errors with InvalidCredentialsError and code when token is wrong', done => {
+ const authWithHeadersFactory = requireAgain(authPath).authWithHeaders;
+ const authWithHeaders = authWithHeadersFactory({ userFieldsToExclude: [] });
+
+ req.headers['x-api-user'] = user._id;
+ req.headers['x-api-key'] = 'totally-wrong-token';
+
+ authWithHeaders(req, res, err => {
+ expect(err).to.exist;
+ expect(err.name).to.equal('InvalidCredentialsError');
+ expect(err.code).to.equal('invalid_credentials');
+ expect(err.message).to.equal(res.t('invalidCredentials'));
+ return done();
+ });
+ });
+
+ describe('when ENFORCE_CLIENT_HEADER is true', () => {
+ let authFactory;
+
+ beforeEach(() => {
+ sandbox.stub(nconf, 'get').withArgs('ENFORCE_CLIENT_HEADER').returns('true');
+ authFactory = requireAgain(authPath).authWithHeaders;
+ });
+
+ it('errors with missingClientHeader when x-client header is not present', done => {
+ const authWithHeaders = authFactory({ userFieldsToExclude: [] });
+
+ req.headers['x-api-user'] = user._id;
+ req.headers['x-api-key'] = user;
+ authWithHeaders(req, res, err => {
+ expect(err).to.exist;
+ expect(err.name).to.equal('BadRequest');
+ expect(err.message).to.equal(res.t('missingClientHeader'));
+ return done();
+ });
+ });
+
+ it('allows request to pass when x-client header is present', done => {
+ const authWithHeaders = authFactory({ userFieldsToExclude: [] });
+
+ req.headers['x-api-user'] = user._id;
+ req.headers['x-api-key'] = user.apiToken;
+ req.headers['x-client'] = 'habitica-web';
+
+ authWithHeaders(req, res, err => {
+ if (err) return done(err);
+ expect(res.locals.user).to.exist;
+ return done();
+ });
+ });
+ });
});
});
diff --git a/test/api/unit/middlewares/blocker.test.js b/test/api/unit/middlewares/blocker.test.js
new file mode 100644
index 0000000000..ad4050fa4d
--- /dev/null
+++ b/test/api/unit/middlewares/blocker.test.js
@@ -0,0 +1,197 @@
+import nconf from 'nconf';
+import requireAgain from 'require-again';
+import {
+ generateRes,
+ generateReq,
+ generateNext,
+} from '../../../helpers/api-unit.helper';
+import { Forbidden } from '../../../../website/server/libs/errors';
+import { apiError } from '../../../../website/server/libs/apiError';
+import { model as Blocker } from '../../../../website/server/models/blocker';
+
+function checkIPBlockedErrorThrown (next) {
+ expect(next).to.have.been.calledOnce;
+ const calledWith = next.getCall(0).args;
+ expect(calledWith[0].message).to.equal(apiError('ipAddressBlocked'));
+ expect(calledWith[0] instanceof Forbidden).to.equal(true);
+}
+
+function checkClientBlockedErrorThrown (next) {
+ expect(next).to.have.been.calledOnce;
+ const calledWith = next.getCall(0).args;
+ expect(calledWith[0].message).to.equal(apiError('clientBlocked'));
+ expect(calledWith[0] instanceof Forbidden).to.equal(true);
+}
+
+function checkErrorNotThrown (next) {
+ expect(next).to.have.been.calledOnce;
+ const calledWith = next.getCall(0).args;
+ expect(typeof calledWith[0] === 'undefined').to.equal(true);
+}
+
+describe('Blocker middleware', () => {
+ const pathToBlocker = '../../../../website/server/middlewares/blocker';
+
+ let res; let req; let next;
+
+ beforeEach(() => {
+ res = generateRes();
+ req = generateReq();
+ next = generateNext();
+ });
+
+ describe('Blocking IPs', () => {
+ it('is disabled when the env var is not defined', () => {
+ sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(undefined);
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('is disabled when the env var is an empty string', () => {
+ sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('');
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('is disabled when the env var contains comma separated empty strings', () => {
+ sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(' , , ');
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('does not throw when the ip does not match', () => {
+ req.ip = '192.168.1.1';
+ sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.2');
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('does not throw when the blocker IP does not match', async () => {
+ req.ip = '192.168.1.1';
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'ipaddress', area: 'full', value: '192.168.1.2' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('does not throw when a client is blocked', async () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'client', area: 'full', value: '192.168.1.1' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('throws when the blocker IP is blocked', async () => {
+ req.ip = '192.168.1.1';
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'ipaddress', area: 'full', value: '192.168.1.1' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkIPBlockedErrorThrown(next);
+ });
+ });
+
+ describe('Blocking clients', () => {
+ beforeEach(() => {
+ sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('');
+ req.headers['x-client'] = 'test-client';
+ });
+ it('is disabled when no clients are blocked', () => {
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('does not throw when the client does not match', async () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'client', area: 'full', value: 'another-client' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('throws when the client is blocked', async () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'client', area: 'full', value: 'test-client' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkClientBlockedErrorThrown(next);
+ });
+
+ it('does not throw when an ip is blocked', async () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'ipaddress', area: 'full', value: 'test-client' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+
+ checkErrorNotThrown(next);
+ });
+
+ it('updates the list when data changes', async () => {
+ let blockCallback;
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ blockCallback = callback;
+ if (event === 'change') {
+ callback({ operation: 'add', blocker: { type: 'client', area: 'full', value: 'another-client' } });
+ }
+ },
+ });
+ const attachBlocker = requireAgain(pathToBlocker).default;
+ attachBlocker(req, res, next);
+ checkErrorNotThrown(next);
+ blockCallback({ operation: 'add', blocker: { type: 'client', area: 'full', value: 'test-client' } });
+ attachBlocker(req, res, next);
+ expect(next).to.have.been.calledTwice;
+ const calledWith = next.getCall(1).args;
+ expect(calledWith[0].message).to.equal(apiError('clientBlocked'));
+ expect(calledWith[0] instanceof Forbidden).to.equal(true);
+ });
+ });
+});
diff --git a/test/api/unit/middlewares/ipBlocker.test.js b/test/api/unit/middlewares/ipBlocker.test.js
deleted file mode 100644
index e75994bfb9..0000000000
--- a/test/api/unit/middlewares/ipBlocker.test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import nconf from 'nconf';
-import requireAgain from 'require-again';
-import {
- generateRes,
- generateReq,
- generateNext,
-} from '../../../helpers/api-unit.helper';
-import { Forbidden } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
-
-function checkErrorThrown (next) {
- expect(next).to.have.been.calledOnce;
- const calledWith = next.getCall(0).args;
- expect(calledWith[0].message).to.equal(apiError('ipAddressBlocked'));
- expect(calledWith[0] instanceof Forbidden).to.equal(true);
-}
-
-function checkErrorNotThrown (next) {
- expect(next).to.have.been.calledOnce;
- const calledWith = next.getCall(0).args;
- expect(typeof calledWith[0] === 'undefined').to.equal(true);
-}
-
-describe('ipBlocker middleware', () => {
- const pathToIpBlocker = '../../../../website/server/middlewares/ipBlocker';
-
- let res; let req; let next;
-
- beforeEach(() => {
- res = generateRes();
- req = generateReq();
- next = generateNext();
- });
-
- it('is disabled when the env var is not defined', () => {
- sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(undefined);
- const attachIpBlocker = requireAgain(pathToIpBlocker).default;
- attachIpBlocker(req, res, next);
-
- checkErrorNotThrown(next);
- });
-
- it('is disabled when the env var is an empty string', () => {
- sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('');
- const attachIpBlocker = requireAgain(pathToIpBlocker).default;
- attachIpBlocker(req, res, next);
-
- checkErrorNotThrown(next);
- });
-
- it('is disabled when the env var contains comma separated empty strings', () => {
- sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(' , , ');
- const attachIpBlocker = requireAgain(pathToIpBlocker).default;
- attachIpBlocker(req, res, next);
-
- checkErrorNotThrown(next);
- });
-
- it('does not throw when the ip does not match', () => {
- req.ip = '192.168.1.1';
- sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.2');
- const attachIpBlocker = requireAgain(pathToIpBlocker).default;
- attachIpBlocker(req, res, next);
-
- checkErrorNotThrown(next);
- });
-
- it('throws when the ip is blocked', () => {
- req.ip = '192.168.1.1';
- sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1');
- const attachIpBlocker = requireAgain(pathToIpBlocker).default;
- attachIpBlocker(req, res, next);
-
- checkErrorThrown(next);
- });
-});
diff --git a/test/api/unit/models/user.test.js b/test/api/unit/models/user.test.js
index c5b6054c73..8db5a1aa83 100644
--- a/test/api/unit/models/user.test.js
+++ b/test/api/unit/models/user.test.js
@@ -1,9 +1,13 @@
import moment from 'moment';
+import requireAgain from 'require-again';
import { model as User } from '../../../../website/server/models/user';
import { model as NewsPost } from '../../../../website/server/models/newsPost';
import { model as Group } from '../../../../website/server/models/group';
+import { model as Blocker } from '../../../../website/server/models/blocker';
import common from '../../../../website/common';
+const pathToUserSchema = '../../../../website/server/models/user/schema';
+
describe('User Model', () => {
describe('.toJSON()', () => {
it('keeps user._tmp when calling .toJSON', () => {
@@ -912,4 +916,73 @@ describe('User Model', () => {
expect(user.toJSON().flags.newStuff).to.equal(true);
});
});
+
+ describe('validates email', () => {
+ it('does not throw an error for a valid email', () => {
+ const user = new User();
+ user.auth.local.email = 'hello@example.com';
+ const errors = user.validateSync();
+ expect(errors.errors['auth.local.email']).to.not.exist;
+ });
+
+ it('throws an error if email is not valid', () => {
+ const user = new User();
+ user.auth.local.email = 'invalid-email';
+ const errors = user.validateSync();
+ expect(errors.errors['auth.local.email'].message).to.equal(common.i18n.t('invalidEmail'));
+ });
+
+ it('throws an error if email is using a restricted domain', () => {
+ const user = new User();
+ user.auth.local.email = 'scammer@habitica.com';
+ const errors = user.validateSync();
+ expect(errors.errors['auth.local.email'].message).to.equal(common.i18n.t('invalidEmailDomain', { domains: 'habitica.com, habitrpg.com' }));
+ });
+
+ it('throws an error if email was blocked specifically', () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: 'blocked@example.com' } });
+ },
+ });
+ const schema = requireAgain(pathToUserSchema).UserSchema;
+ const valid = schema.paths['auth.local.email'].options.validate.every(v => v.validator('blocked@example.com'));
+ expect(valid).to.equal(false);
+ });
+
+ it('throws an error if email domain was blocked', () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: '@example.com' } });
+ },
+ });
+ const schema = requireAgain(pathToUserSchema).UserSchema;
+ const valid = schema.paths['auth.local.email'].options.validate.every(v => v.validator('blocked@example.com'));
+ expect(valid).to.equal(false);
+ });
+
+ it('throws an error if user portion of email was blocked', () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: 'blocked@' } });
+ },
+ });
+ const schema = requireAgain(pathToUserSchema).UserSchema;
+ const valid = schema.paths['auth.local.email'].options.validate.every(v => v.validator('blocked@example.com'));
+ expect(valid).to.equal(false);
+ });
+
+ it('does not throw an error if email is not blocked', () => {
+ sandbox.stub(Blocker, 'watchBlockers').returns({
+ on: (event, callback) => {
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: '@example.com' } });
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: 'blocked@' } });
+ callback({ operation: 'add', blocker: { type: 'email', area: 'full', value: 'bad@test.com' } });
+ },
+ });
+ const schema = requireAgain(pathToUserSchema).UserSchema;
+ const valid = schema.paths['auth.local.email'].options.validate.every(v => v.validator('good@test.com'));
+ expect(valid).to.equal(true);
+ });
+ });
});
diff --git a/test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js b/test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js
index 472872988d..25ae9e7c5d 100644
--- a/test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js
+++ b/test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js
@@ -238,6 +238,28 @@ describe('POST /user/auth/reset-password-set-new-one', () => {
expect(isPassValid).to.equal(true);
});
+ it('changes the apiToken on password reset', async () => {
+ const user = await generateUser();
+ const previousToken = user.apiToken;
+
+ const code = encrypt(JSON.stringify({
+ userId: user._id,
+ expiresAt: moment().add({ days: 1 }),
+ }));
+ await user.updateOne({
+ 'auth.local.passwordResetCode': code,
+ });
+
+ await api.post(`${endpoint}`, {
+ newPassword: 'my new password',
+ confirmPassword: 'my new password',
+ code,
+ });
+
+ await user.sync();
+ expect(user.apiToken).to.not.eql(previousToken);
+ });
+
it('renders the success page and convert the password from sha1 to bcrypt', async () => {
const user = await generateUser();
diff --git a/test/api/v3/integration/user/auth/PUT-user_update_password.test.js b/test/api/v3/integration/user/auth/PUT-user_update_password.test.js
index 916e377a7f..6b764d7e1b 100644
--- a/test/api/v3/integration/user/auth/PUT-user_update_password.test.js
+++ b/test/api/v3/integration/user/auth/PUT-user_update_password.test.js
@@ -27,11 +27,30 @@ describe('PUT /user/auth/update-password', async () => {
newPassword,
confirmPassword: newPassword,
});
- expect(response).to.eql({});
+
+ expect(response).to.exist;
+ expect(response.apiToken).to.exist;
+
await user.sync();
expect(user.auth.local.hashed_password).to.not.eql(previousHashedPassword);
});
+ it('should change the apiToken on password change', async () => {
+ const previousToken = user.apiToken;
+ const response = await user.put(ENDPOINT, {
+ password,
+ newPassword,
+ confirmPassword: newPassword,
+ });
+
+ const newToken = response.apiToken;
+ expect(newToken).to.exist;
+
+ await user.sync();
+ expect(user.apiToken).to.eql(newToken);
+ expect(user.apiToken).to.not.eql(previousToken);
+ });
+
it('returns an error when confirmPassword does not match newPassword', async () => {
await expect(user.put(ENDPOINT, {
password,
diff --git a/test/content/schedule.test.js b/test/content/schedule.test.js
index ab0caf9b96..94c03be794 100644
--- a/test/content/schedule.test.js
+++ b/test/content/schedule.test.js
@@ -133,21 +133,21 @@ describe('Content Schedule', () => {
});
it('sets the end date for a gala', () => {
- const date = new Date('2024-05-20');
+ const date = new Date('2024-05-31');
const matchers = getAllScheduleMatchingGroups(date);
- expect(matchers.seasonalGear.end).to.eql(moment.utc(`2024-06-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
+ expect(matchers.seasonalGear.end).to.eql(moment.utc(`2024-06-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('sets the end date for a winter gala', () => {
- const date = new Date('2024-12-22');
+ const date = new Date('2025-02-28');
const matchers = getAllScheduleMatchingGroups(date);
- expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
+ expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('sets the end date in new year for a winter gala', () => {
- const date = new Date('2025-01-04');
+ const date = new Date('2025-02-28');
const matchers = getAllScheduleMatchingGroups(date);
- expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
+ expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-01T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate());
});
it('uses correct date for first hours of the month', () => {
diff --git a/test/content/shop-featuredItems.test.js b/test/content/shop-featuredItems.test.js
index 6ec7d57592..b1d7d8ce31 100644
--- a/test/content/shop-featuredItems.test.js
+++ b/test/content/shop-featuredItems.test.js
@@ -18,7 +18,7 @@ describe('Shop Featured Items', () => {
});
it('contains the current premium hatching potions', () => {
- clock = Sinon.useFakeTimers(new Date('2024-04-08'));
+ clock = Sinon.useFakeTimers(new Date('2024-04-09'));
const items = featuredItems.market();
expect(_.find(items, item => item.path === 'premiumHatchingPotions.Porcelain')).to.exist;
});
diff --git a/test/helpers/globals.helper.js b/test/helpers/globals.helper.js
index 213efac698..535138a69c 100644
--- a/test/helpers/globals.helper.js
+++ b/test/helpers/globals.helper.js
@@ -19,6 +19,6 @@ const sinonStubPromise = require('sinon-stub-promise');
sinonStubPromise(global.sinon);
global.sandbox = sinon.createSandbox();
-const setupNconf = require('../../website/server/libs/setupNconf');
+const setupNconf = require('../../website/server/libs/setupNconf').default;
setupNconf('./config.json.example');
diff --git a/test/helpers/start-server.js b/test/helpers/start-server.js
index 57d98519e5..cf1f74b71a 100644
--- a/test/helpers/start-server.js
+++ b/test/helpers/start-server.js
@@ -3,7 +3,7 @@
const nconf = require('nconf');
const mongoose = require('mongoose');
-const setupNconf = require('../../website/server/libs/setupNconf');
+const setupNconf = require('../../website/server/libs/setupNconf').default;
// fix further imports of require/import syntaxes
require('@babel/register');
diff --git a/website/client/.eslintrc.js b/website/client/.eslintrc.js
index 7a44ad03e3..6fdf41506f 100644
--- a/website/client/.eslintrc.js
+++ b/website/client/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
root: true,
env: {
node: true,
+ es2021: true,
},
extends: [
'habitrpg/lib/vue',
@@ -39,7 +40,4 @@ module.exports = {
order: ['template', 'style', 'script'],
}],
},
- parserOptions: {
- parser: 'babel-eslint',
- },
};
diff --git a/website/client/babel.config.js b/website/client/babel.config.js
deleted file mode 100644
index d2ddb50bcf..0000000000
--- a/website/client/babel.config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* eslint-disable import/no-commonjs */
-module.exports = {
- presets: [
- '@vue/cli-plugin-babel/preset',
- ],
- plugins: [
- '@babel/plugin-proposal-optional-chaining',
- ],
-};
diff --git a/website/client/public/index.html b/website/client/index.html
similarity index 97%
rename from website/client/public/index.html
rename to website/client/index.html
index 2b77fedd6a..bc3dc19bef 100644
--- a/website/client/public/index.html
+++ b/website/client/index.html
@@ -12,6 +12,7 @@
+
@@ -28,10 +29,9 @@
-
-
+