@rpcbase/server 0.83.0 → 0.87.0

package/database.js

@@ -1,7 +1,14 @@
 /* @flow */
-const mongoose = require("mongoose")
 const isPort = require("validator/lib/isPort")
 
+const mongoose = require("./mongoose")
+
+// load internal models
+require("./src/models/User")
+require("./src/models/Invite")
+require("./src/models/ResetPasswordToken")
+
+
 const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
 
 

package/mailer/index.js

@@ -3,7 +3,7 @@ const postmark = require("postmark")
 
 const {POSTMARK_API_KEY, IS_PRODUCTION} = process.env
 
-const is_production = true //IS_PRODUCTION === "yes"
+const is_production = IS_PRODUCTION === "yes"
 console.warn("email sender forcing is production")
 
 let client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.83.0",
+  "version": "0.87.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,10 +10,10 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rpcbase/agent": "0.9.0",
+    "@rpcbase/agent": "0.10.0",
     "@rpcbase/std": "0.3.0",
     "body-parser": "1.20.0",
-    "bull": "4.8.4",
+    "bull": "4.8.5",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
     "debug": "4.3.4",
@@ -22,7 +22,7 @@
     "express-session": "1.17.3",
     "glob": "8.0.3",
     "lodash": "4.17.21",
-    "mongoose": "6.4.3",
+    "mongoose": "6.5.1",
     "picocolors": "1.0.0",
     "postmark": "3.0.12",
     "redis": "4.2.0",

package/src/auth/index.js

@@ -8,6 +8,7 @@ const reset_password = require("./reset_password")
 const set_new_password = require("./set_new_password")
 const check_session = require("./check_session")
 
+
 const sign_up_handler = async(req, res) => {
   const result = await sign_up(req.body, {req})
   res.json(result)

package/src/auth/sign_in.js

@@ -27,6 +27,7 @@ const sign_in = async({email, password}, ctx) => {
   const is_match = await compare_hash(password, hashed_pass)
 
   if (is_match) {
+    console.log("is match, user signed in wow")
     req.session.user_id = user._id.toString()
     await req.session.save()
     return {

package/src/auth/sign_up.js

@@ -3,6 +3,8 @@ const {hash_password} = require("@rpcbase/std/crypto/hash")
 
 const mongoose = require("../../mongoose")
 
+const HAS_INVITES = process.env.AUTH_DISABLE_INVITES !== "true"
+
 const sign_up = async({email, password}, ctx) => {
   const User = mongoose.model("User")
   const Invite = mongoose.model("Invite")
@@ -20,18 +22,22 @@ const sign_up = async({email, password}, ctx) => {
   }
 
   // check if we have an invite for this user
-  const invite = await Invite.findOne({email}, null, {ctx})
-  if (invite && !invite.is_ready) {
-    console.log("found an invite, but not ready", email)
-    return {
-      status: "error",
-      message: "Your invite is still pending approval. Expect an email in the next weeks to activate your account."
-    }
-  } else if (!invite) {
-    console.log("no invite for signup email:", email)
-    return {
-      status: "error",
-      message: "No valid invite was found for this email"
+  if (HAS_INVITES) {
+    const invite = await Invite.findOne({email}, null, {ctx})
+
+    // TODO: mark invite as accepted here
+    if (invite && !invite.is_ready) {
+      console.log("found an invite, but not ready", email)
+      return {
+        status: "error",
+        message: "Your invite is still pending approval. Expect an email in the next weeks to activate your account."
+      }
+    } else if (!invite) {
+      console.log("no invite for signup email:", email)
+      return {
+        status: "error",
+        message: "No valid invite was found for this email"
+      }
     }
   }
 

package/src/models/Invite.js

@@ -0,0 +1,23 @@
+/* @flow */
+const mongoose = require("../../mongoose")
+
+const Invite = mongoose.model("Invite", {
+  email: String,
+  email_hash: String, // TODO: unused field?
+  token: String,
+  expires: Date,
+  is_ready: {
+    type: Boolean,
+    default: false,
+  },
+  is_sent: {
+    type: Boolean,
+    default: false,
+  },
+  is_accepted: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+module.exports = Invite

package/src/models/User.js

@@ -0,0 +1,17 @@
+/* @flow */
+const mongoose = require("../../mongoose")
+
+const User = mongoose.model("User", {
+  name: {
+    type: String,
+    default: "",
+  },
+  email: String,
+  is_email_verified: {
+    type: Boolean,
+    default: false,
+  },
+  password_hash: String,
+})
+
+module.exports = User