notherbase-fs 4.5.4 → 4.5.6

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.
Files changed (4) hide show
  1. package/notherbase-fs.js +1 -1
  2. package/package.json +1 -1
  3. package/server/creation.js +7 -8
  4. package/server/user.js +231 -177
package/notherbase-fs.js CHANGED
@@ -101,7 +101,7 @@ class NotherBaseFS {
101
101
  req.Spirit = Spirit;
102
102
  req.SendMail = SendMail;
103
103
  req.globals = globals;
104
- req.user = req.session?.currentUser ? await req.Spirit.findOne({ service: "user", username: req.session.currentUser }) : null;
104
+ req.user = req.session?.currentUser ? await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser }) : null;
105
105
  req.lock = false;
106
106
  // enables sessions only if the protocol is https and we are in production, or if we are in development
107
107
  req.sessionsEnabled = (process.env.PRODUCTION == "true" && req.secure) || process.env.PRODUCTION == "false";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "notherbase-fs",
3
- "version": "4.5.4",
3
+ "version": "4.5.6",
4
4
  "description": "Functions to help make developing for NotherBase easier.",
5
5
  "exports": "./notherbase-fs.js",
6
6
  "scripts": {
package/server/creation.js CHANGED
@@ -58,7 +58,7 @@ export default class Creation {
58
58
  req.toRender = "explorer";
59
59
 
60
60
  if (fs.existsSync(req.main + ".ejs")) {
61
- let stats = await req.Spirit.findOne({ service: "stats", data: { route: req.path } });
61
+ let stats = await req.Spirit.findOne({ service: "stats", "data.route": req.path });
62
62
  if (stats == null) stats = new req.Spirit({ service: "stats", data: { route: req.path, visits: 0 } });
63
63
  if (stats.data.visits) stats.data.visits++;
64
64
  else stats.data.visits = 1;
@@ -75,14 +75,13 @@ export default class Creation {
75
75
  }
76
76
 
77
77
  if (req.session.currentUser) {
78
- let user = req.user;
79
78
  context.user = {
80
- data: user.data,
81
- backups: user.backups,
82
- _id: user._id,
83
- parent: user.parent,
84
- service: user.service,
85
- _lastUpdate: user._lastUpdate
79
+ data: req.user.data,
80
+ backups: req.user.backups,
81
+ _id: req.user._id,
82
+ parent: req.user.parent,
83
+ service: req.user.service,
84
+ _lastUpdate: req.user._lastUpdate
86
85
  }
87
86
  }
88
87
 
package/server/user.js CHANGED
@@ -28,12 +28,17 @@ export default class User {
28
28
  * @param {Object} res An Express.js response.
29
29
  */
30
30
  logout = async (req, res) => {
31
- if (loginCheck(req, res)) {
32
- delete req.user?.data?.sessions[req.session.id];
33
- await req.user.commit();
34
- await req.session?.destroy();
31
+ try {
32
+ if (loginCheck(req, res)) {
33
+ delete req.user?.data?.sessions[req.session.id];
34
+ await req.user.commit();
35
+ await req.session?.destroy();
35
36
 
36
- success(res, "Logged out.");
37
+ success(res, "Logged out.");
38
+ }
39
+ } catch (error) {
40
+ console.log(error);
41
+ fail(res, "Server error");
37
42
  }
38
43
  }
39
44
 
@@ -43,49 +48,57 @@ export default class User {
43
48
  * @param {Object} res An Express.js response.
44
49
  */
45
50
  changePassword = async (req, res) => {
46
- if (loginCheck(req, res)) {
47
- let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });
51
+ try {
52
+ if (loginCheck(req, res)) {
53
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
54
+ console.log(spirit);
55
+
48
56
 
49
- if (check(res, spirit, "User not found!") &&
50
- check(res, req.body.newPassword === req.body.confirmation, "New password and confirmation must match!") &&
51
- check(res, req.body.oldPassword != req.body.newPassword, "New password must be different from the old one."))
52
- {
53
- let passResult = await bcrypt.compare(req.body.oldPassword, spirit.data.password);
57
+ if (check(res, spirit, "User not found!") &&
58
+ check(res, req.body.newPassword === req.body.confirmation, "New password and confirmation must match!") &&
59
+ check(res, req.body.oldPassword != req.body.newPassword, "New password must be different from the old one."))
60
+ {
61
+ let passResult = await bcrypt.compare(req.body.oldPassword, spirit.data.password);
54
62
 
55
- if (check(res, passResult, "Old password incorrect.")) {
56
- const salt = await bcrypt.genSalt(10);
57
- const hash = await bcrypt.hash(req.body.newPassword, salt);
58
-
59
- spirit.addBackup({
60
- ...spirit.data,
61
- password: hash
62
- });
63
-
64
- await spirit.commit();
65
-
66
- success(res, "Password changed successfully!");
63
+ if (check(res, passResult, "Old password incorrect.")) {
64
+ const salt = await bcrypt.genSalt(10);
65
+ const hash = await bcrypt.hash(req.body.newPassword, salt);
66
+
67
+ spirit.data.password = hash;
68
+ await spirit.commit();
69
+
70
+ success(res, "Password changed successfully!");
71
+ }
67
72
  }
68
73
  }
74
+ } catch (error) {
75
+ console.log(error);
76
+ fail(res, "Server error");
69
77
  }
70
78
  }
71
79
 
72
80
  validatePassword = async (req, password, user) => {
73
- if (password && user?.data?.otp) {
74
- if (password == user.data.otp.code) {
75
- if (Date.now() < user.data.otp.expires) {
76
- user.data.otp.expires = 0;
77
- await user.commit();
78
- return "Authenticated.";
81
+ try {
82
+ if (password && user?.data?.otp) {
83
+ if (password == user.data.otp.code) {
84
+ if (Date.now() < user.data.otp.expires) {
85
+ user.data.otp.expires = 0;
86
+ await user.commit();
87
+ return "Authenticated.";
88
+ }
89
+ else return "One-time password expired.";
90
+ }
91
+ else {
92
+ let passResult = await bcrypt.compare(req.body.password, user.data.password);
93
+ if (passResult) return "Authenticated.";
94
+ else return "Password doesn't match the username.";
79
95
  }
80
- else return "One-time password expired.";
81
- }
82
- else {
83
- let passResult = await bcrypt.compare(req.body.password, user.data.password);
84
- if (passResult) return "Authenticated.";
85
- else return "Password doesn't match the username.";
86
96
  }
97
+ else return "Password error.";
98
+ } catch (error) {
99
+ console.log(error);
100
+ fail(res, "Server error");
87
101
  }
88
- else return "Password error.";
89
102
  }
90
103
 
91
104
  /**
@@ -94,29 +107,30 @@ export default class User {
94
107
  * @param {Object} res An Express.js response.
95
108
  */
96
109
  changeEmail = async (req, res) => {
97
- if (loginCheck(req, res)) {
98
- let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });
110
+ try {
111
+ if (loginCheck(req, res)) {
112
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
99
113
 
100
- if (check(res, spirit, "User not found!") &&
101
- check(res, req.body.email, "New email must be provided."))
102
- {
103
- let result = await this.validatePassword(req, req.body.password, spirit);
104
- if (result == "Authenticated.") {
105
- let other = await req.Spirit.findOne({ service: "user", email: req.body.email });
106
-
107
- if (check(res, !other, "Email already in use!")) {
108
- spirit.addBackup({
109
- ...spirit.data,
110
- email: req.body.email
111
- });
112
-
113
- await spirit.commit();
114
-
115
- success(res, "Email changed successfully!");
114
+ if (check(res, spirit, "User not found!") &&
115
+ check(res, req.body.email, "New email must be provided."))
116
+ {
117
+ let result = await this.validatePassword(req, req.body.password, spirit);
118
+ if (result == "Authenticated.") {
119
+ let other = await req.Spirit.findOne({ service: "user", "data.email": req.body.email });
120
+
121
+ if (check(res, !other, "Email already in use!")) {
122
+ spirit.data.email = req.body.email;
123
+ await spirit.commit();
124
+
125
+ success(res, "Email changed successfully!");
126
+ }
116
127
  }
128
+ else fail(res, result);
117
129
  }
118
- else fail(res, result);
119
130
  }
131
+ } catch (error) {
132
+ console.log(error);
133
+ fail(res, "Server error");
120
134
  }
121
135
  }
122
136
 
@@ -126,26 +140,31 @@ export default class User {
126
140
  * @param {Object} res An Express.js response.
127
141
  */
128
142
  sendOneTimePassword = async (req, res) => {
129
- if (loginCheck(req, res)) {
130
- let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });
143
+ try {
144
+ if (loginCheck(req, res)) {
145
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
131
146
 
132
- if (check(res, spirit, "User not found!")) {
133
- let otp = Math.floor(100000 + Math.random() * 900000);
134
- spirit.data.otp = {
135
- code: otp,
136
- expires: Date.now() + 1000 * 60 * 15
137
- }
138
-
139
- await spirit.commit();
147
+ if (check(res, spirit, "User not found!")) {
148
+ let otp = Math.floor(100000 + Math.random() * 900000);
149
+ spirit.data.otp = {
150
+ code: otp,
151
+ expires: Date.now() + 1000 * 60 * 15
152
+ }
153
+
154
+ await spirit.commit();
140
155
 
141
- await req.SendMail.send(spirit.data.email, 'One Time Password for NotherBase',
142
- `<h1>Your One-Time Password:<h1>
143
- <h2>${otp}<h2>
144
- <p>Visit <a href="https://www.notherbase.com/the-front/keeper">notherbase.com/the-front/keeper</a> to use your one-time password.</p>
145
- <p>This one-time password expires in 15 minutes.<p>`);
146
-
147
- success(res, "One-time password sent.");
156
+ await req.SendMail.send(spirit.data.email, 'One Time Password for NotherBase',
157
+ `<h1>Your One-Time Password:<h1>
158
+ <h2>${otp}<h2>
159
+ <p>Visit <a href="https://www.notherbase.com/the-front/keeper">notherbase.com/the-front/keeper</a> to use your one-time password.</p>
160
+ <p>This one-time password expires in 15 minutes.<p>`);
161
+
162
+ success(res, "One-time password sent.");
163
+ }
148
164
  }
165
+ } catch (error) {
166
+ console.log(error);
167
+ fail(res, "Server error");
149
168
  }
150
169
  }
151
170
 
@@ -155,36 +174,41 @@ export default class User {
155
174
  * @param {Object} res An Express.js response.
156
175
  */
157
176
  register = async (req, res) => {
158
- if (check(res, req.body.password.length > 10, "Password must be >10 characters long.") &&
159
- check(res, req.body.username.length > 2, "Username too short."))
160
- {
161
- let spirit = await req.Spirit.findOne({ service: "user", username: req.body.username });
162
-
163
- if (check(res, !spirit, "Username already in use!")) {
164
- const salt = await bcrypt.genSalt(10);
165
- const hash = await bcrypt.hash(req.body.password, salt);
177
+ try {
178
+ if (check(res, req.body.password.length > 10, "Password must be >10 characters long.") &&
179
+ check(res, req.body.username.length > 2, "Username too short."))
180
+ {
181
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.body.username });
182
+
183
+ if (check(res, !spirit, "Username already in use!")) {
184
+ const salt = await bcrypt.genSalt(10);
185
+ const hash = await bcrypt.hash(req.body.password, salt);
166
186
 
167
- spirit = new req.Spirit({
168
- service:"user",
169
- _lastUpdate: Date.now(),
170
- data: {
171
- username: req.body.username,
172
- password: hash,
173
- authLevels: [ "Basic" ],
174
- view: "compact",
175
- email: "",
176
- otp: {
177
- code: "",
178
- expires: 0
187
+ spirit = new req.Spirit({
188
+ service:"user",
189
+ _lastUpdate: Date.now(),
190
+ data: {
191
+ username: req.body.username,
192
+ password: hash,
193
+ authLevels: [ "Basic" ],
194
+ view: "compact",
195
+ email: "",
196
+ otp: {
197
+ code: "",
198
+ expires: 0
199
+ },
200
+ sessions: {}
179
201
  },
180
- sessions: {}
181
- },
182
- backups: []
183
- });
184
- await spirit.save();
185
-
186
- success(res, "Registration successful!");
202
+ backups: []
203
+ });
204
+ await spirit.save();
205
+
206
+ success(res, "Registration successful!");
207
+ }
187
208
  }
209
+ } catch (error) {
210
+ console.log(error);
211
+ fail(res, "Server error");
188
212
  }
189
213
  }
190
214
 
@@ -194,32 +218,37 @@ export default class User {
194
218
  * @param {Object} res An Express.js response.
195
219
  */
196
220
  login = async (req, res) => {
197
- let spirit = await req.Spirit.findOne({ service: "user", username: req.body.username });
198
- if (check(res, spirit, "User not found.")) {
199
- spirit.data = {
200
- username: "",
201
- password: "",
202
- authLevels: [ "Basic" ],
203
- view: "compact",
204
- email: "",
205
- otp: {
206
- code: "",
207
- expires: 0
208
- },
209
- sessions: {},
210
- ...spirit.data
211
- }
212
- await spirit.commit();
213
-
214
- let result = await this.validatePassword(req, req.body.password, spirit);
215
- if (result === "Authenticated.") {
216
- req.session.currentUser = req.body.username;
217
- if (typeof spirit.data.sessions !== "object" || Array.isArray(spirit.data.sessions)) spirit.data.sessions = {};
218
- spirit.data.sessions[req.session.id] = Date.now() + 1000 * 60 * 60 * 24 * 28; // 28 days
221
+ try {
222
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.body.username });
223
+ if (check(res, spirit, "User not found.")) {
224
+ spirit.data = {
225
+ username: "",
226
+ password: "",
227
+ authLevels: [ "Basic" ],
228
+ view: "compact",
229
+ email: "",
230
+ otp: {
231
+ code: "",
232
+ expires: 0
233
+ },
234
+ sessions: {},
235
+ ...spirit.data
236
+ }
219
237
  await spirit.commit();
220
- success(res, "Login successful!", req.body.username);
238
+
239
+ let result = await this.validatePassword(req, req.body.password, spirit);
240
+ if (result === "Authenticated.") {
241
+ req.session.currentUser = req.body.username;
242
+ if (typeof spirit.data.sessions !== "object" || Array.isArray(spirit.data.sessions)) spirit.data.sessions = {};
243
+ spirit.data.sessions[req.session.id] = Date.now() + 1000 * 60 * 60 * 24 * 28; // 28 days
244
+ await spirit.commit();
245
+ success(res, "Login successful!", req.body.username);
246
+ }
247
+ else fail(res, result);
221
248
  }
222
- else fail(res, result);
249
+ } catch (error) {
250
+ console.log(error);
251
+ fail(res, "Server error");
223
252
  }
224
253
  }
225
254
 
@@ -229,22 +258,27 @@ export default class User {
229
258
  * @param {Object} res An Express.js response.
230
259
  */
231
260
  deletePermanently = async (req, res) => {
232
- if (loginCheck(req, res)) {
233
- let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });
261
+ try {
262
+ if (loginCheck(req, res)) {
263
+ let spirit = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
234
264
 
235
- if (check(res, spirit, "User not found.")) {
236
- let passResult = await bcrypt.compare(req.body.password, spirit.data.password);
265
+ if (check(res, spirit, "User not found.")) {
266
+ let passResult = await bcrypt.compare(req.body.password, spirit.data.password);
237
267
 
238
- if (check(res, passResult, "Password doesn't match the username.")) {
239
- let deleted = await req.Spirit.deleteMany({ service: "user", username: req.session.username });
240
-
241
- if (check(res, deleted > 0, "No account deleted")) {
242
- await req.session.destroy();
268
+ if (check(res, passResult, "Password doesn't match the username.")) {
269
+ let deleted = await req.Spirit.deleteMany({ service: "user", "data.username": req.session.currentUser });
243
270
 
244
- success(res, "Account deleted.");
271
+ if (check(res, deleted > 0, "No account deleted")) {
272
+ await req.session.destroy();
273
+
274
+ success(res, "Account deleted.");
275
+ }
245
276
  }
246
277
  }
247
278
  }
279
+ } catch (error) {
280
+ console.log(error);
281
+ fail(res, "Server error");
248
282
  }
249
283
  }
250
284
 
@@ -254,81 +288,101 @@ export default class User {
254
288
  * @param {Object} res An Express.js response.
255
289
  */
256
290
  getInfo = async (req, res) => {
257
- if (loginCheck(req, res)) {
258
- let user = await req.Spirit.findOne({ service: "user", username: req.session.username });
259
-
260
- if (check(res, user, "Account not found!")) {
261
- success(res, "Info found", {
262
- username: user.data.username
263
- });
291
+ try {
292
+ if (loginCheck(req, res)) {
293
+ let user = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
294
+
295
+ if (check(res, user, "Account not found!")) {
296
+ success(res, "Info found", {
297
+ username: user.data.username
298
+ });
299
+ }
264
300
  }
301
+ } catch (error) {
302
+ console.log(error);
303
+ fail(res, "Server error");
265
304
  }
266
305
  }
267
306
 
268
307
  //download all spirit data belonging to the user
269
308
  downloadData = async (req, res) => {
270
- if (loginCheck(req, res)) {
271
- let user = await req.Spirit.findOne({ service: "user", username: req.session.username });
309
+ try {
310
+ if (loginCheck(req, res)) {
311
+ let user = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
272
312
 
273
- if (check(res, user, "Account not found!")) {
274
- let data = await req.Spirit.find({ parent: user._id });
275
- let dataToDownload = data.map(d => d);
313
+ if (check(res, user, "Account not found!")) {
314
+ let data = await req.Spirit.find({ parent: user._id });
315
+ let dataToDownload = data.map(d => d);
276
316
 
277
- successJSON(res, "Data Downloaded", dataToDownload);
317
+ successJSON(res, "Data Downloaded", dataToDownload);
318
+ }
278
319
  }
320
+ } catch (error) {
321
+ console.log(error);
322
+ fail(res, "Server error");
279
323
  }
280
324
  }
281
325
 
282
326
  //delete all spirit data belonging to the user
283
327
  deleteAlldata = async (req, res) => {
284
- if (loginCheck(req, res)) {
285
- let user = await req.Spirit.findOne({ service: "user", username: req.session.username });
328
+ try {
329
+ if (loginCheck(req, res)) {
330
+ let user = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
286
331
 
287
- if (check(res, user, "Account not found!")) {
288
- if (check(res, req.body.password, "Password error.")) {
289
- let passResult = await bcrypt.compare(req.body.password, user.data.password);
332
+ if (check(res, user, "Account not found!")) {
333
+ if (check(res, req.body.password, "Password error.")) {
334
+ let passResult = await bcrypt.compare(req.body.password, user.data.password);
290
335
 
291
- if (check(res, passResult, "Password doesn't match the username.")) {
292
- let deleted = await req.Spirit.deleteMany({ parent: user._id });
293
- if (check(res, deleted > 0, "No data deleted")) {
294
- success(res, "Data Deleted", deleted);
336
+ if (check(res, passResult, "Password doesn't match the username.")) {
337
+ let deleted = await req.Spirit.deleteMany({ parent: user._id });
338
+ if (check(res, deleted > 0, "No data deleted")) {
339
+ success(res, "Data Deleted", deleted);
340
+ }
295
341
  }
296
342
  }
297
343
  }
298
344
  }
345
+ } catch (error) {
346
+ console.log(error);
347
+ fail(res, "Server error");
299
348
  }
300
349
  }
301
350
 
302
351
  // import spirit data from a JSON file
303
352
  importData = async (req, res) => {
304
- if (loginCheck(req, res)) {
305
- let user = await req.Spirit.findOne({ service: "user", username: req.session.username });
353
+ try {
354
+ if (loginCheck(req, res)) {
355
+ let user = await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser });
306
356
 
307
- if (check(res, user, "Account not found!")) {
308
- if (check(res, req.body.password, "Password error.")) {
309
- let passResult = await bcrypt.compare(req.body.password, user.data.password);
357
+ if (check(res, user, "Account not found!")) {
358
+ if (check(res, req.body.password, "Password error.")) {
359
+ let passResult = await bcrypt.compare(req.body.password, user.data.password);
310
360
 
311
- if (check(res, passResult, "Password doesn't match the username.")) {
312
- let data = JSON.parse(req.body.data);
313
- let imported = 0;
314
- for (let i = 0; i < data.length; i++) {
315
- if (data[i].parent != null) {
316
- let spirit = new req.Spirit({
317
- service: data[i].service,
318
- _lastUpdate: data[i]._lastUpdate,
319
- data: data[i].data,
320
- parent: user._id,
321
- backups: data[i].backups || []
322
- });
323
- await spirit.save();
324
- if (spirit) imported++;
361
+ if (check(res, passResult, "Password doesn't match the username.")) {
362
+ let data = JSON.parse(req.body.data);
363
+ let imported = 0;
364
+ for (let i = 0; i < data.length; i++) {
365
+ if (data[i].parent != null) {
366
+ let spirit = new req.Spirit({
367
+ service: data[i].service,
368
+ _lastUpdate: data[i]._lastUpdate,
369
+ data: data[i].data,
370
+ parent: user._id,
371
+ backups: data[i].backups || []
372
+ });
373
+ await spirit.save();
374
+ if (spirit) imported++;
375
+ }
325
376
  }
326
- }
327
377
 
328
- success(res, "Data Imported", imported);
378
+ success(res, "Data Imported", imported);
379
+ }
329
380
  }
330
381
  }
331
382
  }
383
+ } catch (error) {
384
+ console.log(error);
385
+ fail(res, "Server error");
332
386
  }
333
387
  }
334
388
  }