From 9d69e7d67b44455402b8ccd9050b33b5dee1016c Mon Sep 17 00:00:00 2001 From: frontegg Date: Thu, 28 Sep 2023 09:28:29 +0000 Subject: [PATCH 1/5] chore(release): publish 8.0.2 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/example-app-directory/package.json | 2 +- packages/example-pages/package.json | 2 +- packages/nextjs/package.json | 2 +- packages/nextjs/src/sdkVersion.ts | 2 +- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b45e5ac..dba84718 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# Change Log + +## [8.0.2](https://github.com/frontegg/frontegg-nextjs/compare/v8.0.1...v8.0.2) (2023-9-28) + +null +- FR-13509 - Added GTM integration + + +### NextJS Wrapper 8.0.2: +- FR-13647 - release major +- FR-13233 - Device location points out Vercel's IP instead of actual device IP # Change Log ## [8.0.1](https://github.com/frontegg/frontegg-nextjs/compare/v7.0.19...v8.0.1) (2023-9-27) diff --git a/lerna.json b/lerna.json index b60b018e..2e239a37 100755 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "8.0.1", + "version": "8.0.2", "npmClient": "yarn", "publishConfig": { "registry": "https://registry.npmjs.org", diff --git a/packages/example-app-directory/package.json b/packages/example-app-directory/package.json index 5b66700c..fc26b604 100644 --- a/packages/example-app-directory/package.json +++ b/packages/example-app-directory/package.json @@ -1,6 +1,6 @@ { "name": "@frontegg/example-app-directory", - "version": "8.0.1", + "version": "8.0.2", "private": true, "scripts": { "clean": "rm -rf ./node_modules && rm -rf ./.next", diff --git a/packages/example-pages/package.json b/packages/example-pages/package.json index c33d7799..b6080d9d 100644 --- a/packages/example-pages/package.json +++ b/packages/example-pages/package.json @@ -1,6 +1,6 @@ { "name": "@frontegg/example-pages", - "version": "8.0.1", + "version": "8.0.2", "private": true, "scripts": { "clean": "rm -rf ./node_modules && rm -rf ./.next", diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index eb004386..f286c218 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -1,7 +1,7 @@ { "name": "@frontegg/nextjs", "libName": "FronteggNextJs", - "version": "8.0.1", + "version": "8.0.2", "author": "Frontegg LTD", "license": "MIT", "repository": { diff --git a/packages/nextjs/src/sdkVersion.ts b/packages/nextjs/src/sdkVersion.ts index 3553d7aa..95f72ae0 100644 --- a/packages/nextjs/src/sdkVersion.ts +++ b/packages/nextjs/src/sdkVersion.ts @@ -1 +1 @@ -export default { version: '8.0.1' }; +export default { version: '8.0.2' }; From d79ec6d53c21fb62b6ffe71d4dd2cb972a2ad1a4 Mon Sep 17 00:00:00 2001 From: AtaliaRefua <102587122+AtaliaRefua@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:49:53 +0300 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dba84718..197f3e4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,13 @@ -# Change Log - -## [8.0.2](https://github.com/frontegg/frontegg-nextjs/compare/v8.0.1...v8.0.2) (2023-9-28) - -null -- FR-13509 - Added GTM integration - - -### NextJS Wrapper 8.0.2: -- FR-13647 - release major -- FR-13233 - Device location points out Vercel's IP instead of actual device IP +# Change Log + +## [8.0.2](https://github.com/frontegg/frontegg-nextjs/compare/v8.0.1...v8.0.2) (2023-9-28) + +### NextJS Wrapper 8.0.2: +- Revamped the security page in the Admin Portal +- FR-13233 - Device location points out Vercel's IP instead of actual device IP + +#### Note: no migration is needed to upgrade between versions 7 to 8. + # Change Log ## [8.0.1](https://github.com/frontegg/frontegg-nextjs/compare/v7.0.19...v8.0.1) (2023-9-27) @@ -19,9 +18,6 @@ null NextJS Wrapper 8.0.1: - FR-13274 - Fixed removed cookies in the pages directory for next-js version 13.4 -#### Note: no migration is needed to upgrade between versions 7 to 8. - - ## [7.0.19](https://github.com/frontegg/frontegg-nextjs/compare/v7.0.18...v7.0.19) (2023-9-5) - Releasing the new Security Center Page, which will replace the current Security Page. Currently exposed on Early Access with limited availability by a feature flag. From 96838b52498815041fb2a876fa596efcc2c0bc22 Mon Sep 17 00:00:00 2001 From: AtaliaRefua <102587122+AtaliaRefua@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:56:29 +0300 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 197f3e4b..64a1b750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ ### NextJS Wrapper 8.0.2: - Revamped the security page in the Admin Portal -- FR-13233 - Device location points out Vercel's IP instead of actual device IP #### Note: no migration is needed to upgrade between versions 7 to 8. From de80ea933f04693c6c36cd42822b32747133c1c4 Mon Sep 17 00:00:00 2001 From: Rotem Date: Thu, 28 Sep 2023 13:07:05 +0300 Subject: [PATCH 4/5] FR-13233 - Device location points out Vercel's IP instead of actual device IP --- .../src/middleware/ProxyRequestCallback.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/nextjs/src/middleware/ProxyRequestCallback.ts b/packages/nextjs/src/middleware/ProxyRequestCallback.ts index 1c5e7026..6e382cfa 100644 --- a/packages/nextjs/src/middleware/ProxyRequestCallback.ts +++ b/packages/nextjs/src/middleware/ProxyRequestCallback.ts @@ -18,6 +18,7 @@ const logger = fronteggLogger.child({ tag: 'FronteggApiMiddleware.ProxyRequestCa const ProxyRequestCallback: ProxyReqCallback = (proxyReq, req) => { try { logger.info(`${req.url} | Going to proxy request`); + logger.info(`The original req headers are ${req.headers}`); logger.debug(`${req.url} | parsing request cookies`); const allCookies = CookieManager.parseCookieHeader(req); logger.debug(`${req.url} | found ${allCookies} cookies`); @@ -33,7 +34,20 @@ const ProxyRequestCallback: ProxyReqCallback = (p proxyReq.setHeader('x-frontegg-framework', req.headers['x-frontegg-framework'] ?? `next@${NextJsPkg.version}`); proxyReq.setHeader('x-frontegg-sdk', req.headers['x-frontegg-sdk'] ?? `@frontegg/nextjs@${sdkVersion.version}`); proxyReq.setHeader('x-frontegg-middleware', 'true'); - proxyReq.setHeader('accept-encoding', 'gzip, deflate, br'); + + const xForwardedFor = req.headers['x-forwarded-for']; + const xOriginalForwardedFor = req.headers['x-original-forwarded-for']; + const cfConnectionIp = req.headers['cf-connecting-ip']; + + if (xForwardedFor) { + proxyReq.setHeader('x-forwarded-for', xForwardedFor); + } + if (xOriginalForwardedFor) { + proxyReq.setHeader('x-original-forwarded-for', xOriginalForwardedFor); + } + if (cfConnectionIp) { + proxyReq.setHeader('cf-connecting-ip', cfConnectionIp); + } [ 'x-invoke-path', From c0af1a683110fe62f6481122595c66866082e863 Mon Sep 17 00:00:00 2001 From: Rotem Date: Thu, 28 Sep 2023 13:13:41 +0300 Subject: [PATCH 5/5] Make logs better --- packages/nextjs/src/middleware/ProxyRequestCallback.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nextjs/src/middleware/ProxyRequestCallback.ts b/packages/nextjs/src/middleware/ProxyRequestCallback.ts index 6e382cfa..390de451 100644 --- a/packages/nextjs/src/middleware/ProxyRequestCallback.ts +++ b/packages/nextjs/src/middleware/ProxyRequestCallback.ts @@ -18,7 +18,7 @@ const logger = fronteggLogger.child({ tag: 'FronteggApiMiddleware.ProxyRequestCa const ProxyRequestCallback: ProxyReqCallback = (proxyReq, req) => { try { logger.info(`${req.url} | Going to proxy request`); - logger.info(`The original req headers are ${req.headers}`); + logger.info('The original req headers are', {headers: req.headers}); logger.debug(`${req.url} | parsing request cookies`); const allCookies = CookieManager.parseCookieHeader(req); logger.debug(`${req.url} | found ${allCookies} cookies`);