@nitra/cf-security 4.5.3 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitra/cf-security",
-  "version": "4.5.3",
+  "version": "5.0.0",
   "description": "check header in serverless",
   "type": "module",
   "types": "./types/index.d.ts",
@@ -24,16 +24,15 @@
   },
   "homepage": "https://github.com/nitra/cf-security#readme",
   "dependencies": {
-    "@nitra/bunyan": "^2.0.3",
     "@nitra/check-env": "^3.2.0",
     "@nitra/isenv": "^2.0.1",
-    "@nitra/jwt": "^3.7.1"
+    "@nitra/jwt": "^4.0.3"
   },
   "files": [
     "src",
     "types"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   }
 }

package/src/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Check request for Nitra security rules
+ *
+ * @param {object} req - ApolloServer or Express Request for check
+ * @returns {boolean} if check passed
+ */
+export default function _default(req: object): boolean

package/src/index.js

@@ -1,19 +1,19 @@
 import { checkEnv, env } from '@nitra/check-env'
+
 checkEnv(['X_NITRA_CF_KEY'])
 
 /**
  * Check request for Nitra security rules
- *
  * @param {object} req - ApolloServer or Express Request for check
- * @return {boolean} if check passed
+ * @returns {boolean} if check passed
  */
 export default function (req) {
-  if (typeof req.headers === 'undefined') {
+  if (req.headers === undefined) {
     req.log.info('Request without headers')
     return false
   }
 
-  if (typeof req.headers['x-nitra-cf-key'] === 'undefined') {
+  if (req.headers['x-nitra-cf-key'] === undefined) {
     req.log.info('Nitra key not exist in request')
     return false
   }

package/src/jwt-both.js

@@ -1,16 +1,16 @@
-import { runSecurityHeader } from './jwt.js'
 import { runSecurityCookie } from './jwt-c.js'
+import { runSecurityHeader } from './jwt.js'
 
 /**
  * Check request for Nitra security з токеном в кукі
- *
  * @param {object} req - Fastify  Request for check
- * @return {Promise<Object>} token if check passed
+ * @param {Array<string>} allowedRoles - Allowed roles
+ * @returns {Promise<object>} token if check passed
  */
 export default async (req, allowedRoles) => {
+  // oxlint-disable-line require-await
   if (req.headers.authorization) {
     return runSecurityHeader(req, allowedRoles)
-  } else {
-    return runSecurityCookie(req, allowedRoles)
   }
+  return runSecurityCookie(req, allowedRoles)
 }

package/src/jwt-c.js

@@ -1,12 +1,12 @@
-import verify from '@nitra/jwt/verify'
 import { isDev } from '@nitra/isenv'
+import verify from '@nitra/jwt/verify'
 import { intersection } from './utils/intersection.js'
 
 /**
  * Check request for Nitra security з токеном в кукі
- *
  * @param {object} req - Fastify  Request for check
- * @return {Promise<Object>} token if check passed
+ * @param {Array<string>} allowedRoles - Allowed roles
+ * @returns {Promise<object>} token if check passed
  */
 export default async (req, allowedRoles) => {
   const { parsed } = await runSecurityCookie(req, allowedRoles)
@@ -15,10 +15,9 @@ export default async (req, allowedRoles) => {
 
 /**
  * Check request for Nitra security rules WI
- *
  * @param {object} req - Fastify  Request for check
  * @param {Array} allowedRoles - Allowed roles
- * @return {Promise<Object>} token if check passed
+ * @returns {Promise<object>} token if check passed
  */
 export const runSecurityCookie = async (req, allowedRoles) => {
   if (!req.raw.headers?.cookie) {
@@ -26,7 +25,9 @@ export const runSecurityCookie = async (req, allowedRoles) => {
   }
 
   // Читаємо кукі
-  const c = Object.fromEntries(req.raw.headers.cookie.split('; ').map(v => v.split(/=(.*)/s).map(decodeURIComponent)))
+  const c = Object.fromEntries(
+    req.raw.headers.cookie.split('; ').map(v => v.split(/[=](.*)/s).map(x => decodeURIComponent(x)))
+  )
 
   // Для дева можна й не передавати токен
   if (isDev) {
@@ -35,11 +36,10 @@ export const runSecurityCookie = async (req, allowedRoles) => {
       // ігноруючи expired
       const token = await verify(c.__session, { ignoreExpiration: true })
       return { raw: c.__session, parsed: token.body }
-    } else {
-      return {
-        raw: 0,
-        parsed: { name: 'dev', 'https://hasura.io/jwt/claims': { 'x-hasura-allowed-roles': allowedRoles } }
-      }
+    }
+    return {
+      raw: 0,
+      parsed: { name: 'dev', 'https://hasura.io/jwt/claims': { 'x-hasura-allowed-roles': allowedRoles } }
     }
   }
 

package/src/jwt.js

@@ -4,10 +4,9 @@ import { intersection } from './utils/intersection.js'
 
 /**
  * Check request for Nitra security rules WI
- *
  * @param {object} req - Fastify  Request for check
  * @param {Array} allowedRoles - Allowed roles
- * @return {Promise<string>} token if check passed
+ * @returns {Promise<string>} token if check passed
  */
 export default async (req, allowedRoles) => {
   const { parsed } = await runSecurityHeader(req, allowedRoles)
@@ -16,10 +15,9 @@ export default async (req, allowedRoles) => {
 
 /**
  * Check request for Nitra security rules WI
- *
  * @param {object} req - Fastify  Request for check
  * @param {Array} allowedRoles - Allowed roles
- * @return {Promise<Object>} token if check passed
+ * @returns {Promise<object>} token if check passed
  */
 export const runSecurityHeader = async (req, allowedRoles) => {
   // Для дева можна й не передавати токен
@@ -40,11 +38,10 @@ export const runSecurityHeader = async (req, allowedRoles) => {
 
       const authHeaders = req.headers.authorization.split(' ')
       return { raw: authHeaders[1], parsed: token.body }
-    } else {
-      return {
-        raw: 0,
-        parsed: { name: 'dev', 'https://hasura.io/jwt/claims': { 'x-hasura-allowed-roles': allowedRoles } }
-      }
+    }
+    return {
+      raw: 0,
+      parsed: { name: 'dev', 'https://hasura.io/jwt/claims': { 'x-hasura-allowed-roles': allowedRoles } }
     }
   }
 

package/src/utils/intersection.js

@@ -1,3 +1,8 @@
+/**
+ * @param {Array<string>} a - First array
+ * @param {Array<string>} b - Second array
+ * @returns {Array<string>} - Intersection of two arrays.
+ */
 export function intersection(a, b) {
   const setA = new Set(a)
   return b.filter(value => setA.has(value))

package/types/index.d.ts

@@ -2,6 +2,6 @@
  * Check request for Nitra security rules
  *
  * @param {object} req - ApolloServer or Express Request for check
- * @return {boolean} if check passed
+ * @returns {boolean} if check passed
  */
-export default function _default(req: object): boolean;
+export default function _default(req: object): boolean