@frontegg/nextjs 6.7.13 → 6.7.14

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [6.7.14](https://github.com/frontegg/frontegg-nextjs/compare/v6.7.13...v6.7.14) (2023-2-1)
+
+
+### NextJS Wrapper 6.7.14:
+- FR-10557 - Create proxy single request handler instead of handler per request
+
 ## [6.7.13](https://github.com/frontegg/frontegg-nextjs/compare/v6.7.12...v6.7.13) (2023-1-31)
 
 

package/{CookieManager-0b48b7ab.js → CookieManager-09a8df0d.js}

@@ -201,14 +201,14 @@ var CookieManager = /** @class */ (function () {
                     if (!isSecured) {
                         cookie = cookie.filter(function (property) { return property !== 'Secure' && property !== 'SameSite=None'; });
                     }
-                    return cookie
+                    return (cookie
                         .map(function (property) {
                         if (property.toLowerCase() === "domain=".concat(FronteggConfig$1.baseUrlHost)) {
                             return "Domain=".concat(FronteggConfig$1.cookieDomain);
                         }
                         return property;
                     })
-                        .join(';');
+                        .join(';') + ';');
                 });
             }
             return setCookieValue;
@@ -319,4 +319,4 @@ var CookieManager = /** @class */ (function () {
 var CookieManager$1 = new CookieManager();
 
 export { CookieManager$1 as C, FronteggConfig$1 as F, COOKIE_MAX_LENGTH as a, fronteggErrors as f };
-//# sourceMappingURL=CookieManager-0b48b7ab.js.map
+//# sourceMappingURL=CookieManager-09a8df0d.js.map

package/CookieManager-09a8df0d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CookieManager-09a8df0d.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/client/index.js

@@ -1,6 +1,6 @@
 'use client'; 
  import { __assign, __spreadArray } from 'tslib';
-import { F as FronteggConfig } from '../CookieManager-0b48b7ab.js';
+import { F as FronteggConfig } from '../CookieManager-09a8df0d.js';
 import 'iron-session';
 import 'jose';
 import '../api-25516652.js';

package/common/index.js

@@ -1,6 +1,6 @@
-export { a as COOKIE_MAX_LENGTH, C as CookieManager, F as FronteggConfig, f as fronteggErrors } from '../CookieManager-0b48b7ab.js';
-export { c as createSessionFromAccessToken, a as getAllUserData, g as getTokensFromCookie } from '../helpers-52cd4d67.js';
-export { c as createGetSession } from '../createGetSession-ba9eb34d.js';
+export { a as COOKIE_MAX_LENGTH, C as CookieManager, F as FronteggConfig, f as fronteggErrors } from '../CookieManager-09a8df0d.js';
+export { c as createSessionFromAccessToken, a as getAllUserData, g as getTokensFromCookie } from '../helpers-d1972132.js';
+export { c as createGetSession } from '../createGetSession-59d7e8fc.js';
 import 'tslib';
 import 'cookie';
 import 'jose';

package/{createGetSession-ba9eb34d.js → createGetSession-59d7e8fc.js}

@@ -1,6 +1,6 @@
 import { __awaiter, __generator } from 'tslib';
 import { jwtVerify } from 'jose';
-import { F as FronteggConfig } from './CookieManager-0b48b7ab.js';
+import { F as FronteggConfig } from './CookieManager-09a8df0d.js';
 
 var createGetSession = function (_a) {
     var getCookie = _a.getCookie, cookieResolver = _a.cookieResolver;
@@ -47,4 +47,4 @@ var createGetSession = function (_a) {
 };
 
 export { createGetSession as c };
-//# sourceMappingURL=createGetSession-ba9eb34d.js.map
+//# sourceMappingURL=createGetSession-59d7e8fc.js.map

package/createGetSession-59d7e8fc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createGetSession-59d7e8fc.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/edge/index.js

@@ -1,7 +1,7 @@
 import { __awaiter, __generator } from 'tslib';
 import { unsealData } from 'iron-session/edge';
-import { C as CookieManager, F as FronteggConfig } from '../CookieManager-0b48b7ab.js';
-import { c as createGetSession } from '../createGetSession-ba9eb34d.js';
+import { C as CookieManager, F as FronteggConfig } from '../CookieManager-09a8df0d.js';
+import { c as createGetSession } from '../createGetSession-59d7e8fc.js';
 import 'cookie';
 import 'jose';
 

package/{helpers-52cd4d67.js → helpers-d1972132.js}

@@ -4,7 +4,7 @@ import { jwtVerify } from 'jose';
 import { g as getUsers, a as getTenants } from './api-25516652.js';
 import 'react';
 import '@frontegg/react-hooks';
-import { F as FronteggConfig } from './CookieManager-0b48b7ab.js';
+import { F as FronteggConfig } from './CookieManager-09a8df0d.js';
 
 var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
 
@@ -87,4 +87,4 @@ var getAllUserData = function (_a) {
 };
 
 export { getAllUserData as a, createSessionFromAccessToken as c, getTokensFromCookie as g };
-//# sourceMappingURL=helpers-52cd4d67.js.map
+//# sourceMappingURL=helpers-d1972132.js.map

package/helpers-d1972132.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers-d1972132.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/index.js

@@ -599,14 +599,14 @@ var CookieManager = /** @class */ (function () {
                     if (!isSecured) {
                         cookie = cookie.filter(function (property) { return property !== 'Secure' && property !== 'SameSite=None'; });
                     }
-                    return cookie
+                    return (cookie
                         .map(function (property) {
                         if (property.toLowerCase() === "domain=".concat(fronteggConfig.baseUrlHost)) {
                             return "Domain=".concat(fronteggConfig.cookieDomain);
                         }
                         return property;
                     })
-                        .join(';');
+                        .join(';') + ';');
                 });
             }
             return setCookieValue;
@@ -1079,6 +1079,104 @@ var FronteggProxy = httpProxy__default["default"].createProxyServer({
     autoRewrite: false,
     followRedirects: true,
 });
+var proxyReqCallback = function (proxyReq, req) {
+    try {
+        if (req.body) {
+            var bodyData = JSON.stringify(req.body);
+            // in case if content-type is application/x-www-form-urlencoded -> we need to change to application/json
+            proxyReq.setHeader('Content-Type', 'application/json');
+            proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
+            // stream the content
+            proxyReq.write(bodyData);
+        }
+    }
+    catch (e) {
+        console.error("once('proxyReq'), ERROR", e);
+    }
+};
+/**
+ * Set proxy request callback handler
+ */
+// @ts-ignore
+FronteggProxy.on('proxyReq', proxyReqCallback);
+var proxyResCallback = function (proxyRes, req, res) {
+    var buffer = new Buffer('');
+    var totalLength = 0;
+    var isSecured = new URL(fronteggConfig.appUrl).protocol === 'https:';
+    proxyRes.on('data', function (chunk) {
+        totalLength += chunk.length;
+        buffer = Buffer.concat([buffer, chunk], totalLength);
+    });
+    proxyRes.on('end', function () { return tslib.__awaiter(void 0, void 0, void 0, function () {
+        var url, statusCode, isSuccess, bodyStr, isLogout, cookies, body, _a, session, decodedJwt, sessionCookie, e_1, e_2;
+        var _b, _c;
+        return tslib.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _d.trys.push([0, 7, , 8]);
+                    url = req.url;
+                    statusCode = (_b = proxyRes.statusCode) !== null && _b !== void 0 ? _b : 500;
+                    isSuccess = statusCode >= 200 && statusCode < 300;
+                    bodyStr = buffer.toString('utf-8');
+                    isLogout = isFronteggLogoutUrl(url);
+                    if (isLogout) {
+                        CookieManager$1.removeCookies({
+                            isSecured: isSecured,
+                            cookieDomain: fronteggConfig.cookieDomain,
+                            res: res,
+                            req: req,
+                        });
+                        res.status(statusCode).end(bodyStr);
+                        return [2 /*return*/];
+                    }
+                    if (!isSuccess) return [3 /*break*/, 5];
+                    cookies = (_c = CookieManager$1.modifySetCookie(proxyRes.headers['set-cookie'], isSecured)) !== null && _c !== void 0 ? _c : [];
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
+                    body = JSON.parse(bodyStr);
+                    return [4 /*yield*/, createSessionFromAccessToken(body)];
+                case 2:
+                    _a = _d.sent(), session = _a[0], decodedJwt = _a[1];
+                    if (session) {
+                        sessionCookie = CookieManager$1.createCookie({
+                            value: session,
+                            expires: new Date(decodedJwt.exp * 1000),
+                            isSecured: isSecured,
+                        });
+                        cookies.push.apply(cookies, sessionCookie);
+                    }
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _d.sent();
+                    if (bodyStr !== '') {
+                        console.error('[ERROR] FronteggMiddleware', 'proxy failed to parse response body', bodyStr, e_1);
+                    }
+                    return [3 /*break*/, 4];
+                case 4:
+                    res.setHeader('set-cookie', cookies);
+                    res.status(statusCode).end(bodyStr);
+                    return [3 /*break*/, 6];
+                case 5:
+                    console.error('[ERROR] FronteggMiddleware', { url: url, statusCode: statusCode, bodyStr: bodyStr });
+                    res.status(statusCode).end(bodyStr);
+                    _d.label = 6;
+                case 6: return [3 /*break*/, 8];
+                case 7:
+                    e_2 = _d.sent();
+                    console.error('[ERROR] FronteggMiddleware', 'proxy failed to send request', e_2);
+                    res.status(500).end('Internal Server Error');
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/];
+            }
+        });
+    }); });
+};
+/**
+ * Set proxy resonse callback handler
+ */
+// @ts-ignore
+FronteggProxy.on('proxyRes', proxyResCallback);
 /**
  * If pattern information matching the input url information is found in the `pathRewrite` array,
  * the url value is partially replaced with the `pathRewrite.replaceStr` value.
@@ -1129,100 +1227,8 @@ var middlewarePromise = function (req, res) {
     return new Promise(function (resolve) {
         var _a;
         req.url = rewritePath((_a = req.url) !== null && _a !== void 0 ? _a : '/', fronteggPathRewrite);
-        // console.log('FronteggMiddleware.start', { url: req.url });
-        var isSecured = new URL(fronteggConfig.appUrl).protocol === 'https:';
-        FronteggProxy.once('proxyReq', function (proxyReq, req) {
-            try {
-                if (req.body) {
-                    var bodyData = JSON.stringify(req.body);
-                    // in case if content-type is application/x-www-form-urlencoded -> we need to change to application/json
-                    proxyReq.setHeader('Content-Type', 'application/json');
-                    proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
-                    // stream the content
-                    proxyReq.write(bodyData);
-                }
-            }
-            catch (e) {
-                console.error("once('proxyReq'), ERROR", e);
-            }
-        })
-            .once('proxyRes', function (proxyRes, req) {
-            var buffer = new Buffer('');
-            var totalLength = 0;
-            proxyRes.on('data', function (chunk) {
-                totalLength += chunk.length;
-                buffer = Buffer.concat([buffer, chunk], totalLength);
-            });
-            proxyRes.on('end', function () { return tslib.__awaiter(void 0, void 0, void 0, function () {
-                var url, statusCode, isSuccess, bodyStr, isLogout, cookies, body, _a, session, decodedJwt, sessionCookie, e_1, e_2;
-                var _b, _c;
-                return tslib.__generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            _d.trys.push([0, 7, , 8]);
-                            url = req.url;
-                            statusCode = (_b = proxyRes.statusCode) !== null && _b !== void 0 ? _b : 500;
-                            isSuccess = statusCode >= 200 && statusCode < 300;
-                            bodyStr = buffer.toString('utf-8');
-                            isLogout = isFronteggLogoutUrl(url);
-                            if (isLogout) {
-                                CookieManager$1.removeCookies({
-                                    isSecured: isSecured,
-                                    cookieDomain: fronteggConfig.cookieDomain,
-                                    res: res,
-                                    req: req,
-                                });
-                                res.status(statusCode).end(bodyStr);
-                                resolve();
-                                return [2 /*return*/];
-                            }
-                            if (!isSuccess) return [3 /*break*/, 5];
-                            cookies = (_c = CookieManager$1.modifySetCookie(proxyRes.headers['set-cookie'], isSecured)) !== null && _c !== void 0 ? _c : [];
-                            _d.label = 1;
-                        case 1:
-                            _d.trys.push([1, 3, , 4]);
-                            body = JSON.parse(bodyStr);
-                            return [4 /*yield*/, createSessionFromAccessToken(body)];
-                        case 2:
-                            _a = _d.sent(), session = _a[0], decodedJwt = _a[1];
-                            if (session) {
-                                sessionCookie = CookieManager$1.createCookie({
-                                    value: session,
-                                    expires: new Date(decodedJwt.exp * 1000),
-                                    isSecured: isSecured,
-                                });
-                                cookies.push.apply(cookies, sessionCookie);
-                            }
-                            return [3 /*break*/, 4];
-                        case 3:
-                            e_1 = _d.sent();
-                            if (bodyStr !== '') {
-                                console.error('[ERROR] FronteggMiddleware', 'proxy failed to parse response body', bodyStr, e_1);
-                            }
-                            return [3 /*break*/, 4];
-                        case 4:
-                            res.setHeader('set-cookie', cookies);
-                            res.status(statusCode).end(bodyStr);
-                            return [3 /*break*/, 6];
-                        case 5:
-                            console.error('[ERROR] FronteggMiddleware', { url: url, statusCode: statusCode, bodyStr: bodyStr });
-                            res.status(statusCode).send(bodyStr);
-                            _d.label = 6;
-                        case 6:
-                            resolve();
-                            return [3 /*break*/, 8];
-                        case 7:
-                            e_2 = _d.sent();
-                            console.error('[ERROR] FronteggMiddleware', 'proxy failed to send request', e_2);
-                            res.status(500).end('Internal Server Error');
-                            resolve();
-                            return [3 /*break*/, 8];
-                        case 8: return [2 /*return*/];
-                    }
-                });
-            }); });
-        })
-            .web(req, res, {
+        res.on('close', function () { return resolve(); });
+        FronteggProxy.web(req, res, {
             changeOrigin: true,
             selfHandleResponse: true,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@frontegg/nextjs",
   "libName": "FronteggNextJs",
-  "version": "6.7.13",
+  "version": "6.7.14",
   "author": "Frontegg LTD",
   "license": "MIT",
   "types": "dist/index.d.ts",

package/server/index.js

@@ -1,9 +1,9 @@
 import { __awaiter, __generator, __rest, __assign } from 'tslib';
 import React from 'react';
 import { cookies, headers } from 'next/headers';
-import { C as CookieManager } from '../CookieManager-0b48b7ab.js';
-import { g as getTokensFromCookie, a as getAllUserData } from '../helpers-52cd4d67.js';
-import { c as createGetSession } from '../createGetSession-ba9eb34d.js';
+import { C as CookieManager } from '../CookieManager-09a8df0d.js';
+import { g as getTokensFromCookie, a as getAllUserData } from '../helpers-d1972132.js';
+import { c as createGetSession } from '../createGetSession-59d7e8fc.js';
 import 'jose';
 import '@frontegg/react-hooks';
 import '@frontegg/rest-api';

package/CookieManager-0b48b7ab.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CookieManager-0b48b7ab.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/createGetSession-ba9eb34d.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createGetSession-ba9eb34d.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/helpers-52cd4d67.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers-52cd4d67.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}