@frontegg/nextjs 5.11.0-alpha.2959008101 → 6.1.0-alpha.2962640568

package/AppContext.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import type { FronteggApp } from '@frontegg/admin-portal/FronteggApp';
+import type { FronteggApp } from '@frontegg/js';
 declare const AppContext: import("react").Context<FronteggApp | null>;
 export default AppContext;

package/FronteggConfig.d.ts

@@ -19,7 +19,6 @@ declare class FronteggConfig {
     get password(): string;
     get clientId(): string;
     get baseUrlHost(): string;
-    getEnvAppUrl(): string | undefined;
     get appUrl(): string;
     get cookieDomain(): string;
     getJwtPublicKey(): Promise<KeyLike | Uint8Array>;

package/index.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
-var adminPortal = require('@frontegg/admin-portal');
+var js = require('@frontegg/js');
 var reactHooks = require('@frontegg/react-hooks');
 var restApi = require('@frontegg/rest-api');
 var router = require('next/router');
@@ -127,9 +127,9 @@ var Connector = function Connector(_props) {
     var createdApp;
 
     try {
-      createdApp = adminPortal.AppHolder.getInstance(appName !== null && appName !== void 0 ? appName : 'default');
+      createdApp = js.AppHolder.getInstance(appName !== null && appName !== void 0 ? appName : 'default');
     } catch (e) {
-      createdApp = adminPortal.initialize(Object.assign(Object.assign({}, props), {
+      createdApp = js.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), {
@@ -1109,37 +1109,19 @@ var FronteggConfig = /*#__PURE__*/function () {
 
       return new URL((_a = process.env['FRONTEGG_BASE_URL']) !== null && _a !== void 0 ? _a : '').hostname;
     }
-  }, {
-    key: "getEnvAppUrl",
-    value: function getEnvAppUrl() {
-      var url = undefined;
-
-      if (process.env['VERCEL_URL']) {
-        url = process.env['VERCEL_URL'];
-      } else if (process.env['FRONTEGG_APP_URL']) {
-        url = process.env['FRONTEGG_APP_URL'];
-      }
-
-      if (url && !url.startsWith('http')) {
-        var protocol = url.startsWith('localhost') ? 'http://' : 'https://';
-        url = "".concat(protocol).concat(url);
-      }
-
-      return url;
-    }
   }, {
     key: "appUrl",
     get: function get() {
       var _a;
 
-      return (_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
+      return (_a = process.env['FRONTEGG_APP_URL']) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
     }
   }, {
     key: "cookieDomain",
     get: function get() {
       var _a;
 
-      return new URL((_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : '').hostname.replace(/:(\d)+$/, '');
+      return new URL((_a = process.env['FRONTEGG_APP_URL']) !== null && _a !== void 0 ? _a : '').hostname.replace(/:(\d)+$/, '');
     }
   }, {
     key: "getJwtPublicKey",
@@ -1785,7 +1767,7 @@ var withFronteggApp = function withFronteggApp(app, options) {
 
   app.getInitialProps = function (appContext) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
-      var _c, _d, ctx, Component, session, envAppUrl;
+      var _c, _d, ctx, Component, session;
 
       return regenerator.wrap(function _callee$(_context) {
         while (1) {
@@ -1794,7 +1776,7 @@ var withFronteggApp = function withFronteggApp(app, options) {
               ctx = appContext.ctx, Component = appContext.Component;
 
               if (!(((_d = (_c = ctx.req) === null || _c === void 0 ? void 0 : _c.url) === null || _d === void 0 ? void 0 : _d.indexOf('/_next/data/')) === -1)) {
-                _context.next = 40;
+                _context.next = 39;
                 break;
               }
 
@@ -1804,79 +1786,78 @@ var withFronteggApp = function withFronteggApp(app, options) {
             case 4:
               session = _context.sent;
               appContext.session = session;
-              envAppUrl = fronteggConfig.getEnvAppUrl();
 
-              if (envAppUrl) {
-                _context.next = 9;
+              if (process.env['FRONTEGG_APP_URL']) {
+                _context.next = 8;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_APP_URL');
 
-            case 9:
+            case 8:
               if (process.env['FRONTEGG_BASE_URL']) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_BASE_URL');
 
-            case 11:
+            case 10:
               if (process.env['FRONTEGG_CLIENT_ID']) {
-                _context.next = 13;
+                _context.next = 12;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_CLIENT_ID');
 
-            case 13:
+            case 12:
               _context.t0 = Object;
               _context.t1 = Object;
               _context.t2 = Object;
               _context.t3 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 23;
+                _context.next = 22;
                 break;
               }
 
-              _context.next = 20;
+              _context.next = 19;
               return originalGetInitialProps(appContext);
 
-            case 20:
+            case 19:
               _context.t4 = _context.sent;
-              _context.next = 24;
+              _context.next = 23;
               break;
 
-            case 23:
+            case 22:
               _context.t4 = {};
 
-            case 24:
+            case 23:
               _context.t5 = _context.t4;
               _context.t6 = _context.t2.assign.call(_context.t2, _context.t3, _context.t5);
 
               if (!Component.getInitialProps) {
-                _context.next = 32;
+                _context.next = 31;
                 break;
               }
 
-              _context.next = 29;
+              _context.next = 28;
               return Component.getInitialProps(ctx);
 
-            case 29:
+            case 28:
               _context.t7 = _context.sent;
-              _context.next = 33;
+              _context.next = 32;
               break;
 
-            case 32:
+            case 31:
               _context.t7 = {};
 
-            case 33:
+            case 32:
               _context.t8 = _context.t7;
               _context.t9 = _context.t1.assign.call(_context.t1, _context.t6, _context.t8);
               _context.t10 = {
                 session: session,
-                envAppUrl: envAppUrl,
+                envAppUrl: process.env['FRONTEGG_APP_URL'],
                 envBaseUrl: process.env['FRONTEGG_BASE_URL'],
                 envClientId: process.env['FRONTEGG_CLIENT_ID']
               };
@@ -1885,56 +1866,56 @@ var withFronteggApp = function withFronteggApp(app, options) {
                 pageProps: _context.t11
               });
 
-            case 40:
+            case 39:
               appContext.session = null;
               _context.t12 = Object;
               _context.t13 = Object;
               _context.t14 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 50;
+                _context.next = 49;
                 break;
               }
 
-              _context.next = 47;
+              _context.next = 46;
               return originalGetInitialProps(appContext);
 
-            case 47:
+            case 46:
               _context.t15 = _context.sent;
-              _context.next = 51;
+              _context.next = 50;
               break;
 
-            case 50:
+            case 49:
               _context.t15 = {};
 
-            case 51:
+            case 50:
               _context.t16 = _context.t15;
               _context.t17 = _context.t13.assign.call(_context.t13, _context.t14, _context.t16);
 
               if (!Component.getInitialProps) {
-                _context.next = 59;
+                _context.next = 58;
                 break;
               }
 
-              _context.next = 56;
+              _context.next = 55;
               return Component.getInitialProps(ctx);
 
-            case 56:
+            case 55:
               _context.t18 = _context.sent;
-              _context.next = 60;
+              _context.next = 59;
               break;
 
-            case 59:
+            case 58:
               _context.t18 = {};
 
-            case 60:
+            case 59:
               _context.t19 = _context.t18;
               _context.t20 = _context.t12.assign.call(_context.t12, _context.t17, _context.t19);
               return _context.abrupt("return", {
                 pageProps: _context.t20
               });
 
-            case 63:
+            case 62:
             case "end":
               return _context.stop();
           }
@@ -2142,7 +2123,7 @@ function fronteggMiddleware(req, res) {
 
 Object.defineProperty(exports, 'AdminPortal', {
     enumerable: true,
-    get: function () { return adminPortal.AdminPortal; }
+    get: function () { return js.AdminPortal; }
 });
 exports.AuthorizedContent = AuthorizedContent;
 exports.Connector = Connector;

package/index.d.ts

@@ -5,6 +5,6 @@ export * from './FronteggRouter';
 export * from './withFronteggApp';
 export * from './session';
 export * from './FronteggMiddleware';
-export { AdminPortal } from '@frontegg/admin-portal';
+export { AdminPortal } from '@frontegg/js';
 export * from '@frontegg/react-hooks';
 export * from '@frontegg/types';

package/index.esm.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createContext, useCallback, useMemo, useEffect, useContext } from 'react';
-import { AppHolder, initialize } from '@frontegg/admin-portal';
-export { AdminPortal } from '@frontegg/admin-portal';
+import { AppHolder, initialize } from '@frontegg/js';
+export { AdminPortal } from '@frontegg/js';
 import { FronteggStoreProvider, useAuthUserOrNull, useAuthActions, useLoginWithRedirect, useLoginActions } from '@frontegg/react-hooks';
 export * from '@frontegg/react-hooks';
 import { fronteggAuthApiRoutes, ContextHolder, fronteggRefreshTokenUrl } from '@frontegg/rest-api';
@@ -1083,37 +1083,19 @@ var FronteggConfig = /*#__PURE__*/function () {
 
       return new URL((_a = process.env['FRONTEGG_BASE_URL']) !== null && _a !== void 0 ? _a : '').hostname;
     }
-  }, {
-    key: "getEnvAppUrl",
-    value: function getEnvAppUrl() {
-      var url = undefined;
-
-      if (process.env['VERCEL_URL']) {
-        url = process.env['VERCEL_URL'];
-      } else if (process.env['FRONTEGG_APP_URL']) {
-        url = process.env['FRONTEGG_APP_URL'];
-      }
-
-      if (url && !url.startsWith('http')) {
-        var protocol = url.startsWith('localhost') ? 'http://' : 'https://';
-        url = "".concat(protocol).concat(url);
-      }
-
-      return url;
-    }
   }, {
     key: "appUrl",
     get: function get() {
       var _a;
 
-      return (_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
+      return (_a = process.env['FRONTEGG_APP_URL']) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
     }
   }, {
     key: "cookieDomain",
     get: function get() {
       var _a;
 
-      return new URL((_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : '').hostname.replace(/:(\d)+$/, '');
+      return new URL((_a = process.env['FRONTEGG_APP_URL']) !== null && _a !== void 0 ? _a : '').hostname.replace(/:(\d)+$/, '');
     }
   }, {
     key: "getJwtPublicKey",
@@ -1759,7 +1741,7 @@ var withFronteggApp = function withFronteggApp(app, options) {
 
   app.getInitialProps = function (appContext) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
-      var _c, _d, ctx, Component, session, envAppUrl;
+      var _c, _d, ctx, Component, session;
 
       return regenerator.wrap(function _callee$(_context) {
         while (1) {
@@ -1768,7 +1750,7 @@ var withFronteggApp = function withFronteggApp(app, options) {
               ctx = appContext.ctx, Component = appContext.Component;
 
               if (!(((_d = (_c = ctx.req) === null || _c === void 0 ? void 0 : _c.url) === null || _d === void 0 ? void 0 : _d.indexOf('/_next/data/')) === -1)) {
-                _context.next = 40;
+                _context.next = 39;
                 break;
               }
 
@@ -1778,79 +1760,78 @@ var withFronteggApp = function withFronteggApp(app, options) {
             case 4:
               session = _context.sent;
               appContext.session = session;
-              envAppUrl = fronteggConfig.getEnvAppUrl();
 
-              if (envAppUrl) {
-                _context.next = 9;
+              if (process.env['FRONTEGG_APP_URL']) {
+                _context.next = 8;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_APP_URL');
 
-            case 9:
+            case 8:
               if (process.env['FRONTEGG_BASE_URL']) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_BASE_URL');
 
-            case 11:
+            case 10:
               if (process.env['FRONTEGG_CLIENT_ID']) {
-                _context.next = 13;
+                _context.next = 12;
                 break;
               }
 
               throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_CLIENT_ID');
 
-            case 13:
+            case 12:
               _context.t0 = Object;
               _context.t1 = Object;
               _context.t2 = Object;
               _context.t3 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 23;
+                _context.next = 22;
                 break;
               }
 
-              _context.next = 20;
+              _context.next = 19;
               return originalGetInitialProps(appContext);
 
-            case 20:
+            case 19:
               _context.t4 = _context.sent;
-              _context.next = 24;
+              _context.next = 23;
               break;
 
-            case 23:
+            case 22:
               _context.t4 = {};
 
-            case 24:
+            case 23:
               _context.t5 = _context.t4;
               _context.t6 = _context.t2.assign.call(_context.t2, _context.t3, _context.t5);
 
               if (!Component.getInitialProps) {
-                _context.next = 32;
+                _context.next = 31;
                 break;
               }
 
-              _context.next = 29;
+              _context.next = 28;
               return Component.getInitialProps(ctx);
 
-            case 29:
+            case 28:
               _context.t7 = _context.sent;
-              _context.next = 33;
+              _context.next = 32;
               break;
 
-            case 32:
+            case 31:
               _context.t7 = {};
 
-            case 33:
+            case 32:
               _context.t8 = _context.t7;
               _context.t9 = _context.t1.assign.call(_context.t1, _context.t6, _context.t8);
               _context.t10 = {
                 session: session,
-                envAppUrl: envAppUrl,
+                envAppUrl: process.env['FRONTEGG_APP_URL'],
                 envBaseUrl: process.env['FRONTEGG_BASE_URL'],
                 envClientId: process.env['FRONTEGG_CLIENT_ID']
               };
@@ -1859,56 +1840,56 @@ var withFronteggApp = function withFronteggApp(app, options) {
                 pageProps: _context.t11
               });
 
-            case 40:
+            case 39:
               appContext.session = null;
               _context.t12 = Object;
               _context.t13 = Object;
               _context.t14 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 50;
+                _context.next = 49;
                 break;
               }
 
-              _context.next = 47;
+              _context.next = 46;
               return originalGetInitialProps(appContext);
 
-            case 47:
+            case 46:
               _context.t15 = _context.sent;
-              _context.next = 51;
+              _context.next = 50;
               break;
 
-            case 50:
+            case 49:
               _context.t15 = {};
 
-            case 51:
+            case 50:
               _context.t16 = _context.t15;
               _context.t17 = _context.t13.assign.call(_context.t13, _context.t14, _context.t16);
 
               if (!Component.getInitialProps) {
-                _context.next = 59;
+                _context.next = 58;
                 break;
               }
 
-              _context.next = 56;
+              _context.next = 55;
               return Component.getInitialProps(ctx);
 
-            case 56:
+            case 55:
               _context.t18 = _context.sent;
-              _context.next = 60;
+              _context.next = 59;
               break;
 
-            case 59:
+            case 58:
               _context.t18 = {};
 
-            case 60:
+            case 59:
               _context.t19 = _context.t18;
               _context.t20 = _context.t12.assign.call(_context.t12, _context.t17, _context.t19);
               return _context.abrupt("return", {
                 pageProps: _context.t20
               });
 
-            case 63:
+            case 62:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@frontegg/nextjs",
-  "version": "5.11.0-alpha.2959008101",
+  "version": "6.1.0-alpha.2962640568",
   "dependencies": {
-    "@frontegg/admin-portal": "5.80.2",
-    "@frontegg/react-hooks": "5.80.2",
+    "@frontegg/js": "6.0.3-alpha.4",
+    "@frontegg/react-hooks": "6.0.3-alpha.4",
     "jose": "^4.8.0",
     "iron-session": "^6.1.2",
     "http-proxy": "^1.18.1",