@nitra/cf-security 3.3.2 → 3.4.0

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@nitra/cf-security",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "check header in cloud functions",
+  "main": "src/index.js",
   "type": "module",
   "exports": {
     ".": "./src/index.js",
@@ -21,15 +22,7 @@
     "url": "https://github.com/nitra/cf-security/issues"
   },
   "homepage": "https://github.com/nitra/cf-security#readme",
-  "prettier": "@nitra/prettier-config",
-  "eslintConfig": {
-    "extends": [
-      "@nitra/eslint-config/node"
-    ]
-  },
   "devDependencies": {
-    "@nitra/eslint-config": "^1.0.9",
-    "@nitra/prettier-config": "^1.0.1",
     "test-director": "^7.0.0"
   },
   "dependencies": {

package/src/index.js

@@ -1,4 +1,3 @@
-import getLogger from '@nitra/bunyan/trace'
 import checkEnv from '@nitra/check-env'
 checkEnv(['X_NITRA_CF_KEY'])
 
@@ -9,25 +8,23 @@ checkEnv(['X_NITRA_CF_KEY'])
  * @return {boolean} if check passed
  */
 export const cfSecurity = req => {
-  const log = getLogger(req)
-
   if (typeof req.headers === 'undefined') {
-    log.info('Request without headers')
+    req.log.info('Request without headers')
     return false
   }
 
   if (typeof req.headers['x-nitra-cf-key'] === 'undefined') {
-    log.info('Nitra key not exist in request')
+    req.log.info('Nitra key not exist in request')
     return false
   }
 
   if (req.headers['x-nitra-cf-key'] === 0) {
-    log.info('Empty Nitra key in headers request')
+    req.log.info('Empty Nitra key in headers request')
     return false
   }
 
   if (req.headers['x-nitra-cf-key'] !== process.env.X_NITRA_CF_KEY) {
-    log.info('Not equal Nitra key')
+    req.log.info('Not equal Nitra key')
     return false
   }
 

package/src/jwt-c.js

@@ -8,15 +8,19 @@ import { isDev } from '@nitra/isenv'
  * @return {string} token if check passed
  */
 export default async (req, allowedRoles) => {
+  if (!req.raw.headers?.cookie) {
+    throw new Error('[verification] missing cookie')
+  }
+
   // Читаємо кукі
   const c = Object.fromEntries(req.raw.headers.cookie.split('; ').map(v => v.split(/=(.*)/s).map(decodeURIComponent)))
 
   // Для дева можна й не передавати токен
   if (isDev) {
     // Але якщо передали - то беремо контент з нього
-    if (c['jwt-auth']) {
+    if (c.__session) {
       // ігноруючи expired
-      const token = await verify(c['jwt-auth'], { ignoreExpiration: true })
+      const token = await verify(c.__session, { ignoreExpiration: true })
       return token.body
     } else {
       return { name: 'dev', 'https://hasura.io/jwt/claims': { 'x-hasura-allowed-roles': allowedRoles } }
@@ -24,11 +28,11 @@ export default async (req, allowedRoles) => {
   }
 
   // Перевіряємо токен тільки
-  if (!c['jwt-auth']) {
+  if (!c.__session) {
     throw new Error('[verification] no authorization header')
   }
 
-  const token = await verify(c['jwt-auth'])
+  const token = await verify(c.__session)
 
   if (!token) {
     throw new Error('[verification] invalid token')