@rpcbase/server 0.91.0 → 0.94.0

package/cli/run_native.js

@@ -53,6 +53,11 @@ const init_processes = (args) => {
       // yarn dev
       cmd: ["yarn", ["dev"]]
     },
+    {
+      name: "queue",
+      dirs: [],
+      cmd: ["yarn", ["dev-queue"]]
+    },
     // mongodb database
     {
       name: "database",

package/express/session_middleware.js

@@ -1,9 +1,12 @@
 /* @flow */
+const debug = require("debug")
 const session = require("express-session")
 const validator = require("validator")
 const {createClient} = require("redis")
 const redis_store = require("connect-redis")(session)
 
+const log = debug("rb:session")
+
 // WARNING:
 // https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
 // https://github.com/redis/node-redis/issues/1656/
@@ -27,9 +30,9 @@ setTimeout(async() => {
   }
 
   const reconnectStrategy = (retries) => {
-    console.log("redis_client::reconnectStrategy::retrying with arg", retries)
+    log("redis_client::reconnectStrategy::retrying with arg", retries)
     if (retries < 5) {
-      console.log("retry count:", retries, "retrying in 1s")
+      log("retry count:", retries, "retrying in 1s")
       return 4000
     } else {
       return new Error("max retries expiered")
@@ -47,9 +50,8 @@ setTimeout(async() => {
     legacyMode: true,
   })
 
-
   redis_client.on("ready", () => {
-    console.log("session-storage::redis_client connected")
+    log("session-storage::redis_client connected")
   })
 
   const res = await redis_client.connect()
@@ -69,7 +71,7 @@ setTimeout(async() => {
   })
 
 // TODO: is this still necessary
-}, 300)
+}, 200)
 
 
 module.exports = (req, res, next) => {
@@ -80,6 +82,6 @@ module.exports = (req, res, next) => {
   if (session_middleware) {
     session_middleware(req, res, next)
   } else {
-    console.warn("session middleware not set yet")
+    warn("session middleware not set yet")
   }
 }

package/package.json

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

package/src/auth/check_session.js

@@ -1,10 +1,19 @@
 /* @flow */
+const debug = require("debug")
+
+
+const log = debug("rb:auth:check_session")
+
 
 const check_session = async(payload, ctx) => {
   const {req} = ctx
-  // console.log("session check", req.session)
+
+  log("session:", req.session)
 
   const is_signed_in = !!req.session.user_id
+
+  log("is_signed_in:", is_signed_in)
+
   return {
     status: "ok",
     is_signed_in,

package/src/auth/sign_in.js

@@ -1,8 +1,12 @@
 /* @flow */
 const {compare_hash} = require("@rpcbase/std/crypto/hash")
+const debug = require("debug")
 
 const mongoose = require("../../mongoose")
 
+
+const log = debug("rb:auth:signin")
+
 const fail = () => ({
   errors: {form: "Invalid email or password"}
 })
@@ -13,8 +17,6 @@ const sign_in = async({email, password}, ctx) => {
   const {req} = ctx
 
   // find the matching user
-  // TODO: document ctx param
-  // const user = await User.findOne({email}, null, {ctx})
   const user = await User.findOne({email}, null)
 
   if (!user) {
@@ -26,13 +28,20 @@ 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")
+    log("compare_hash is match")
+
+    req.session.user_id = user._id.toString()
     await req.session.save()
-    console.log("rb:auth:user_signed_in")
+
+    log("session saved, user is signed in")
+
     return {
       status: "ok"
     }
+
   } else {
+    log("no match, returning error")
+
     return fail()
   }
 }