@frontegg/nextjs 8.0.2 → 8.0.3-alpha.6337561587
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/index.js +1 -1
- package/middleware/ProxyRequestCallback.js +15 -1
- package/middleware/ProxyRequestCallback.js.map +1 -1
- package/package.json +1 -1
- package/sdkVersion.js +1 -1
- package/sdkVersion.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# Change Log
|
|
2
|
+
|
|
3
|
+
## [8.0.3](https://github.com/frontegg/frontegg-nextjs/compare/v8.0.2...v8.0.3) (2023-9-28)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### NextJS Wrapper 8.0.3:
|
|
7
|
+
- FR-13233 - Device location points out Vercel's IP instead of actual device IP
|
|
1
8
|
# Change Log
|
|
2
9
|
|
|
3
10
|
## [8.0.2](https://github.com/frontegg/frontegg-nextjs/compare/v8.0.1...v8.0.2) (2023-9-28)
|
package/index.js
CHANGED
|
@@ -24,6 +24,9 @@ const ProxyRequestCallback = (proxyReq, req) => {
|
|
|
24
24
|
try {
|
|
25
25
|
var _req$headers$xFronte, _req$headers$xFronte2;
|
|
26
26
|
logger.info(`${req.url} | Going to proxy request`);
|
|
27
|
+
logger.info('The original req headers are', {
|
|
28
|
+
headers: req.headers
|
|
29
|
+
});
|
|
27
30
|
logger.debug(`${req.url} | parsing request cookies`);
|
|
28
31
|
const allCookies = _cookies.default.parseCookieHeader(req);
|
|
29
32
|
logger.debug(`${req.url} | found ${allCookies} cookies`);
|
|
@@ -37,7 +40,18 @@ const ProxyRequestCallback = (proxyReq, req) => {
|
|
|
37
40
|
proxyReq.setHeader('x-frontegg-framework', (_req$headers$xFronte = req.headers['x-frontegg-framework']) != null ? _req$headers$xFronte : `next@${_package.default.version}`);
|
|
38
41
|
proxyReq.setHeader('x-frontegg-sdk', (_req$headers$xFronte2 = req.headers['x-frontegg-sdk']) != null ? _req$headers$xFronte2 : `@frontegg/nextjs@${_sdkVersion.default.version}`);
|
|
39
42
|
proxyReq.setHeader('x-frontegg-middleware', 'true');
|
|
40
|
-
|
|
43
|
+
const xForwardedFor = req.headers['x-forwarded-for'];
|
|
44
|
+
const xOriginalForwardedFor = req.headers['x-original-forwarded-for'];
|
|
45
|
+
const cfConnectionIp = req.headers['cf-connecting-ip'];
|
|
46
|
+
if (xForwardedFor) {
|
|
47
|
+
proxyReq.setHeader('x-forwarded-for', xForwardedFor);
|
|
48
|
+
}
|
|
49
|
+
if (xOriginalForwardedFor) {
|
|
50
|
+
proxyReq.setHeader('x-original-forwarded-for', xOriginalForwardedFor);
|
|
51
|
+
}
|
|
52
|
+
if (cfConnectionIp) {
|
|
53
|
+
proxyReq.setHeader('cf-connecting-ip', cfConnectionIp);
|
|
54
|
+
}
|
|
41
55
|
['x-invoke-path', 'x-invoke-query', 'x-middleware-invoke', 'x-middleware-next', 'transfer-encoding', 'cache-control'].map(header => proxyReq.removeHeader(header));
|
|
42
56
|
logger.debug(`${req.url} | check if request has body`);
|
|
43
57
|
if (req.body) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyRequestCallback.js","names":["_package","_interopRequireDefault","require","_sdkVersion","_config","_cookies","_fronteggLogger","logger","fronteggLogger","child","tag","ProxyRequestCallback","proxyReq","req","_req$headers$xFronte","_req$headers$xFronte2","info","url","debug","allCookies","CookieManager","parseCookieHeader","fronteggCookiesNames","Object","keys","filter","cookieName","startsWith","config","join","forEach","setHeader","
|
|
1
|
+
{"version":3,"file":"ProxyRequestCallback.js","names":["_package","_interopRequireDefault","require","_sdkVersion","_config","_cookies","_fronteggLogger","logger","fronteggLogger","child","tag","ProxyRequestCallback","proxyReq","req","_req$headers$xFronte","_req$headers$xFronte2","info","url","headers","debug","allCookies","CookieManager","parseCookieHeader","fronteggCookiesNames","Object","keys","filter","cookieName","startsWith","config","join","forEach","setHeader","NextJsPkg","version","sdkVersion","xForwardedFor","xOriginalForwardedFor","cfConnectionIp","map","header","removeHeader","body","bodyData","JSON","stringify","Buffer","byteLength","write","e","error","_default","exports","default"],"sources":["../../../../packages/nextjs/src/middleware/ProxyRequestCallback.ts"],"sourcesContent":["import NextJsPkg from 'next/package.json';\nimport { ProxyReqCallback } from 'http-proxy';\nimport { ClientRequest } from 'http';\nimport { NextApiRequest } from 'next';\nimport sdkVersion from '../sdkVersion';\nimport config from '../config';\nimport CookieManager from '../utils/cookies';\nimport fronteggLogger from '../utils/fronteggLogger';\n\nconst logger = fronteggLogger.child({ tag: 'FronteggApiMiddleware.ProxyRequestCallback' });\n/**\n * Proxy request callback fired on before each request to Frontegg services,\n * to transport frontegg cookies.\n *\n * @param {ClientRequest} proxyReq - Proxy request to be sent\n * @param {NextApiRequest} req - Next.js incoming request\n */\nconst ProxyRequestCallback: ProxyReqCallback<ClientRequest, NextApiRequest> = (proxyReq, req) => {\n try {\n logger.info(`${req.url} | Going to proxy request`);\n logger.info('The original req headers are', {headers: req.headers});\n logger.debug(`${req.url} | parsing request cookies`);\n const allCookies = CookieManager.parseCookieHeader(req);\n logger.debug(`${req.url} | found ${allCookies} cookies`);\n const fronteggCookiesNames = Object.keys(allCookies).filter((cookieName) => {\n return cookieName.startsWith('fe_') && !cookieName.startsWith(config.cookieName);\n });\n\n logger.debug(`${req.url} | proxy FronteggCookies (${fronteggCookiesNames.join(', ')})`);\n fronteggCookiesNames.forEach((cookieName: string) => {\n proxyReq.setHeader(cookieName, allCookies[cookieName]);\n });\n\n proxyReq.setHeader('x-frontegg-framework', req.headers['x-frontegg-framework'] ?? `next@${NextJsPkg.version}`);\n proxyReq.setHeader('x-frontegg-sdk', req.headers['x-frontegg-sdk'] ?? `@frontegg/nextjs@${sdkVersion.version}`);\n proxyReq.setHeader('x-frontegg-middleware', 'true');\n\n const xForwardedFor = req.headers['x-forwarded-for'];\n const xOriginalForwardedFor = req.headers['x-original-forwarded-for'];\n const cfConnectionIp = req.headers['cf-connecting-ip'];\n\n if (xForwardedFor) {\n proxyReq.setHeader('x-forwarded-for', xForwardedFor);\n }\n if (xOriginalForwardedFor) {\n proxyReq.setHeader('x-original-forwarded-for', xOriginalForwardedFor);\n }\n if (cfConnectionIp) {\n proxyReq.setHeader('cf-connecting-ip', cfConnectionIp);\n }\n\n [\n 'x-invoke-path',\n 'x-invoke-query',\n 'x-middleware-invoke',\n 'x-middleware-next',\n 'transfer-encoding',\n 'cache-control',\n ].map((header) => proxyReq.removeHeader(header));\n\n logger.debug(`${req.url} | check if request has body`);\n if (req.body) {\n logger.debug(`${req.url} | writing request body to proxyReq`);\n const bodyData = JSON.stringify(req.body);\n // in case if content-type is application/x-www-form-urlencoded -> we need to change to application/json\n proxyReq.setHeader('Content-Type', 'application/json');\n proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));\n // stream the content\n proxyReq.write(bodyData);\n }\n } catch (e) {\n logger.error(`${req.url} | Failed to proxy request`, e);\n }\n};\n\nexport default ProxyRequestCallback;\n"],"mappings":"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"}
|
package/package.json
CHANGED
package/sdkVersion.js
CHANGED
package/sdkVersion.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkVersion.js","names":["version","exports","default","_default"],"sources":["../../../packages/nextjs/src/sdkVersion.ts"],"sourcesContent":["export default { version: '8.0.
|
|
1
|
+
{"version":3,"file":"sdkVersion.js","names":["version","exports","default","_default"],"sources":["../../../packages/nextjs/src/sdkVersion.ts"],"sourcesContent":["export default { version: '8.0.3-alpha.6337561587' };\n"],"mappings":";;;;;;eAAe;EAAEA,OAAO,EAAE;AAAyB,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAC,QAAA"}
|