@rpcbase/server 0.333.0 → 0.335.0-bundlerserver.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/boot/server.js +5 -0
- package/boot/shared.js +1 -1
- package/boot/worker.js +2 -0
- package/cli/get_dev_watcher.js +1 -1
- package/cli/run_dev_server.js +4 -1
- package/package.json +8 -8
- package/src/auth/reset_password.js +1 -3
- package/src/auth/set_new_password.js +4 -3
package/boot/server.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
/* @flow */
|
|
2
|
+
// MUST COME FIRST!
|
|
2
3
|
require("./shared")
|
|
3
4
|
//
|
|
5
|
+
const rb_server_plugin = require("rb-server-plugin")
|
|
6
|
+
|
|
4
7
|
const http = require("http")
|
|
5
8
|
|
|
6
9
|
const {rpc_router, client_router, express} = require("../")
|
|
@@ -16,6 +19,8 @@ const server = http.createServer(app)
|
|
|
16
19
|
|
|
17
20
|
realtime_state(server)
|
|
18
21
|
|
|
22
|
+
rb_server_plugin(app)
|
|
23
|
+
|
|
19
24
|
server.listen(SERVER_PORT, "0.0.0.0", () => {
|
|
20
25
|
console.log(`listening on 0.0.0.0:${SERVER_PORT}`)
|
|
21
26
|
})
|
package/boot/shared.js
CHANGED
package/boot/worker.js
CHANGED
package/cli/get_dev_watcher.js
CHANGED
package/cli/run_dev_server.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/* @flow */
|
|
2
2
|
const get_dev_watcher = require("./get_dev_watcher")
|
|
3
3
|
|
|
4
|
+
|
|
5
|
+
console.trace("DEV SERVER LINKED")
|
|
6
|
+
|
|
4
7
|
const run_dev_server = (args) => {
|
|
5
8
|
|
|
6
9
|
const watcher = get_dev_watcher({
|
|
7
|
-
script: "server.js",
|
|
10
|
+
script: "build/server.js",
|
|
8
11
|
ignore: [
|
|
9
12
|
],
|
|
10
13
|
watch: [
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rpcbase/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.335.0-bundlerserver.0",
|
|
4
4
|
"license": "SSPL-1.0",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"bin": {
|
|
@@ -65,14 +65,14 @@
|
|
|
65
65
|
"dependencies": {
|
|
66
66
|
"@rpcbase/agent": "0.36.0",
|
|
67
67
|
"@rpcbase/std": "0.13.0",
|
|
68
|
-
"@sentry/node": "7.
|
|
68
|
+
"@sentry/node": "7.94.1",
|
|
69
69
|
"bluebird": "3.7.2",
|
|
70
70
|
"body-parser": "1.20.2",
|
|
71
|
-
"bull": "4.
|
|
71
|
+
"bull": "4.12.2",
|
|
72
72
|
"connect-redis": "7.1.0",
|
|
73
73
|
"cors": "2.8.5",
|
|
74
74
|
"debug": "4.3.4",
|
|
75
|
-
"dotenv": "16.3.
|
|
75
|
+
"dotenv": "16.3.2",
|
|
76
76
|
"expect": "29.7.0",
|
|
77
77
|
"express": "4.18.2",
|
|
78
78
|
"express-session": "1.17.3",
|
|
@@ -81,14 +81,14 @@
|
|
|
81
81
|
"jest-extended": "4.0.2",
|
|
82
82
|
"lodash": "4.17.21",
|
|
83
83
|
"mkdirp": "2.1.3",
|
|
84
|
-
"mongoose": "8.0
|
|
85
|
-
"nodemon": "3.0.
|
|
84
|
+
"mongoose": "8.1.0",
|
|
85
|
+
"nodemon": "3.0.3",
|
|
86
86
|
"picocolors": "1.0.0",
|
|
87
87
|
"postmark": "4.0.2",
|
|
88
|
-
"redis": "4.6.
|
|
88
|
+
"redis": "4.6.12",
|
|
89
89
|
"request-ip": "3.3.0",
|
|
90
90
|
"sift": "17.0.1",
|
|
91
|
-
"socket.io": "4.7.
|
|
91
|
+
"socket.io": "4.7.4",
|
|
92
92
|
"validator": "13.11.0",
|
|
93
93
|
"yargs": "17.7.2"
|
|
94
94
|
}
|
|
@@ -17,9 +17,7 @@ const log = debug("rb:auth:reset_password")
|
|
|
17
17
|
|
|
18
18
|
const {APP_DOMAIN, MAILER_FROM_EMAIL} = process.env
|
|
19
19
|
|
|
20
|
-
const email_tpl = _template(
|
|
21
|
-
fs.readFileSync(path.join(__dirname, "./forgot_password_email.html"), "utf8")
|
|
22
|
-
)
|
|
20
|
+
const email_tpl = _template(require("./forgot_password_email.html"))
|
|
23
21
|
|
|
24
22
|
|
|
25
23
|
const reset_password = async({email}, ctx) => {
|
|
@@ -9,13 +9,14 @@ const get_random_str = require("@rpcbase/std/crypto/get_random_str")
|
|
|
9
9
|
|
|
10
10
|
const mailer = require("../../mailer")
|
|
11
11
|
const mongoose = require("../../mongoose")
|
|
12
|
+
|
|
13
|
+
const set_new_password_email = require("./set_new_password_email.html")
|
|
14
|
+
|
|
12
15
|
const ResetPasswordToken = require("../models/ResetPasswordToken")
|
|
13
16
|
|
|
14
17
|
const {APP_DOMAIN} = process.env
|
|
15
18
|
|
|
16
|
-
const email_tpl = _template(
|
|
17
|
-
fs.readFileSync(path.join(__dirname, "./set_new_password_email.html"), "utf8")
|
|
18
|
-
)
|
|
19
|
+
const email_tpl = _template(set_new_password_email)
|
|
19
20
|
|
|
20
21
|
const set_new_password = async({user_id, token, password}, ctx) => {
|
|
21
22
|
const User = mongoose.model("User")
|