@rpcbase/server 0.221.0 → 0.223.0

package/express/custom_cors.js

@@ -2,13 +2,17 @@
 const debug = require("debug")
 const cors = require("cors")
 
+
+const log = debug("rb:cors")
+
+
 const is_production = process.env.IS_PRODUCTION === "yes"
 
 const {RB_SKIP_CORS_PATHS, APP_DOMAIN, CLIENT_PORT} = process.env
 
 const custom_cors = (app) => {
 
-  const skip_paths = (RB_SKIP_CORS_PATHS || "").split(",")
+  const skip_paths = (RB_SKIP_CORS_PATHS || "").split(",").filter((p) => !!p)
 
   // CORS
   const cors_origins = is_production ?
@@ -48,8 +52,7 @@ const custom_cors = (app) => {
       cors_origins.push(`https://${APP_DOMAIN}`)
     }
 
-
-  // console.log("setting up cors with origins", JSON.stringify(cors_origins))
+  log("cors origins", JSON.stringify(cors_origins, null, 2))
 
   const cors_middleware = cors({
     origin: cors_origins,
@@ -60,6 +63,7 @@ const custom_cors = (app) => {
   app.use((req, res, next) => {
     for (const skip_path of skip_paths) {
       if (req.url.startsWith(skip_path)) {
+        log("skip path", req.url)
         next()
         return
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.221.0",
+  "version": "0.223.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,7 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rpcbase/access-control": "0.26.0",
+    "@rpcbase/access-control": "0.27.0",
     "@rpcbase/agent": "0.30.0",
     "@rpcbase/std": "0.9.0",
     "bluebird": "3.7.2",

package/src/client/client_router.js

@@ -17,8 +17,6 @@ const is_development = process.env.NODE_ENV === "development"
 // do not serve compression in dev, the assets are only compressed in the github action
 const COMPRESSED_EXTENSIONS = is_development ? [] : Object.keys(COMPRESSED_EXTENSIONS_MAP)
 
-
-
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
 const client_build_dir = path.join(build_dir, "./client")

package/src/models/User.js

@@ -6,6 +6,11 @@ const UserSchema = new mongoose.Schema({
     type: String,
     index: true,
   },
+  is_email_verified: {
+    type: Boolean,
+    default: false,
+  },
+  password_hash: String,
   first_name: {
     type: String,
     default: "",
@@ -18,17 +23,11 @@ const UserSchema = new mongoose.Schema({
     type: String,
     default: "",
   },
-  avatar_image: {
-    type: String,
-  },
   avatar_color: {
     type: String,
   },
-  is_email_verified: {
-    type: Boolean,
-    default: false,
-  },
-  password_hash: String,
+  profile_picture: Buffer,
+  profile_picture_updated_at_ms: Number,
   devices: {
     type: Array,
     default: [],

package/src/sessions/index.js

@@ -1,16 +1,19 @@
 /* @flow */
+const pc = require("picocolors")
+
+
 const is_development = process.env.NODE_ENV === "development"
 
 module.exports = (app) => {
   const has_session_store = process.env.RB_SESSION_STORE === "yes"
 
   if (has_session_store) {
-    console.log("using session store")
+    console.log("using", pc.bold(pc.green("SESSION STORE")))
 
     const session_store_middleware = require("./session_store_middleware")
     app.use(session_store_middleware)
   } else {
-    console.log("using reverse-proxy sessions")
+    console.log("using", pc.bold(pc.red("REVERSE-PROXY SESSIONS")), "if you want to use the session store, start with the --sessions argument")
 
     // warn the user
     if (is_development) {

package/src/sessions/warning_proxy_middleware.js

@@ -1,16 +1,17 @@
 /* @flow */
 
+const {SUPPRESS_PROXY_SESSION_WARNING} = process.env
+
+const suppress_warning = SUPPRESS_PROXY_SESSION_WARNING === "yes"
 
 const warning_proxy_middleware = (req, res, next) => {
   const {host} = req.headers
 
-  if (host.startsWith("localhost:")) {
-    res.status(500)
-    res.json({status: "error", message: "are you running with the proxy address ? you shouldn't be using localhost when you are running the app with the reverse proxyy"})
-    return
-  } else {
-    next()
+  if (!suppress_warning && host.startsWith("localhost:")) {
+    console.warn("are you running with the proxy address ? you shouldn't be using localhost when you are running the app with the reverse proxyy")
   }
+
+  next()
 }
 
 module.exports = warning_proxy_middleware