@rpcbase/server 0.249.0 → 0.251.0

package/boot/shared.js

@@ -1,6 +1,8 @@
 /* @flow */
 require("./setup_env")
 
+require("../src/helpers/expect_ext")
+
 const mongoose = require("../mongoose")
 require("@rpcbase/access-control")(mongoose)
 

package/index.js

@@ -5,6 +5,8 @@ const express = require("./express")
 const firebase = require("./firebase")
 const client_router = require("./src/client/client_router")
 const rpc_router = require("./src/rpc/rpc_router")
+const sign_up = require("./src/auth/sign_up")
+
 
 module.exports = {
   queue,
@@ -13,4 +15,5 @@ module.exports = {
   firebase,
   client_router,
   rpc_router,
+  sign_up,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.249.0",
+  "version": "0.251.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/src/auth/index.js

@@ -9,11 +9,6 @@ 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})
-  res.json(result)
-}
-
 const sign_in_handler = async(req, res) => {
   const result = await sign_in(req.body, {req, res})
   res.json(result)
@@ -40,7 +35,6 @@ const check_session_handler = async(req, res) => {
 }
 
 module.exports = (app) => {
-  app.post("/api/v1/auth/sign_up", async_wrapper(sign_up_handler))
   app.post("/api/v1/auth/sign_in", async_wrapper(sign_in_handler))
   app.post("/api/v1/auth/sign_out", async_wrapper(sign_out_handler))
 

package/src/auth/sign_in.js

@@ -15,6 +15,7 @@ const fail = () => ({
   errors: {form: "Invalid email or password"}
 })
 
+
 const sign_in = async({email, password}, ctx) => {
   const User = mongoose.model("User")
 

package/src/auth/sign_up.js

@@ -5,38 +5,33 @@ const get_object_id = require("../../get_object_id")
 
 const mongoose = require("../../mongoose")
 
-const sign_up = async({email, password}, ctx) => {
+const MIN_PASSWORD_LENGTH = 12
+
+const sign_up = async(payload, ctx, session) => {
+  const {email, password} = payload
+  expect(email).toBeEmail()
+  expect(password.length).toBeGreaterThanOrEqual(MIN_PASSWORD_LENGTH)
+
   const User = mongoose.model("User")
   const Invite = mongoose.model("Invite")
 
-  const {req} = ctx
-
   // check if the user already exists
-  const existing_user = await User.findOne({email}, null, {ctx})
+  const existing_user = await User.findOne({email}, null, {ctx, session})
 
   if (existing_user) {
-    return {
-      status: "error",
-      message: "User already exists"
-    }
+    throw new Error("User already exists")
   }
 
   // check if we have an invite for this user
-  const invite = await Invite.findOne({email}, null, {ctx})
+  const invite = await Invite.findOne({email}, null, {ctx, session})
 
-  // TODO: mark invite as accepted here
+  // TODO: mark invite as accepted here so it can't be reused
   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."
-    }
+    throw new Error("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 invite was found for this email"
-    }
+    throw new Error("No invite was found for this email")
   }
 
   const hash = await hash_password(password)
@@ -49,15 +44,11 @@ const sign_up = async({email, password}, ctx) => {
 
   // sign the user in
   const user_id = user._id.toString()
-  req.session.user_id = user_id
 
-  // await req.session.save()
-  await user.save({ctx})
+  // WARNING: it is now the responsibility of the app to add user.save with session
+  // await user.save({ctx})
 
-  return {
-    status: "ok",
-    user_id,
-  }
+  return user
 }
 
 module.exports = sign_up

package/src/helpers/expect_ext.js

@@ -0,0 +1,42 @@
+/* @flow */
+const {expect} = require("expect")
+
+const isMongoId = require("validator/lib/isMongoId")
+const isEmail = require("validator/lib/isEmail")
+
+
+expect.extend({
+  toBeMongoId: (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: (actual) => {
+    const pass = 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