@frontegg/nextjs 5.3.0 → 5.4.0-alpha.2494518347

package/index.esm.js

@@ -1,16 +1,16 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { useCallback, useMemo, useEffect } from 'react';
+import { createContext, useCallback, useMemo, useEffect, useContext } from 'react';
 import { AppHolder, initialize } from '@frontegg/admin-portal';
 export { AdminPortal } from '@frontegg/admin-portal';
-import { FronteggStoreProvider, useAuthUserOrNull, useAuthActions } from '@frontegg/react-hooks';
+import { FronteggStoreProvider, useAuthUserOrNull, useAuthActions, useLoginWithRedirect } from '@frontegg/react-hooks';
 export * from '@frontegg/react-hooks';
 import { fronteggAuthApiRoutes, ContextHolder, fronteggRefreshTokenUrl } from '@frontegg/rest-api';
 import { useRouter } from 'next/router';
-import { importJWK, decodeJwt, jwtVerify } from 'jose';
+import { importJWK, jwtVerify, decodeJwt } from 'jose';
 import { authInitialState } from '@frontegg/redux-store';
 import { parse } from 'url';
 import cookie from 'cookie';
-import { sealData, unsealData } from 'iron-session';
+import { unsealData, sealData } from 'iron-session';
 import httpProxy from 'http-proxy';
 export * from '@frontegg/types';
 
@@ -51,15 +51,19 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-var Connector = function Connector(_a) {
-  var _b;
+var AppContext = /*#__PURE__*/createContext(null);
 
-  var router = _a.router,
-      appName = _a.appName,
-      props = __rest(_a, ["router", "appName"]);
+var Connector = function Connector(_props) {
+  var _a;
+
+  var router = _props.router,
+      appName = _props.appName,
+      hostedLoginBox = _props.hostedLoginBox;
+      _props.customLoginBox;
+      var props = __rest(_props, ["router", "appName", "hostedLoginBox", "customLoginBox"]);
 
   var isSSR = typeof window === 'undefined';
-  var baseName = (_b = props.basename) !== null && _b !== void 0 ? _b : router.basePath;
+  var baseName = (_a = props.basename) !== null && _a !== void 0 ? _a : router.basePath;
   var onRedirectTo = useCallback(function (_path, opts) {
     var path = _path;
 
@@ -81,7 +85,7 @@ var Connector = function Connector(_a) {
   var contextOptions = useMemo(function () {
     return {
       baseUrl: function baseUrl(path) {
-        if (fronteggAuthApiRoutes.indexOf(path) !== -1 || path.endsWith('/postlogin') || path.endsWith('/prelogin')) {
+        if (fronteggAuthApiRoutes.indexOf(path) !== -1 || path.endsWith('/postlogin') || path.endsWith('/prelogin') || path === '/oauth/token') {
           return "".concat(props.envAppUrl, "/api");
         } else {
           return props.envBaseUrl;
@@ -89,7 +93,7 @@ var Connector = function Connector(_a) {
       },
       clientId: props.envClientId
     };
-  }, [props.contextOptions]);
+  }, [props.envAppUrl, props.envBaseUrl, props.envClientId]);
   var app = useMemo(function () {
     var _a;
 
@@ -99,7 +103,11 @@ var Connector = function Connector(_a) {
       createdApp = AppHolder.getInstance(appName !== null && appName !== void 0 ? appName : 'default');
     } catch (e) {
       createdApp = initialize(Object.assign(Object.assign({}, props), {
+        hostedLoginBox: hostedLoginBox !== null && hostedLoginBox !== void 0 ? hostedLoginBox : false,
         basename: (_a = props.basename) !== null && _a !== void 0 ? _a : baseName,
+        authOptions: Object.assign(Object.assign({}, props.authOptions), {
+          onRedirectTo: onRedirectTo
+        }),
         contextOptions: Object.assign(Object.assign({
           requestCredentials: 'include'
         }, props.contextOptions), contextOptions),
@@ -108,7 +116,7 @@ var Connector = function Connector(_a) {
     }
 
     return createdApp;
-  }, [onRedirectTo]);
+  }, [appName, props, hostedLoginBox, baseName, onRedirectTo, contextOptions]);
   ContextHolder.setOnRedirectTo(onRedirectTo);
   useEffect(function () {
     var _a; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -120,10 +128,14 @@ var Connector = function Connector(_a) {
       payload: (_a = props.session) === null || _a === void 0 ? void 0 : _a.accessToken
     });
   }, [app]);
-  return jsx(FronteggStoreProvider, Object.assign({}, Object.assign(Object.assign({}, props), {
-    app: app
-  }), {
-    children: props.children
+  return jsx(AppContext.Provider, Object.assign({
+    value: app
+  }, {
+    children: jsx(FronteggStoreProvider, Object.assign({}, Object.assign(Object.assign({}, props), {
+      app: app
+    }), {
+      children: props.children
+    }))
   }));
 };
 
@@ -136,7 +148,8 @@ var ExpireInListener = function ExpireInListener() {
         expiresIn: Math.floor((user['exp'] * 1000 - Date.now()) / 1000)
       }));
     }
-  }, [actions, user]);
+  }, [actions, user]); // eslint-disable-next-line react/jsx-no-useless-fragment
+
   return jsx(Fragment, {});
 };
 
@@ -1040,6 +1053,7 @@ var FronteggConfig = /*#__PURE__*/function () {
     var _a, _b, _c;
 
     this.authRoutes = {};
+    this.fronteggAppOptions = {};
     this._clientId = (_a = process.env['FRONTEGG_CLIENT_ID']) !== null && _a !== void 0 ? _a : '';
     this._cookieName = (_b = process.env['FRONTEGG_COOKIE_NAME']) !== null && _b !== void 0 ? _b : "fe_session";
     this._password = (_c = process.env['FRONTEGG_ENCRYPTION_PASSWORD']) !== null && _c !== void 0 ? _c : '';
@@ -1174,6 +1188,33 @@ function _toConsumableArray(arr) {
 }
 
 function FronteggRouter() {
+  var app = useContext(AppContext);
+
+  var _useRouter = useRouter(),
+      query = _useRouter.query;
+
+  var loginWithRedirect = useLoginWithRedirect();
+  useEffect(function () {
+    if (!app) {
+      return;
+    }
+
+    if (app.options.hostedLoginBox) {
+      var routesObj = Object.assign(Object.assign({}, authInitialState.routes), fronteggConfig.authRoutes);
+
+      var _a = query,
+          pathArr = _a['frontegg-router'],
+          queryParams = __rest(_a, ['frontegg-router']);
+
+      var pathname = "/".concat(pathArr.join('/'));
+
+      if (pathname === routesObj.loginUrl) {
+        loginWithRedirect();
+      } else {
+        console.log('NO', pathname, queryParams);
+      }
+    }
+  }, [app, query, loginWithRedirect]);
   return '';
 }
 function FronteggRouterProps(context) {
@@ -1191,6 +1232,16 @@ function FronteggRouterProps(context) {
   }
 
   var notFound = routesArr.indexOf(pathname) === -1;
+
+  if (fronteggConfig.fronteggAppOptions.hostedLoginBox) {
+    var _notFound = !(routesObj.loginUrl === pathname || routesObj.hostedLoginRedirectUrl === pathname);
+
+    return {
+      notFound: _notFound,
+      props: {}
+    };
+  }
+
   return {
     notFound: notFound,
     props: {}
@@ -1254,6 +1305,115 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+function getSession(req) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
+    var sealFromCookies, jwt, publicKey, _yield$jwtVerify, payload, session;
+
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            sealFromCookies = cookie.parse(req.headers.cookie || '')[fronteggConfig.cookieName];
+
+            if (sealFromCookies) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return", undefined);
+
+          case 4:
+            _context.next = 6;
+            return unsealData(sealFromCookies, {
+              password: fronteggConfig.passwordsAsMap
+            });
+
+          case 6:
+            jwt = _context.sent;
+            _context.next = 9;
+            return fronteggConfig.getJwtPublicKey();
+
+          case 9:
+            publicKey = _context.sent;
+            _context.next = 12;
+            return jwtVerify(jwt, publicKey);
+
+          case 12:
+            _yield$jwtVerify = _context.sent;
+            payload = _yield$jwtVerify.payload;
+            session = {
+              accessToken: jwt,
+              user: payload
+            };
+
+            if (!(session.user.exp * 1000 < Date.now())) {
+              _context.next = 17;
+              break;
+            }
+
+            return _context.abrupt("return", undefined);
+
+          case 17:
+            return _context.abrupt("return", session);
+
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](0);
+            console.error(_context.t0);
+            return _context.abrupt("return", undefined);
+
+          case 24:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 20]]);
+  }));
+}
+function withSSRSession(handler) {
+  var _this = this;
+
+  return function (context) {
+    return __awaiter(_this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
+      var _a, session;
+
+      return regenerator.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return getSession(context.req);
+
+            case 2:
+              session = _context2.sent;
+
+              if (!session) {
+                _context2.next = 7;
+                break;
+              }
+
+              return _context2.abrupt("return", handler(context, session));
+
+            case 7:
+              return _context2.abrupt("return", {
+                redirect: {
+                  permanent: false,
+                  destination: "/".concat((_a = fronteggConfig.authRoutes.loginUrl) !== null && _a !== void 0 ? _a : authInitialState.routes.loginUrl, "?redirectUrl=").concat(encodeURIComponent(context.req.url))
+                },
+                props: {}
+              });
+
+            case 8:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+  };
+}
+
 function rewriteCookieProperty(header, config, property) {
   if (Array.isArray(header)) {
     return header.map(function (headerElement) {
@@ -1287,7 +1447,7 @@ function refreshToken(ctx) {
   var _a;
 
   return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
-    var request, headers, cookies, refreshTokenKey, cookieKey, response, data, rewriteCookieDomainConfig, cookieHeader, newSetCookie, _yield$createSessionF, _yield$createSessionF2, session, decodedJwt, isSecured, cookieValue;
+    var request, session, headers, cookies, refreshTokenKey, cookieKey, response, data, rewriteCookieDomainConfig, cookieHeader, newSetCookie, _yield$createSessionF, _yield$createSessionF2, _session, decodedJwt, isSecured, cookieValue;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
@@ -1304,6 +1464,29 @@ function refreshToken(ctx) {
             return _context.abrupt("return", null);
 
           case 4:
+            _context.prev = 4;
+            _context.next = 7;
+            return getSession(ctx.req);
+
+          case 7:
+            session = _context.sent;
+
+            if (!session) {
+              _context.next = 10;
+              break;
+            }
+
+            return _context.abrupt("return", session);
+
+          case 10:
+            _context.next = 14;
+            break;
+
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](4);
+
+          case 14:
             headers = request.headers;
             cookies = request.cookies;
             refreshTokenKey = "fe_refresh_".concat(fronteggConfig.clientId).replace(/-/g, '');
@@ -1312,11 +1495,11 @@ function refreshToken(ctx) {
             });
 
             if (!cookieKey) {
-              _context.next = 36;
+              _context.next = 46;
               break;
             }
 
-            _context.next = 11;
+            _context.next = 21;
             return fetch("".concat(process.env['FRONTEGG_BASE_URL'], "/frontegg").concat(fronteggRefreshTokenUrl), {
               method: 'POST',
               credentials: 'include',
@@ -1332,42 +1515,42 @@ function refreshToken(ctx) {
               }
             });
 
-          case 11:
+          case 21:
             response = _context.sent;
 
             if (!response.ok) {
-              _context.next = 36;
+              _context.next = 46;
               break;
             }
 
-            _context.next = 15;
+            _context.next = 25;
             return response.text();
 
-          case 15:
+          case 25:
             data = _context.sent;
             rewriteCookieDomainConfig = _defineProperty({}, fronteggConfig.baseUrlHost, fronteggConfig.cookieDomain); // @ts-ignore
 
             cookieHeader = response.headers.raw()['set-cookie'];
             newSetCookie = rewriteCookieProperty(cookieHeader, rewriteCookieDomainConfig, 'domain');
-            _context.next = 21;
+            _context.next = 31;
             return createSessionFromAccessToken(data);
 
-          case 21:
+          case 31:
             _yield$createSessionF = _context.sent;
             _yield$createSessionF2 = _slicedToArray(_yield$createSessionF, 2);
-            session = _yield$createSessionF2[0];
+            _session = _yield$createSessionF2[0];
             decodedJwt = _yield$createSessionF2[1];
 
-            if (session) {
-              _context.next = 27;
+            if (_session) {
+              _context.next = 37;
               break;
             }
 
             return _context.abrupt("return", null);
 
-          case 27:
+          case 37:
             isSecured = new URL(fronteggConfig.appUrl).protocol === 'https:';
-            cookieValue = cookie.serialize(fronteggConfig.cookieName, session, {
+            cookieValue = cookie.serialize(fronteggConfig.cookieName, _session, {
               expires: new Date(decodedJwt.exp * 1000),
               httpOnly: true,
               domain: fronteggConfig.cookieDomain,
@@ -1391,21 +1574,21 @@ function refreshToken(ctx) {
               user: decodedJwt
             });
 
-          case 36:
+          case 46:
             return _context.abrupt("return", null);
 
-          case 39:
-            _context.prev = 39;
-            _context.t0 = _context["catch"](0);
-            console.log(_context.t0);
+          case 49:
+            _context.prev = 49;
+            _context.t1 = _context["catch"](0);
+            console.log(_context.t1);
             return _context.abrupt("return", null);
 
-          case 43:
+          case 53:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 39]]);
+    }, _callee, null, [[0, 49], [4, 12]]);
   }));
 }
 function addToCookies(cookieValue, res) {
@@ -1439,38 +1622,40 @@ function removeCookies(cookieName, isSecured, cookieDomain, res) {
   res.setHeader('set-cookie', [].concat(_toConsumableArray(existingSetCookie), [cookieValue]));
 }
 function createSessionFromAccessToken(output) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
-    var _JSON$parse, accessToken, decodedJwt, session;
+  var _a;
 
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
+    var data, accessToken, decodedJwt, session;
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            _JSON$parse = JSON.parse(output), accessToken = _JSON$parse.accessToken;
+            data = JSON.parse(output);
+            accessToken = (_a = data === null || data === void 0 ? void 0 : data.accessToken) !== null && _a !== void 0 ? _a : data.access_token;
             decodedJwt = decodeJwt(accessToken);
             decodedJwt.expiresIn = Math.floor((decodedJwt.exp * 1000 - Date.now()) / 1000);
-            _context2.next = 6;
+            _context2.next = 7;
             return sealData(accessToken, {
               password: fronteggConfig.passwordsAsMap,
               ttl: decodedJwt.exp
             });
 
-          case 6:
+          case 7:
             session = _context2.sent;
             return _context2.abrupt("return", [session, decodedJwt]);
 
-          case 10:
-            _context2.prev = 10;
+          case 11:
+            _context2.prev = 11;
             _context2.t0 = _context2["catch"](0);
             return _context2.abrupt("return", []);
 
-          case 13:
+          case 14:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 10]]);
+    }, _callee2, null, [[0, 11]]);
   }));
 }
 var modifySetCookieIfUnsecure = function modifySetCookieIfUnsecure(setCookieValue, isSecured) {
@@ -1660,6 +1845,7 @@ var withFronteggApp = function withFronteggApp(app, options) {
   };
 
   fronteggConfig.authRoutes = (_b = (_a = options === null || options === void 0 ? void 0 : options.authOptions) === null || _a === void 0 ? void 0 : _a.routes) !== null && _b !== void 0 ? _b : {};
+  fronteggConfig.fronteggAppOptions = options !== null && options !== void 0 ? options : {};
 
   function CustomFronteggApp(appProps) {
     return jsx(FronteggProvider, Object.assign({}, options, {
@@ -1676,114 +1862,6 @@ var withFronteggApp = function withFronteggApp(app, options) {
   return CustomFronteggApp;
 };
 
-function getSession(req) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
-    var sealFromCookies, jwt, publicKey, _yield$jwtVerify, payload, session;
-
-    return regenerator.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            sealFromCookies = cookie.parse(req.headers.cookie || '')[fronteggConfig.cookieName];
-
-            if (sealFromCookies) {
-              _context.next = 4;
-              break;
-            }
-
-            return _context.abrupt("return", undefined);
-
-          case 4:
-            _context.next = 6;
-            return unsealData(sealFromCookies, {
-              password: fronteggConfig.passwordsAsMap
-            });
-
-          case 6:
-            jwt = _context.sent;
-            _context.next = 9;
-            return fronteggConfig.getJwtPublicKey();
-
-          case 9:
-            publicKey = _context.sent;
-            _context.next = 12;
-            return jwtVerify(jwt, publicKey);
-
-          case 12:
-            _yield$jwtVerify = _context.sent;
-            payload = _yield$jwtVerify.payload;
-            session = {
-              accessToken: jwt,
-              user: payload
-            };
-
-            if (!(session.user.exp * 1000 < Date.now())) {
-              _context.next = 17;
-              break;
-            }
-
-            return _context.abrupt("return", undefined);
-
-          case 17:
-            return _context.abrupt("return", session);
-
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
-            return _context.abrupt("return", undefined);
-
-          case 24:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 20]]);
-  }));
-}
-function withSSRSession(handler) {
-  var _this = this;
-
-  return function (context) {
-    return __awaiter(_this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
-      var session;
-      return regenerator.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return getSession(context.req);
-
-            case 2:
-              session = _context2.sent;
-
-              if (!session) {
-                _context2.next = 7;
-                break;
-              }
-
-              return _context2.abrupt("return", handler(context, session));
-
-            case 7:
-              return _context2.abrupt("return", {
-                redirect: {
-                  permanent: false,
-                  destination: "/account/login?redirectUrl=".concat(encodeURIComponent(context.req.url))
-                },
-                props: {}
-              });
-
-            case 8:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-  };
-}
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@frontegg/nextjs",
-  "version": "5.3.0",
+  "version": "5.4.0-alpha.2494518347",
   "dependencies": {
-    "@frontegg/admin-portal": "5.52.0",
-    "@frontegg/react-hooks": "5.52.0",
+    "@frontegg/admin-portal": "5.54.2",
+    "@frontegg/react-hooks": "5.54.2",
     "jose": "^4.8.0",
     "iron-session": "^6.1.2",
     "http-proxy": "^1.18.1",
@@ -16,4 +16,4 @@
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
   "typings": "./index.d.ts"
-}
+}