@frontegg/nextjs 6.7.6-alpha.3627250069 → 6.7.6-alpha.3676548486

package/FronteggConfig.d.ts

@@ -1,6 +1,7 @@
 import { KeyLike } from 'jose';
 import { AuthPageRoutes } from '@frontegg/redux-store';
 import { FronteggAppOptions } from '@frontegg/types';
+import { AppEnvConfig } from './types';
 export declare type PasswordsMap = {
     [id: string]: string;
 };
@@ -21,6 +22,7 @@ declare class FronteggConfig {
     get baseUrlHost(): string;
     getEnvAppUrl(): string | undefined;
     get appUrl(): string;
+    get appEnvConfig(): AppEnvConfig;
     get cookieDomain(): string;
     getJwtPublicKey(): Promise<KeyLike | Uint8Array>;
     get passwordsAsMap(): PasswordsMap;

package/FronteggProvider.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { FronteggAppOptions } from '@frontegg/types';
-import { FronteggNextJSSession } from './types';
-export declare type FronteggProviderProps = Omit<FronteggAppOptions, 'contextOptions'> & {
+import { MeAndTenants, FronteggNextJSSession } from './types';
+export declare type FronteggProviderProps = Omit<FronteggAppOptions, 'contextOptions'> & MeAndTenants & {
     children?: ReactNode;
     session?: FronteggNextJSSession;
     envAppUrl: string;

package/api.d.ts

@@ -0,0 +1,3 @@
+import { ILoginResponse, ITenantsResponse } from '@frontegg/rest-api';
+export declare const getUsers: (headers: Record<string, string>) => Promise<ILoginResponse | undefined>;
+export declare const getTenants: (headers: Record<string, string>) => Promise<ITenantsResponse[] | undefined>;

package/consts.d.ts

@@ -0,0 +1,5 @@
+export declare const fronteggErrors: {
+    envAppUrl: string;
+    envBaseUrl: string;
+    envClientId: string;
+};

package/helpers.d.ts

@@ -2,7 +2,7 @@
 import { ServerResponse } from 'http';
 import { CookieSerializeOptions } from 'cookie';
 import { NextPageContext } from 'next/dist/shared/lib/utils';
-import { FronteggNextJSSession } from './types';
+import { FronteggNextJSSession, MeAndTenants } from './types';
 export declare function refreshToken(ctx: NextPageContext): Promise<FronteggNextJSSession | null>;
 declare type CreateCookieArguments = {
     cookieName?: string;
@@ -21,4 +21,5 @@ export declare function compress(input: string): Promise<string>;
 export declare function uncompress(input: string): Promise<string>;
 export declare function createSessionFromAccessToken(output: string): Promise<[string, any, string] | []>;
 export declare const modifySetCookieIfUnsecure: (setCookieValue: string[] | undefined, isSecured: boolean) => string[] | undefined;
+export declare function meAndTenants(ctx: NextPageContext, accessToken?: string): Promise<MeAndTenants>;
 export {};

package/index.cjs.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 var js = require('@frontegg/js');
+var reduxStore = require('@frontegg/redux-store');
 var reactHooks = require('@frontegg/react-hooks');
 var restApi = require('@frontegg/rest-api');
 var router = require('next/router');
 var jose = require('jose');
-var reduxStore = require('@frontegg/redux-store');
 var url = require('url');
 var cookie = require('cookie');
 var ironSession = require('iron-session');
@@ -80,17 +80,25 @@ function __awaiter(thisArg, _arguments, P, generator) {
 
 var AppContext = /*#__PURE__*/react.createContext(null);
 
-var Connector$1 = function Connector(_props) {
-  var _a;
+var Connector$1 = function Connector(_a) {
+  var _b;
 
-  var router = _props.router,
-      appName = _props.appName,
-      hostedLoginBox = _props.hostedLoginBox,
-      customLoginBox = _props.customLoginBox,
-      props = __rest(_props, ["router", "appName", "hostedLoginBox", "customLoginBox"]);
+  var router = _a.router,
+      appName = _a.appName,
+      hostedLoginBox = _a.hostedLoginBox,
+      customLoginBox = _a.customLoginBox,
+      user = _a.user,
+      tenants = _a.tenants,
+      session = _a.session,
+      props = __rest(_a, ["router", "appName", "hostedLoginBox", "customLoginBox", "user", "tenants", "session"]);
+
+  var _ref = session !== null && session !== void 0 ? session : {},
+      accessToken = _ref.accessToken,
+      refreshToken = _ref.refreshToken;
 
   var isSSR = typeof window === 'undefined';
-  var baseName = (_a = props.basename) !== null && _a !== void 0 ? _a : router.basePath;
+  var storeHolder = react.useRef({});
+  var baseName = (_b = props.basename) !== null && _b !== void 0 ? _b : router.basePath;
   var onRedirectTo = react.useCallback(function (_path, opts) {
     var path = _path;
 
@@ -110,7 +118,9 @@ var Connector$1 = function Connector(_props) {
     }
   }, []);
   var contextOptions = react.useMemo(function () {
-    return {
+    return Object.assign(Object.assign({
+      requestCredentials: 'include'
+    }, props.contextOptions), {
       baseUrl: function baseUrl(path) {
         if (restApi.fronteggAuthApiRoutes.indexOf(path) !== -1 || path.endsWith('/postlogin') || path.endsWith('/prelogin') || path === '/oauth/token') {
           return "".concat(props.envAppUrl, "/api");
@@ -119,8 +129,41 @@ var Connector$1 = function Connector(_props) {
         }
       },
       clientId: props.envClientId
-    };
-  }, [props.envAppUrl, props.envBaseUrl, props.envClientId]);
+    });
+  }, [props.envAppUrl, props.envBaseUrl, props.envClientId, props.contextOptions]);
+  var authOptions = react.useMemo(function () {
+    var _a, _b, _c, _d;
+
+    var tenantsState = tenants ? Object.assign({
+      tenantTree: null,
+      subTenants: [],
+      tenants: tenants,
+      loading: false
+    }, (_a = props.authOptions) === null || _a === void 0 ? void 0 : _a.tenantsState) : undefined;
+    var userData = user ? Object.assign(Object.assign(Object.assign({}, user), {
+      accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '',
+      refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined
+    }), (_b = props.authOptions) === null || _b === void 0 ? void 0 : _b.user) : null;
+    return Object.assign(Object.assign({}, props.authOptions), {
+      onRedirectTo: onRedirectTo,
+      isLoading: false,
+      isAuthenticated: !!session,
+      hostedLoginBox: hostedLoginBox !== null && hostedLoginBox !== void 0 ? hostedLoginBox : false,
+      disableSilentRefresh: (_d = (_c = props.authOptions) === null || _c === void 0 ? void 0 : _c.disableSilentRefresh) !== null && _d !== void 0 ? _d : false,
+      user: userData,
+      tenantsState: tenantsState
+    });
+  }, [accessToken, hostedLoginBox, onRedirectTo, props.authOptions, refreshToken, session, tenants, user]);
+  var sharedStore = react.useMemo(function () {
+    var _a;
+
+    return reduxStore.createFronteggStore({
+      context: contextOptions
+    }, storeHolder.current, props.previewMode, authOptions, {
+      auth: authOptions !== null && authOptions !== void 0 ? authOptions : {},
+      audits: (_a = props.auditsOptions) !== null && _a !== void 0 ? _a : {}
+    }, false, props.urlStrategy);
+  }, [authOptions, contextOptions, props.auditsOptions, props.previewMode, props.urlStrategy]);
   var app = react.useMemo(function () {
     var _a;
 
@@ -128,34 +171,31 @@ var Connector$1 = function Connector(_props) {
 
     try {
       createdApp = js.AppHolder.getInstance(appName !== null && appName !== void 0 ? appName : 'default');
+      createdApp.store = sharedStore;
     } catch (e) {
       createdApp = js.initialize(Object.assign(Object.assign({}, props), {
+        store: sharedStore,
         hostedLoginBox: hostedLoginBox !== null && hostedLoginBox !== void 0 ? hostedLoginBox : false,
         customLoginBox: customLoginBox !== null && customLoginBox !== void 0 ? customLoginBox : 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),
+        authOptions: authOptions,
+        contextOptions: contextOptions,
         onRedirectTo: onRedirectTo
       }), appName !== null && appName !== void 0 ? appName : 'default');
     }
 
     return createdApp;
-  }, [appName, props, hostedLoginBox, baseName, onRedirectTo, contextOptions]);
+  }, [appName, props, hostedLoginBox, baseName, onRedirectTo, contextOptions, customLoginBox, authOptions, sharedStore]);
   restApi.ContextHolder.setOnRedirectTo(onRedirectTo);
   react.useEffect(function () {
-    var _a; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-
-
-    app.store.dispatch({
+    app === null || app === void 0 ? void 0 : app.store.dispatch({
       type: 'auth/requestAuthorizeSSR',
-      payload: (_a = props.session) !== null && _a !== void 0 ? _a : {
-        refreshToken: null,
-        accessToken: null
+      payload: {
+        accessToken: accessToken,
+        user: user ? Object.assign(Object.assign({}, user), {
+          refreshToken: refreshToken
+        }) : null,
+        tenants: tenants
       }
     });
   }, [app]);
@@ -1239,6 +1279,15 @@ var FronteggConfig = /*#__PURE__*/function () {
 
       return (_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
     }
+  }, {
+    key: "appEnvConfig",
+    get: function get() {
+      return {
+        envAppUrl: this.getEnvAppUrl(),
+        envBaseUrl: process.env['FRONTEGG_BASE_URL'],
+        envClientId: process.env['FRONTEGG_CLIENT_ID']
+      };
+    }
   }, {
     key: "cookieDomain",
     get: function get() {
@@ -1652,6 +1701,115 @@ function withSSRSession(handler) {
   };
 }
 
+var BASE_URL = "".concat(process.env['FRONTEGG_BASE_URL'], "/frontegg");
+
+var Get = function Get(_ref) {
+  var url = _ref.url,
+      _ref$credentials = _ref.credentials,
+      credentials = _ref$credentials === void 0 ? 'include' : _ref$credentials,
+      headers = _ref.headers;
+  return fetch(url, {
+    method: 'GET',
+    credentials: credentials,
+    headers: headers
+  });
+};
+
+var extractHeaders = function extractHeaders(headers) {
+  return {
+    'accept-encoding': headers['accept-encoding'],
+    'accept-language': headers['accept-language'],
+    cookie: headers['cookie'],
+    accept: headers['accept'],
+    'user-agent': headers['user-agent'],
+    connection: headers['connection'],
+    'cache-control': headers['cache-control'],
+    'Authorization': headers['Authorization']
+  };
+};
+
+var parseResponse = function parseResponse(res) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
+    var resText;
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (res.ok) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", undefined);
+
+          case 2:
+            _context.next = 4;
+            return res.text();
+
+          case 4:
+            resText = _context.sent;
+            return _context.abrupt("return", JSON.parse(resText));
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+};
+
+var getUsers = function getUsers(headers) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
+    var res;
+    return regenerator.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return Get({
+              url: "".concat(BASE_URL).concat(restApi.fronteggUsersUrl),
+              headers: extractHeaders(headers)
+            });
+
+          case 2:
+            res = _context2.sent;
+            return _context2.abrupt("return", parseResponse(res));
+
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+};
+var getTenants = function getTenants(headers) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee3() {
+    var res;
+    return regenerator.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return Get({
+              url: "".concat(BASE_URL).concat(restApi.fronteggTenantsUrl),
+              headers: extractHeaders(headers)
+            });
+
+          case 2:
+            res = _context3.sent;
+            return _context3.abrupt("return", parseResponse(res));
+
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+};
+
 function rewriteCookieProperty(header, config, property) {
   if (Array.isArray(header)) {
     return header.map(function (headerElement) {
@@ -2128,6 +2286,58 @@ var modifySetCookieIfUnsecure = function modifySetCookieIfUnsecure(setCookieValu
 
   return setCookieValue;
 };
+function meAndTenants(ctx, accessToken) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee5() {
+    var request, headers, _yield$Promise$all, _yield$Promise$all2, user, tenants;
+
+    return regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            request = ctx.req;
+
+            if (!(!request || !accessToken)) {
+              _context5.next = 3;
+              break;
+            }
+
+            return _context5.abrupt("return", {});
+
+          case 3:
+            headers = Object.assign(Object.assign({}, request.headers), {
+              Authorization: "Bearer ".concat(accessToken)
+            });
+            _context5.next = 6;
+            return Promise.all([getUsers(headers), getTenants(headers)]);
+
+          case 6:
+            _yield$Promise$all = _context5.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+            user = _yield$Promise$all2[0];
+            tenants = _yield$Promise$all2[1];
+            return _context5.abrupt("return", {
+              user: user,
+              tenants: tenants
+            });
+
+          case 11:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+}
+
+var envError = function envError(varName) {
+  return "@frontegg/nextjs: .env.local must contain ".concat(varName);
+};
+
+var fronteggErrors = {
+  envAppUrl: envError('FRONTEGG_APP_URL'),
+  envBaseUrl: envError('FRONTEGG_BASE_URL'),
+  envClientId: envError('FRONTEGG_CLIENT_ID')
+};
 
 var withFronteggApp = function withFronteggApp(app, options) {
   var _a, _b;
@@ -2136,7 +2346,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 ctx, Component, session, _yield$meAndTenants, user, tenants, _fronteggConfig$appEn, envAppUrl, envBaseUrl, envClientId;
 
       return regenerator.wrap(function _callee$(_context) {
         while (1) {
@@ -2144,8 +2354,8 @@ var withFronteggApp = function withFronteggApp(app, options) {
             case 0:
               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;
+              if (!ctx.req) {
+                _context.next = 47;
                 break;
               }
 
@@ -2154,79 +2364,90 @@ var withFronteggApp = function withFronteggApp(app, options) {
 
             case 4:
               session = _context.sent;
+              _context.next = 7;
+              return meAndTenants(ctx, session === null || session === void 0 ? void 0 : session.accessToken);
+
+            case 7:
+              _yield$meAndTenants = _context.sent;
+              user = _yield$meAndTenants.user;
+              tenants = _yield$meAndTenants.tenants;
               appContext.session = session;
-              envAppUrl = fronteggConfig.getEnvAppUrl();
+              appContext.user = user;
+              appContext.tenants = tenants;
+              _fronteggConfig$appEn = fronteggConfig.appEnvConfig, envAppUrl = _fronteggConfig$appEn.envAppUrl, envBaseUrl = _fronteggConfig$appEn.envBaseUrl, envClientId = _fronteggConfig$appEn.envClientId;
 
               if (envAppUrl) {
-                _context.next = 9;
+                _context.next = 16;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_APP_URL');
+              throw Error(fronteggErrors.envAppUrl);
 
-            case 9:
-              if (process.env['FRONTEGG_BASE_URL']) {
-                _context.next = 11;
+            case 16:
+              if (envBaseUrl) {
+                _context.next = 18;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_BASE_URL');
+              throw Error(fronteggErrors.envBaseUrl);
 
-            case 11:
-              if (process.env['FRONTEGG_CLIENT_ID']) {
-                _context.next = 13;
+            case 18:
+              if (envClientId) {
+                _context.next = 20;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_CLIENT_ID');
+              throw Error(fronteggErrors.envClientId);
 
-            case 13:
+            case 20:
               _context.t0 = Object;
               _context.t1 = Object;
               _context.t2 = Object;
               _context.t3 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 23;
+                _context.next = 30;
                 break;
               }
 
-              _context.next = 20;
+              _context.next = 27;
               return originalGetInitialProps(appContext);
 
-            case 20:
+            case 27:
               _context.t4 = _context.sent;
-              _context.next = 24;
+              _context.next = 31;
               break;
 
-            case 23:
+            case 30:
               _context.t4 = {};
 
-            case 24:
+            case 31:
               _context.t5 = _context.t4;
               _context.t6 = _context.t2.assign.call(_context.t2, _context.t3, _context.t5);
 
               if (!Component.getInitialProps) {
-                _context.next = 32;
+                _context.next = 39;
                 break;
               }
 
-              _context.next = 29;
+              _context.next = 36;
               return Component.getInitialProps(ctx);
 
-            case 29:
+            case 36:
               _context.t7 = _context.sent;
-              _context.next = 33;
+              _context.next = 40;
               break;
 
-            case 32:
+            case 39:
               _context.t7 = {};
 
-            case 33:
+            case 40:
               _context.t8 = _context.t7;
               _context.t9 = _context.t1.assign.call(_context.t1, _context.t6, _context.t8);
               _context.t10 = {
                 session: session,
+                user: user,
+                tenants: tenants,
                 envAppUrl: envAppUrl,
                 envBaseUrl: process.env['FRONTEGG_BASE_URL'],
                 envClientId: process.env['FRONTEGG_CLIENT_ID']
@@ -2236,56 +2457,56 @@ var withFronteggApp = function withFronteggApp(app, options) {
                 pageProps: _context.t11
               });
 
-            case 40:
+            case 47:
               appContext.session = null;
               _context.t12 = Object;
               _context.t13 = Object;
               _context.t14 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 50;
+                _context.next = 57;
                 break;
               }
 
-              _context.next = 47;
+              _context.next = 54;
               return originalGetInitialProps(appContext);
 
-            case 47:
+            case 54:
               _context.t15 = _context.sent;
-              _context.next = 51;
+              _context.next = 58;
               break;
 
-            case 50:
+            case 57:
               _context.t15 = {};
 
-            case 51:
+            case 58:
               _context.t16 = _context.t15;
               _context.t17 = _context.t13.assign.call(_context.t13, _context.t14, _context.t16);
 
               if (!Component.getInitialProps) {
-                _context.next = 59;
+                _context.next = 66;
                 break;
               }
 
-              _context.next = 56;
+              _context.next = 63;
               return Component.getInitialProps(ctx);
 
-            case 56:
+            case 63:
               _context.t18 = _context.sent;
-              _context.next = 60;
+              _context.next = 67;
               break;
 
-            case 59:
+            case 66:
               _context.t18 = {};
 
-            case 60:
+            case 67:
               _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 70:
             case "end":
               return _context.stop();
           }
@@ -2298,11 +2519,20 @@ var withFronteggApp = function withFronteggApp(app, options) {
   fronteggConfig.fronteggAppOptions = options !== null && options !== void 0 ? options : {};
 
   function CustomFronteggApp(appProps) {
+    var _appProps$pageProps = appProps.pageProps,
+        user = _appProps$pageProps.user,
+        tenants = _appProps$pageProps.tenants,
+        session = _appProps$pageProps.session,
+        envAppUrl = _appProps$pageProps.envAppUrl,
+        envBaseUrl = _appProps$pageProps.envBaseUrl,
+        envClientId = _appProps$pageProps.envClientId;
     return jsxRuntime.jsx(FronteggProvider, Object.assign({}, options, {
-      session: appProps.pageProps.session,
-      envAppUrl: appProps.pageProps.envAppUrl,
-      envBaseUrl: appProps.pageProps.envBaseUrl,
-      envClientId: appProps.pageProps.envClientId
+      user: user,
+      tenants: tenants,
+      session: session,
+      envAppUrl: envAppUrl,
+      envBaseUrl: envBaseUrl,
+      envClientId: envClientId
     }, {
       children: app(appProps)
     }));

package/index.esm.js

@@ -1,14 +1,14 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { createContext, useCallback, useMemo, useEffect, useContext } from 'react';
+import { createContext, useRef, useCallback, useMemo, useEffect, useContext } from 'react';
 import { AppHolder, initialize } from '@frontegg/js';
 export { AdminPortal } from '@frontegg/js';
+import { createFronteggStore, authInitialState } from '@frontegg/redux-store';
 import { FronteggStoreProvider, useAuthUserOrNull, useAuthActions, useLoginWithRedirect, useLoginActions } from '@frontegg/react-hooks';
 export * from '@frontegg/react-hooks';
-import { fronteggAuthApiRoutes, ContextHolder, fronteggRefreshTokenUrl, fronteggSilentRefreshTokenUrl } from '@frontegg/rest-api';
+import { fronteggAuthApiRoutes, ContextHolder, fronteggUsersUrl, fronteggTenantsUrl, fronteggRefreshTokenUrl, fronteggSilentRefreshTokenUrl } from '@frontegg/rest-api';
 export { ContextHolder } from '@frontegg/rest-api';
 import { useRouter } from 'next/router';
 import { importJWK, jwtVerify, decodeJwt } from 'jose';
-import { authInitialState } from '@frontegg/redux-store';
 import { parse } from 'url';
 import cookie from 'cookie';
 import { unsealData, sealData } from 'iron-session';
@@ -55,17 +55,25 @@ function __awaiter(thisArg, _arguments, P, generator) {
 
 var AppContext = /*#__PURE__*/createContext(null);
 
-var Connector$1 = function Connector(_props) {
-  var _a;
+var Connector$1 = function Connector(_a) {
+  var _b;
 
-  var router = _props.router,
-      appName = _props.appName,
-      hostedLoginBox = _props.hostedLoginBox,
-      customLoginBox = _props.customLoginBox,
-      props = __rest(_props, ["router", "appName", "hostedLoginBox", "customLoginBox"]);
+  var router = _a.router,
+      appName = _a.appName,
+      hostedLoginBox = _a.hostedLoginBox,
+      customLoginBox = _a.customLoginBox,
+      user = _a.user,
+      tenants = _a.tenants,
+      session = _a.session,
+      props = __rest(_a, ["router", "appName", "hostedLoginBox", "customLoginBox", "user", "tenants", "session"]);
+
+  var _ref = session !== null && session !== void 0 ? session : {},
+      accessToken = _ref.accessToken,
+      refreshToken = _ref.refreshToken;
 
   var isSSR = typeof window === 'undefined';
-  var baseName = (_a = props.basename) !== null && _a !== void 0 ? _a : router.basePath;
+  var storeHolder = useRef({});
+  var baseName = (_b = props.basename) !== null && _b !== void 0 ? _b : router.basePath;
   var onRedirectTo = useCallback(function (_path, opts) {
     var path = _path;
 
@@ -85,7 +93,9 @@ var Connector$1 = function Connector(_props) {
     }
   }, []);
   var contextOptions = useMemo(function () {
-    return {
+    return Object.assign(Object.assign({
+      requestCredentials: 'include'
+    }, props.contextOptions), {
       baseUrl: function baseUrl(path) {
         if (fronteggAuthApiRoutes.indexOf(path) !== -1 || path.endsWith('/postlogin') || path.endsWith('/prelogin') || path === '/oauth/token') {
           return "".concat(props.envAppUrl, "/api");
@@ -94,8 +104,41 @@ var Connector$1 = function Connector(_props) {
         }
       },
       clientId: props.envClientId
-    };
-  }, [props.envAppUrl, props.envBaseUrl, props.envClientId]);
+    });
+  }, [props.envAppUrl, props.envBaseUrl, props.envClientId, props.contextOptions]);
+  var authOptions = useMemo(function () {
+    var _a, _b, _c, _d;
+
+    var tenantsState = tenants ? Object.assign({
+      tenantTree: null,
+      subTenants: [],
+      tenants: tenants,
+      loading: false
+    }, (_a = props.authOptions) === null || _a === void 0 ? void 0 : _a.tenantsState) : undefined;
+    var userData = user ? Object.assign(Object.assign(Object.assign({}, user), {
+      accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '',
+      refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined
+    }), (_b = props.authOptions) === null || _b === void 0 ? void 0 : _b.user) : null;
+    return Object.assign(Object.assign({}, props.authOptions), {
+      onRedirectTo: onRedirectTo,
+      isLoading: false,
+      isAuthenticated: !!session,
+      hostedLoginBox: hostedLoginBox !== null && hostedLoginBox !== void 0 ? hostedLoginBox : false,
+      disableSilentRefresh: (_d = (_c = props.authOptions) === null || _c === void 0 ? void 0 : _c.disableSilentRefresh) !== null && _d !== void 0 ? _d : false,
+      user: userData,
+      tenantsState: tenantsState
+    });
+  }, [accessToken, hostedLoginBox, onRedirectTo, props.authOptions, refreshToken, session, tenants, user]);
+  var sharedStore = useMemo(function () {
+    var _a;
+
+    return createFronteggStore({
+      context: contextOptions
+    }, storeHolder.current, props.previewMode, authOptions, {
+      auth: authOptions !== null && authOptions !== void 0 ? authOptions : {},
+      audits: (_a = props.auditsOptions) !== null && _a !== void 0 ? _a : {}
+    }, false, props.urlStrategy);
+  }, [authOptions, contextOptions, props.auditsOptions, props.previewMode, props.urlStrategy]);
   var app = useMemo(function () {
     var _a;
 
@@ -103,34 +146,31 @@ var Connector$1 = function Connector(_props) {
 
     try {
       createdApp = AppHolder.getInstance(appName !== null && appName !== void 0 ? appName : 'default');
+      createdApp.store = sharedStore;
     } catch (e) {
       createdApp = initialize(Object.assign(Object.assign({}, props), {
+        store: sharedStore,
         hostedLoginBox: hostedLoginBox !== null && hostedLoginBox !== void 0 ? hostedLoginBox : false,
         customLoginBox: customLoginBox !== null && customLoginBox !== void 0 ? customLoginBox : 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),
+        authOptions: authOptions,
+        contextOptions: contextOptions,
         onRedirectTo: onRedirectTo
       }), appName !== null && appName !== void 0 ? appName : 'default');
     }
 
     return createdApp;
-  }, [appName, props, hostedLoginBox, baseName, onRedirectTo, contextOptions]);
+  }, [appName, props, hostedLoginBox, baseName, onRedirectTo, contextOptions, customLoginBox, authOptions, sharedStore]);
   ContextHolder.setOnRedirectTo(onRedirectTo);
   useEffect(function () {
-    var _a; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-
-
-    app.store.dispatch({
+    app === null || app === void 0 ? void 0 : app.store.dispatch({
       type: 'auth/requestAuthorizeSSR',
-      payload: (_a = props.session) !== null && _a !== void 0 ? _a : {
-        refreshToken: null,
-        accessToken: null
+      payload: {
+        accessToken: accessToken,
+        user: user ? Object.assign(Object.assign({}, user), {
+          refreshToken: refreshToken
+        }) : null,
+        tenants: tenants
       }
     });
   }, [app]);
@@ -1214,6 +1254,15 @@ var FronteggConfig = /*#__PURE__*/function () {
 
       return (_a = this.getEnvAppUrl()) !== null && _a !== void 0 ? _a : 'http://localhost:3000';
     }
+  }, {
+    key: "appEnvConfig",
+    get: function get() {
+      return {
+        envAppUrl: this.getEnvAppUrl(),
+        envBaseUrl: process.env['FRONTEGG_BASE_URL'],
+        envClientId: process.env['FRONTEGG_CLIENT_ID']
+      };
+    }
   }, {
     key: "cookieDomain",
     get: function get() {
@@ -1627,6 +1676,115 @@ function withSSRSession(handler) {
   };
 }
 
+var BASE_URL = "".concat(process.env['FRONTEGG_BASE_URL'], "/frontegg");
+
+var Get = function Get(_ref) {
+  var url = _ref.url,
+      _ref$credentials = _ref.credentials,
+      credentials = _ref$credentials === void 0 ? 'include' : _ref$credentials,
+      headers = _ref.headers;
+  return fetch(url, {
+    method: 'GET',
+    credentials: credentials,
+    headers: headers
+  });
+};
+
+var extractHeaders = function extractHeaders(headers) {
+  return {
+    'accept-encoding': headers['accept-encoding'],
+    'accept-language': headers['accept-language'],
+    cookie: headers['cookie'],
+    accept: headers['accept'],
+    'user-agent': headers['user-agent'],
+    connection: headers['connection'],
+    'cache-control': headers['cache-control'],
+    'Authorization': headers['Authorization']
+  };
+};
+
+var parseResponse = function parseResponse(res) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee() {
+    var resText;
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (res.ok) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", undefined);
+
+          case 2:
+            _context.next = 4;
+            return res.text();
+
+          case 4:
+            resText = _context.sent;
+            return _context.abrupt("return", JSON.parse(resText));
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+};
+
+var getUsers = function getUsers(headers) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
+    var res;
+    return regenerator.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return Get({
+              url: "".concat(BASE_URL).concat(fronteggUsersUrl),
+              headers: extractHeaders(headers)
+            });
+
+          case 2:
+            res = _context2.sent;
+            return _context2.abrupt("return", parseResponse(res));
+
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+};
+var getTenants = function getTenants(headers) {
+  return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee3() {
+    var res;
+    return regenerator.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return Get({
+              url: "".concat(BASE_URL).concat(fronteggTenantsUrl),
+              headers: extractHeaders(headers)
+            });
+
+          case 2:
+            res = _context3.sent;
+            return _context3.abrupt("return", parseResponse(res));
+
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+};
+
 function rewriteCookieProperty(header, config, property) {
   if (Array.isArray(header)) {
     return header.map(function (headerElement) {
@@ -2103,6 +2261,58 @@ var modifySetCookieIfUnsecure = function modifySetCookieIfUnsecure(setCookieValu
 
   return setCookieValue;
 };
+function meAndTenants(ctx, accessToken) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee5() {
+    var request, headers, _yield$Promise$all, _yield$Promise$all2, user, tenants;
+
+    return regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            request = ctx.req;
+
+            if (!(!request || !accessToken)) {
+              _context5.next = 3;
+              break;
+            }
+
+            return _context5.abrupt("return", {});
+
+          case 3:
+            headers = Object.assign(Object.assign({}, request.headers), {
+              Authorization: "Bearer ".concat(accessToken)
+            });
+            _context5.next = 6;
+            return Promise.all([getUsers(headers), getTenants(headers)]);
+
+          case 6:
+            _yield$Promise$all = _context5.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+            user = _yield$Promise$all2[0];
+            tenants = _yield$Promise$all2[1];
+            return _context5.abrupt("return", {
+              user: user,
+              tenants: tenants
+            });
+
+          case 11:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+}
+
+var envError = function envError(varName) {
+  return "@frontegg/nextjs: .env.local must contain ".concat(varName);
+};
+
+var fronteggErrors = {
+  envAppUrl: envError('FRONTEGG_APP_URL'),
+  envBaseUrl: envError('FRONTEGG_BASE_URL'),
+  envClientId: envError('FRONTEGG_CLIENT_ID')
+};
 
 var withFronteggApp = function withFronteggApp(app, options) {
   var _a, _b;
@@ -2111,7 +2321,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 ctx, Component, session, _yield$meAndTenants, user, tenants, _fronteggConfig$appEn, envAppUrl, envBaseUrl, envClientId;
 
       return regenerator.wrap(function _callee$(_context) {
         while (1) {
@@ -2119,8 +2329,8 @@ var withFronteggApp = function withFronteggApp(app, options) {
             case 0:
               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;
+              if (!ctx.req) {
+                _context.next = 47;
                 break;
               }
 
@@ -2129,79 +2339,90 @@ var withFronteggApp = function withFronteggApp(app, options) {
 
             case 4:
               session = _context.sent;
+              _context.next = 7;
+              return meAndTenants(ctx, session === null || session === void 0 ? void 0 : session.accessToken);
+
+            case 7:
+              _yield$meAndTenants = _context.sent;
+              user = _yield$meAndTenants.user;
+              tenants = _yield$meAndTenants.tenants;
               appContext.session = session;
-              envAppUrl = fronteggConfig.getEnvAppUrl();
+              appContext.user = user;
+              appContext.tenants = tenants;
+              _fronteggConfig$appEn = fronteggConfig.appEnvConfig, envAppUrl = _fronteggConfig$appEn.envAppUrl, envBaseUrl = _fronteggConfig$appEn.envBaseUrl, envClientId = _fronteggConfig$appEn.envClientId;
 
               if (envAppUrl) {
-                _context.next = 9;
+                _context.next = 16;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_APP_URL');
+              throw Error(fronteggErrors.envAppUrl);
 
-            case 9:
-              if (process.env['FRONTEGG_BASE_URL']) {
-                _context.next = 11;
+            case 16:
+              if (envBaseUrl) {
+                _context.next = 18;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_BASE_URL');
+              throw Error(fronteggErrors.envBaseUrl);
 
-            case 11:
-              if (process.env['FRONTEGG_CLIENT_ID']) {
-                _context.next = 13;
+            case 18:
+              if (envClientId) {
+                _context.next = 20;
                 break;
               }
 
-              throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_CLIENT_ID');
+              throw Error(fronteggErrors.envClientId);
 
-            case 13:
+            case 20:
               _context.t0 = Object;
               _context.t1 = Object;
               _context.t2 = Object;
               _context.t3 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 23;
+                _context.next = 30;
                 break;
               }
 
-              _context.next = 20;
+              _context.next = 27;
               return originalGetInitialProps(appContext);
 
-            case 20:
+            case 27:
               _context.t4 = _context.sent;
-              _context.next = 24;
+              _context.next = 31;
               break;
 
-            case 23:
+            case 30:
               _context.t4 = {};
 
-            case 24:
+            case 31:
               _context.t5 = _context.t4;
               _context.t6 = _context.t2.assign.call(_context.t2, _context.t3, _context.t5);
 
               if (!Component.getInitialProps) {
-                _context.next = 32;
+                _context.next = 39;
                 break;
               }
 
-              _context.next = 29;
+              _context.next = 36;
               return Component.getInitialProps(ctx);
 
-            case 29:
+            case 36:
               _context.t7 = _context.sent;
-              _context.next = 33;
+              _context.next = 40;
               break;
 
-            case 32:
+            case 39:
               _context.t7 = {};
 
-            case 33:
+            case 40:
               _context.t8 = _context.t7;
               _context.t9 = _context.t1.assign.call(_context.t1, _context.t6, _context.t8);
               _context.t10 = {
                 session: session,
+                user: user,
+                tenants: tenants,
                 envAppUrl: envAppUrl,
                 envBaseUrl: process.env['FRONTEGG_BASE_URL'],
                 envClientId: process.env['FRONTEGG_CLIENT_ID']
@@ -2211,56 +2432,56 @@ var withFronteggApp = function withFronteggApp(app, options) {
                 pageProps: _context.t11
               });
 
-            case 40:
+            case 47:
               appContext.session = null;
               _context.t12 = Object;
               _context.t13 = Object;
               _context.t14 = {};
 
               if (!originalGetInitialProps) {
-                _context.next = 50;
+                _context.next = 57;
                 break;
               }
 
-              _context.next = 47;
+              _context.next = 54;
               return originalGetInitialProps(appContext);
 
-            case 47:
+            case 54:
               _context.t15 = _context.sent;
-              _context.next = 51;
+              _context.next = 58;
               break;
 
-            case 50:
+            case 57:
               _context.t15 = {};
 
-            case 51:
+            case 58:
               _context.t16 = _context.t15;
               _context.t17 = _context.t13.assign.call(_context.t13, _context.t14, _context.t16);
 
               if (!Component.getInitialProps) {
-                _context.next = 59;
+                _context.next = 66;
                 break;
               }
 
-              _context.next = 56;
+              _context.next = 63;
               return Component.getInitialProps(ctx);
 
-            case 56:
+            case 63:
               _context.t18 = _context.sent;
-              _context.next = 60;
+              _context.next = 67;
               break;
 
-            case 59:
+            case 66:
               _context.t18 = {};
 
-            case 60:
+            case 67:
               _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 70:
             case "end":
               return _context.stop();
           }
@@ -2273,11 +2494,20 @@ var withFronteggApp = function withFronteggApp(app, options) {
   fronteggConfig.fronteggAppOptions = options !== null && options !== void 0 ? options : {};
 
   function CustomFronteggApp(appProps) {
+    var _appProps$pageProps = appProps.pageProps,
+        user = _appProps$pageProps.user,
+        tenants = _appProps$pageProps.tenants,
+        session = _appProps$pageProps.session,
+        envAppUrl = _appProps$pageProps.envAppUrl,
+        envBaseUrl = _appProps$pageProps.envBaseUrl,
+        envClientId = _appProps$pageProps.envClientId;
     return jsx(FronteggProvider, Object.assign({}, options, {
-      session: appProps.pageProps.session,
-      envAppUrl: appProps.pageProps.envAppUrl,
-      envBaseUrl: appProps.pageProps.envBaseUrl,
-      envClientId: appProps.pageProps.envClientId
+      user: user,
+      tenants: tenants,
+      session: session,
+      envAppUrl: envAppUrl,
+      envBaseUrl: envBaseUrl,
+      envClientId: envClientId
     }, {
       children: app(appProps)
     }));

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@frontegg/nextjs",
-  "version": "6.7.6-alpha.3627250069",
+  "version": "6.7.6-alpha.3676548486",
   "dependencies": {
-    "@frontegg/js": "6.49.0",
-    "@frontegg/react-hooks": "6.49.0",
+    "@frontegg/js": "6.50.0",
+    "@frontegg/react-hooks": "6.50.0",
     "jose": "^4.9.2",
     "iron-session": "^6.2.1",
     "http-proxy": "^1.18.1",

package/types.d.ts

@@ -1,3 +1,4 @@
+import { ILoginResponse, ITenantsResponse } from '@frontegg/rest-api';
 export interface AccountEnvironment {
     id: string;
     createdAt: string;
@@ -28,6 +29,15 @@ export interface FronteggNextJSSession {
         iss: string;
     };
 }
+export interface AppEnvConfig {
+    envAppUrl?: string;
+    envBaseUrl?: string;
+    envClientId?: string;
+}
+export interface MeAndTenants {
+    user?: ILoginResponse;
+    tenants?: ITenantsResponse[];
+}
 declare module 'iron-session' {
     interface IronSessionData {
         accessToken: FronteggNextJSSession['accessToken'];