@rpcbase/server 0.358.0 → 0.360.0

package/boot/shared.js

@@ -5,7 +5,7 @@ if (typeof __RB_IS_WEBPACK__ === "undefined") {
 
 require("./setup_env")
 
-require("../extend-expect")
+require("@rpcbase/std/extend-expect")
 
 const mongoose = require("../mongoose")
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.358.0",
+  "version": "0.360.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {
@@ -69,12 +69,10 @@
     "cors": "2.8.5",
     "debug": "4.3.6",
     "dotenv": "16.4.5",
-    "expect": "29.7.0",
     "express": "4.19.2",
     "express-session": "1.18.0",
     "firebase-admin": "12.3.0",
     "glob": "11.0.0",
-    "jest-extended": "4.0.2",
     "lodash": "4.17.21",
     "mkdirp": "3.0.1",
     "mongoose": "8.5.2",

package/src/auth/get_account.js

@@ -2,14 +2,13 @@
 const assert = require("assert")
 
 const mongoose = require("../../mongoose")
+const User = require("../models/User")
 
 
 const get_account = async(payload, ctx) => {
   const {user_id} = payload
   assert(user_id, "missing user_id")
 
-  const User = mongoose.model("User")
-
   // verify we are only requesting our own account's info
   const session_user_id = ctx.req.session.user_id
   assert(user_id === session_user_id, "user ids don't match")

package/src/auth/reset_password.js

@@ -10,7 +10,9 @@ const get_random_str = require("@rpcbase/std/crypto/get_random_str")
 
 const mailer = require("../../mailer")
 const mongoose = require("../../mongoose")
+
 const ResetPasswordToken = require("../models/ResetPasswordToken")
+const User = require("../models/User")
 
 const log = debug("rb:auth:reset_password")
 
@@ -20,8 +22,6 @@ const email_tpl = _template(require("./forgot_password_email.html"))
 
 
 const reset_password = async({email}, ctx) => {
-  const User = mongoose.model("User")
-
   if (!isEmail(email)) {
     throw new Error("reset_password:: invalid email")
   }

package/src/auth/set_new_password.js

@@ -13,13 +13,13 @@ const mongoose = require("../../mongoose")
 const set_new_password_email = require("./set_new_password_email.html")
 
 const ResetPasswordToken = require("../models/ResetPasswordToken")
+const User = require("../models/User")
 
 const {APP_DOMAIN} = process.env
 
 const email_tpl = _template(set_new_password_email)
 
 const set_new_password = async({user_id, token, password}, ctx) => {
-  const User = mongoose.model("User")
 
   const reset_tokens = await ResetPasswordToken.find({user_id})
     .limit(100)

package/src/auth/sign_in.js

@@ -3,6 +3,7 @@ const {compare_hash} = require("@rpcbase/std/crypto/hash")
 const debug = require("debug")
 
 const mongoose = require("../../mongoose")
+const User = require("../models/User")
 
 
 const log = debug("rb:auth:signin")
@@ -17,8 +18,6 @@ const fail = () => ({
 
 
 const sign_in = async({email, password}, ctx) => {
-  const User = mongoose.model("User")
-
   const {req, res} = ctx
 
   // find matching user

package/src/auth/sign_up.js

@@ -1,9 +1,9 @@
 /* @flow */
 const {hash_password} = require("@rpcbase/std/crypto/hash")
 
-const mongoose = require("../../mongoose")
-
 const UserStoredValues = require("../models/UserStoredValues")
+const User = require("../models/User")
+const Invite = require("../models/Invite")
 
 const MIN_PASSWORD_LENGTH = 12
 
@@ -12,9 +12,6 @@ const sign_up = async(payload, ctx, session) => {
   expect(email).toBeEmail()
   expect(password.length).toBeGreaterThanOrEqual(MIN_PASSWORD_LENGTH)
 
-  const User = mongoose.model("User")
-  const Invite = mongoose.model("Invite")
-
   // check if the user already exists
   const existing_user = await User.findOne({email}, null, {ctx, session})
 

package/extend-expect/index.js

@@ -1,7 +0,0 @@
-/* @flow */
-// WARNING: must be first import here
-require("./mactchers")
-
-// add all jest-extended matchers
-const matchers = require("jest-extended")
-expect.extend(matchers)

package/extend-expect/mactchers.js

@@ -1,42 +0,0 @@
-/* @flow */
-const {expect} = require("expect")
-
-const isMongoId = require("validator/lib/isMongoId")
-const isEmail = require("validator/lib/isEmail")
-
-
-expect.extend({
-  toBeMongoId: function(actual) {
-    const pass = isMongoId(actual)
-
-    if (pass) {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} not to be a valid mongoId`,
-        pass: true,
-      }
-    } else {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} to be a valid mongoId`,
-        pass: false,
-      }
-    }
-  },
-  toBeEmail: function(actual) {
-    const pass = actual && isEmail(actual)
-
-    if (pass) {
-      return {
-        message: () =>
-          `expected ${this.utils.printReceived(actual)} not to be a valid email address`,
-        pass: true,
-      }
-    } else {
-      return {
-        message: () => `expected ${this.utils.printReceived(actual)} to be a valid email address`,
-        pass: false,
-      }
-    }
-  },
-})
-
-global.expect = expect