@hvedinich/utils 0.0.64 → 0.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hvedinich/utils",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "utils module",
   "main": "index.js",
   "scripts": {

package/src/server/index.js

@@ -6,7 +6,6 @@ const {
   guestCtx,
   token: { EXPIRED, UNAUTHORIZED },
 } = require('../constants');
-const { addContext } = require('../utils/contextUtils');
 
 const logError = (err, logger = console) => {
   const description = {};
@@ -48,11 +47,15 @@ const defaultContext = async ({ req }) => {
 };
 
 class Server {
-  constructor({ config, healthCheck }) {
+  constructor({ config, healthCheck, context }) {
     this.config = config;
     this.app = express();
     this.router = null;
     this.app.get('/_status', healthCheck || defaultCHealthCheck);
+    this.app.use((req, res, next) => {
+      req.ctx = context({ req, res });
+      next();
+    });
   }
 
   initGQL({ gateway, schema, context, options, logger, errorHandler }) {
@@ -110,7 +113,7 @@ class Server {
       if (proxy) {
         this.app.use(path, proxy);
       } else {
-        this.app[method](path, addContext(handler));
+        this.app[method](path, handler);
       }
     });
   }

package/src/utils/contextUtils.js

@@ -1,11 +1,10 @@
-
 const constKeys = {
   'x-yoda-uid': 'uid',
   'x-yoda-city': 'city',
 };
 const defaultContext = ({ req }) => {
   const res = {};
-  Object.keys(constKeys).forEach((key) => {
+  Object.keys(constKeys).forEach(key => {
     if (req.headers[key]) {
       res[constKeys[key]] = req.headers[key];
     }
@@ -16,14 +15,12 @@ const defaultContext = ({ req }) => {
   return res;
 };
 
-const ctxToHeaders = (ctx) => {
-  const result = Object
-    .entries(constKeys)
-    .reduce((acc, [key, value]) => {
-      if (ctx[value] === undefined) return acc;
-      acc[key] = ctx[value];
-      return acc;
-    }, {});
+const ctxToHeaders = ctx => {
+  const result = Object.entries(constKeys).reduce((acc, [key, value]) => {
+    if (ctx[value] === undefined) return acc;
+    acc[key] = ctx[value];
+    return acc;
+  }, {});
   if (ctx.permission) {
     result['x-yoda-permission'] = ctx.permission.join(',');
   }

package/src/utils/token/index.js

@@ -1,17 +1,15 @@
-
 const jwt = require('jsonwebtoken');
 const { ValidationError, TokenExpiredError } = require('../../error');
 const { serverCtx, token: { REFRESH, ACCESS } } = require('../../constants');
 
-const createToken = (user, token = {}) => {
-  const accessToken = jwt.sign({
-    uid: user.id,
-    name: user.username,
-    permission: user.permission,
-  }, token.accessSecret, { expiresIn: token.accessTokenTimeout });
-  const refreshToken = jwt.sign({
-    uid: user.id,
-  }, token.refreshSecret, { expiresIn: token.refreshTokenTimeout });
+const createToken = (data, options = {}) => {
+  const accessToken = jwt.sign(data, options.accessSecret, { expiresIn: options.accessTokenTimeout });
+
+  if (!options.refreshSecret) {
+    return { accessToken };
+  }
+
+  const refreshToken = jwt.sign(data, options.refreshSecret, { expiresIn: options.refreshTokenTimeout });
   return { accessToken, refreshToken };
 };