i18next-http-middleware 1.3.1 → 2.1.2

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+## [v2.1.2](https://github.com/i18next/i18next-http-middleware/compare/v2.1.1...v2.1.2)
+- fix: get whitelist from correct property
+
+## [v2.1.1](https://github.com/i18next/i18next-http-middleware/compare/v2.1.0...v2.1.1)
+- extend httpFunctions getQuery to handle some edge cases
+
+## [v2.1.0](https://github.com/i18next/i18next-http-middleware/compare/v2.0.0...v2.1.0)
+- LanguageDetector: cookie, new option: cookiePath
+
+## [v2.0.0](https://github.com/i18next/i18next-http-middleware/compare/v1.3.1...v2.0.0)
+- potentially BREAKING: change cookie defaults: cookieSameSite: 'strict'

package/README.md

@@ -298,6 +298,7 @@ As with all modules you can either pass the constructor function (class) to the
   // optional expire and domain for set cookie
   cookieExpirationDate: new Date(),
   cookieDomain: 'myDomain',
+  cookiePath: '/my/path',
   cookieSecure: true, // if need secure cookie
   cookieSameSite: 'strict', // 'strict', 'lax' or 'none'
 

package/cjs/LanguageDetector.js

@@ -47,8 +47,10 @@ function getDefaults() {
     // ['cookie']
     // cookieExpirationDate: new Date(),
     // cookieDomain: 'myDomain'
+    // cookiePath: '/my/path'
     checkWhitelist: true,
-    checkForSimilarInWhitelist: false
+    checkForSimilarInWhitelist: false,
+    cookieSameSite: 'strict'
   });
 }
 
@@ -152,7 +154,7 @@ var LanguageDetector = /*#__PURE__*/function () {
     value: function getSimilarInWhitelist(cleanedLng) {
       var _this3 = this;
 
-      if (!this.i18nOptions.whitelist) return;
+      if (!this.allOptions.whitelist) return;
 
       if (cleanedLng.includes('-')) {
         // i.e. es-MX should check if es is in whitelist
@@ -164,7 +166,7 @@ var LanguageDetector = /*#__PURE__*/function () {
       } // i.e. 'pt' should return 'pt-BR'. If multiple in whitelist with 'pt-', then use first one in whitelist
 
 
-      var similar = this.i18nOptions.whitelist.find(function (whitelistLng) {
+      var similar = this.allOptions.whitelist.find(function (whitelistLng) {
         var cleanedWhitelistLng = _this3.services.languageUtils.formatLanguageCode(whitelistLng);
 
         if (cleanedWhitelistLng.startsWith(cleanedLng)) return cleanedWhitelistLng;

package/cjs/httpFunctions.js

@@ -46,6 +46,8 @@ var getQuery = function getQuery(req) {
   if (req.query) return req.query;
   if (req.raw && req.raw.query) return req.raw.query;
   if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams;
+  var url = req.url || req.raw && req.raw.url;
+  if (url && url.indexOf('?') < 0) return {};
   console.log('no possibility found to get query');
   return {};
 };

package/cjs/languageLookups/cookie.js

@@ -100,11 +100,12 @@ var _default = {
       var cookieOptions = {
         expires: expirationDate,
         domain: options.cookieDomain,
+        path: options.cookiePath,
         httpOnly: false,
-        overwrite: true
+        overwrite: true,
+        sameSite: options.cookieSameSite
       };
       if (options.cookieSecure) cookieOptions.secure = options.cookieSecure;
-      if (options.cookieSameSite) cookieOptions.sameSite = options.cookieSameSite;
       var existingCookie = options.getHeader(res, 'set-cookie') || options.getHeader(res, 'Set-Cookie') || [];
       if (typeof existingCookie === 'string') existingCookie = [existingCookie];
       if (!Array.isArray(existingCookie)) existingCookie = [];

package/lib/LanguageDetector.js

@@ -18,9 +18,12 @@ function getDefaults () {
     caches: false, // ['cookie']
     // cookieExpirationDate: new Date(),
     // cookieDomain: 'myDomain'
+    // cookiePath: '/my/path'
 
     checkWhitelist: true,
-    checkForSimilarInWhitelist: false
+    checkForSimilarInWhitelist: false,
+
+    cookieSameSite: 'strict'
   })
 }
 
@@ -104,7 +107,7 @@ class LanguageDetector {
   }
 
   getSimilarInWhitelist (cleanedLng) {
-    if (!this.i18nOptions.whitelist) return
+    if (!this.allOptions.whitelist) return
 
     if (cleanedLng.includes('-')) {
       // i.e. es-MX should check if es is in whitelist
@@ -119,7 +122,7 @@ class LanguageDetector {
     }
 
     // i.e. 'pt' should return 'pt-BR'. If multiple in whitelist with 'pt-', then use first one in whitelist
-    const similar = this.i18nOptions.whitelist.find((whitelistLng) => {
+    const similar = this.allOptions.whitelist.find((whitelistLng) => {
       const cleanedWhitelistLng = this.services.languageUtils.formatLanguageCode(whitelistLng)
       if (cleanedWhitelistLng.startsWith(cleanedLng)) return cleanedWhitelistLng
     })

package/lib/httpFunctions.js

@@ -26,6 +26,8 @@ export const getQuery = (req) => {
   if (req.query) return req.query
   if (req.raw && req.raw.query) return req.raw.query
   if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams
+  const url = req.url || (req.raw && req.raw.url)
+  if (url && url.indexOf('?') < 0) return {}
   console.log('no possibility found to get query')
   return {}
 }

package/lib/languageLookups/cookie.js

@@ -78,12 +78,13 @@ export default {
       const cookieOptions = {
         expires: expirationDate,
         domain: options.cookieDomain,
+        path: options.cookiePath,
         httpOnly: false,
-        overwrite: true
+        overwrite: true,
+        sameSite: options.cookieSameSite
       }
 
       if (options.cookieSecure) cookieOptions.secure = options.cookieSecure
-      if (options.cookieSameSite) cookieOptions.sameSite = options.cookieSameSite
 
       let existingCookie = options.getHeader(res, 'set-cookie') || options.getHeader(res, 'Set-Cookie') || []
       if (typeof existingCookie === 'string') existingCookie = [existingCookie]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "1.3.1",
+  "version": "2.1.2",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -17,13 +17,13 @@
   "module": "./lib/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.8.4",
-    "@babel/core": "7.9.6",
-    "@babel/preset-env": "7.9.6",
+    "@babel/cli": "7.10.1",
+    "@babel/core": "7.10.2",
+    "@babel/preset-env": "7.10.2",
     "babel-plugin-add-module-exports": "1.0.2",
-    "eslint": "7.0.0",
+    "eslint": "7.2.0",
     "eslint-config-standard": "14.1.1",
-    "eslint-plugin-import": "2.20.2",
+    "eslint-plugin-import": "2.21.2",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-require-path-exists": "1.1.9",
@@ -31,10 +31,10 @@
     "expect.js": "0.3.1",
     "express": "4.17.1",
     "fastify": "3.0.0-rc.1",
-    "i18next": "19.4.4",
-    "mocha": "7.1.2",
+    "i18next": "19.4.5",
+    "mocha": "8.0.1",
     "supertest": "4.0.2",
-    "uglify-js": "3.9.3"
+    "uglify-js": "3.9.4"
   },
   "description": "i18next-http-middleware is a middleware to be used with Node.js web frameworks like express or Fastify and also for Deno.",
   "keywords": [