@rpcbase/server 0.190.0 → 0.192.0

package/cli/run_docker.js

@@ -8,6 +8,7 @@ const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
 const run_docker = async(infrastructure_dir, proj_prefix) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
+  const base_env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env.base"))
 
   const exists = (f) => {
     const target_path = path.join(infrastructure_dir, f)
@@ -29,7 +30,7 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
   if (!is_production) opts.push("--abort-on-container-exit")
 
   const cmd = "docker compose"
-  const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
+  const cmd_args = ["--env-file", base_env_path, "--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
 
   console.log(cmd_args.join(" "))
 

package/package.json

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

package/src/auth/sign_up.js

@@ -3,8 +3,6 @@ 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")
@@ -22,22 +20,20 @@ const sign_up = async({email, password}, ctx) => {
   }
 
   // check if we have an invite for this user
-  if (HAS_INVITES) {
-    const invite = await Invite.findOne({email}, null, {ctx})
+  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"
-      }
+  // 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 invite was found for this email"
     }
   }