@rpcbase/server 0.74.0 → 0.75.0

package/admin/README.md

@@ -1 +1 @@
-admin middleware that exposes models, schemas etc
+admin middleware that exposes the local models, schemas etc

package/bin.js

@@ -13,8 +13,6 @@ const run_agent = require("./cli/run_agent")
 
 let is_command = false
 
-console.log("PACKVER", pack.version)
-
 const args = yargs(hideBin(process.argv))
   .command("start", "runs server/infrastructure", () => {}, (args) => {
     is_command = true
@@ -29,7 +27,6 @@ const args = yargs(hideBin(process.argv))
     build_server()
   })
   .option("verbose", {
-    alias: "v",
     type: "boolean",
     default: false,
     description: "Run with verbose logging"
@@ -40,6 +37,8 @@ if (!is_command) {
   console.log("server default com22mand")
 }
 
+
+// TODO: why was this needed
 // // add helpers to ensure proper process termination
 // const exit_clean = () => {
 //   process.exit()

package/express/dev_save_coverage.js

@@ -1,10 +1,10 @@
 /* @flow */
+// TODO: replace console debug
 
-const is_production = process.env.NODE_ENV === "production"
 
+const is_production = process.env.NODE_ENV === "production"
 
 module.exports = (app) => {
-
   app.post("/api/__dev_save_coverage", (req, res) => {
     console.log("sending coverage for", req.body.path_key)
     res.json(global.__coverage__)

package/express/index.js

@@ -3,9 +3,13 @@ const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
 
+// functionality middlewares
+const auth = require("../src/auth")
+
 const dev_save_coverage = require("./dev_save_coverage")
 const session_middleware = require("./session_middleware")
 
+
 const is_production = process.env.IS_PRODUCTION === "yes"
 const {APP_DOMAIN, CLIENT_PORT} = process.env
 
@@ -57,6 +61,7 @@ module.exports = () => {
   app.get("/api/ping", (req, res) => res.json({message: "pong"}))
   app.post("/api/ping", (req, res) => res.json({message: "pong"}))
 
+  auth(app)
   dev_save_coverage(app)
 
   return app

package/express/session_middleware.js

@@ -58,9 +58,14 @@ setTimeout(async() => {
     store: new redis_store({client: redis_client}),
     proxy: true,
     saveUninitialized: false,
+    // WARNING
     // TODO: use session secret from env
     secret: "session secret wowow",
     resave: false,
+    cookie: {
+      // TODO: test this
+      maxAge: 1000 * 3600 * 24 * 100 // 100 days
+    }
   })
 
 // TODO: is this still necessary

package/index.js

@@ -1,12 +1,12 @@
 /* @flow */
-const client_router = require("./client/client_router")
 const database = require("./database")
 const express = require("./express")
-const rpc_router = require("./rpc/rpc_router")
+const client_router = require("./src/client/client_router")
+const rpc_router = require("./src/rpc/rpc_router")
 
 module.exports = {
-  client_router,
   database,
   express,
+  client_router,
   rpc_router,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.74.0",
+  "version": "0.75.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@rpcbase/agent": "0.9.0",
-    "@rpcbase/std": "0.2.0",
+    "@rpcbase/std": "0.3.0",
     "body-parser": "1.20.0",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",

package/src/auth/check_session.js

@@ -0,0 +1,15 @@
+/* @flow */
+
+const check_session = async(payload, ctx) => {
+  const {req} = ctx
+  // console.log("session check", req.session)
+
+  const is_signed_in = !!req.session.user_id
+  return {
+    status: "ok",
+    is_signed_in,
+    user_id: req.session.user_id,
+  }
+}
+
+module.exports = check_session

package/src/auth/index.js

@@ -0,0 +1,35 @@
+/* @flow */
+const async_wrapper = require("../helpers/async_wrapper")
+
+const sign_up = require("./sign_up")
+const sign_in = require("./sign_in")
+const sign_out = require("./sign_out")
+const check_session = require("./check_session")
+
+const sign_up_handler = async(req, res) => {
+  const result = await sign_up(req.body, {req})
+  res.json(result)
+}
+
+const sign_in_handler = async(req, res) => {
+  const result = await sign_in(req.body, {req})
+  res.json(result)
+}
+
+const sign_out_handler = async(req, res) => {
+  const result = await sign_out(req.body, {req})
+  res.json(result)
+}
+
+const check_session_handler = async(req, res) => {
+  const result = await check_session(req.body, {req})
+  res.json(result)
+}
+
+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))
+
+  app.post("/api/v1/auth/check_session", async_wrapper(check_session_handler))
+}

package/src/auth/sign_out.js

@@ -0,0 +1,11 @@
+/* @flow */
+
+const sign_out = async(payload, ctx) => {
+  const {req} = ctx
+  await req.session.destroy()
+  return {
+    status: "ok"
+  }
+}
+
+module.exports = sign_out

package/src/client/README.md

@@ -0,0 +1,2 @@
+client router serves the client from the server
+in production the client could be served from the CDN, but the server is also suitable

package/src/helpers/async_wrapper.js

@@ -0,0 +1,8 @@
+/* @flow */
+
+const async_wrapper = fn => (req, res, next) => {
+  Promise.resolve(fn(req, res, next))
+    .catch(next)
+}
+
+module.exports = async_wrapper

package/crypto/index.js

@@ -1,47 +0,0 @@
-/* @flow */
-const crypto = require("crypto")
-
-const ALGORITHM = "aes-256-cbc"
-const {CRYPTO_SECRET} = process.env
-
-if (!CRYPTO_SECRET || CRYPTO_SECRET.trim() === "") {
-  throw new Error("CRYPTO_SECRET not found in env")
-}
-
-// TODO: move to rb:std
-
-const key = crypto.createHash("sha256")
-  .update(String(CRYPTO_SECRET))
-  .digest()
-
-
-const encrypt = (text) => {
-  const iv = crypto.randomBytes(16)
-  const cipher = crypto.createCipheriv(ALGORITHM, key, iv)
-
-  const encrypted = Buffer.concat([
-    cipher.update(text),
-    cipher.final()
-  ])
-
-  return {
-    iv: iv.toString("hex"),
-    content: encrypted.toString("hex")
-  }
-}
-
-const decrypt = (hash) => {
-  const decipher = crypto.createDecipheriv(
-    ALGORITHM, key, Buffer.from(hash.iv, "hex")
-  )
-
-  const decrpyted = Buffer.concat([
-    decipher.update(Buffer.from(hash.content, "hex")),
-    decipher.final(),
-  ])
-
-  return decrpyted.toString()
-}
-
-
-module.exports = {encrypt, decrypt}