@frontegg/nextjs 6.7.9 → 6.7.10-alpha.3866771854

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [6.7.10](https://github.com/frontegg/frontegg-nextjs/compare/v6.7.9...v6.7.10) (2023-1-8)
+
+
+### NextJS Wrapper 6.7.10:
+- FR-10153 - Fix app session bug without keepSessionAlive
+
 ## [6.7.9](https://github.com/frontegg/frontegg-nextjs/compare/v6.7.8...v6.7.9) (2022-12-20)
 
 - Added support for next 13 - app directory and server components

package/{CookieManager-c1d6c5b0.js → CookieManager-27107b90.js}

@@ -120,6 +120,14 @@ var FronteggConfig = /** @class */ (function () {
 }());
 var FronteggConfig$1 = new FronteggConfig();
 
+var envError = function (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 COOKIE_MAX_LENGTH = 4092;
+
 function chunkString(str, chunkSize) {
     var numChunks = Math.ceil(str.length / chunkSize);
     var chunks = [];
@@ -131,12 +139,12 @@ function chunkString(str, chunkSize) {
     return chunks;
 }
 
-var COOKIE_MAX_LENGTH = 4096;
 var CookieManager = /** @class */ (function () {
     function CookieManager() {
         var _this = this;
         this.getCookieName = function (cookieNumber, cookieName) {
-            return "".concat(cookieName !== null && cookieName !== void 0 ? cookieName : FronteggConfig$1.cookieName, "-").concat(cookieNumber);
+            if (cookieName === void 0) { cookieName = FronteggConfig$1.cookieName; }
+            return cookieNumber ? "".concat(cookieName, "-").concat(cookieNumber) : cookieName;
         };
         this.mapValueChunksToCookies = function (cookieName, valueChunks, options) {
             return valueChunks.map(function (chunk, index) { return cookie.serialize(_this.getCookieName(index + 1, cookieName), chunk, options); });
@@ -160,13 +168,13 @@ var CookieManager = /** @class */ (function () {
             }
             try {
                 var cookieStr = _this.getCookieStringFromRequest(req);
-                var allCookies = cookieStr && cookie.parse(cookieStr);
-                if (!allCookies) {
+                var cookies = cookieStr && cookie.parse(cookieStr);
+                if (!cookies) {
                     return [];
                 }
                 var cookieNumber = 1;
                 var cookieToRemove = [];
-                while (allCookies[_this.getCookieName(cookieNumber)]) {
+                while (cookies[_this.getCookieName(cookieNumber)]) {
                     cookieToRemove.push(_this.getCookieName(cookieNumber));
                     cookieNumber++;
                 }
@@ -233,7 +241,7 @@ var CookieManager = /** @class */ (function () {
             secure: isSecured,
         };
         var cookieValue = cookie.serialize(cookieName !== null && cookieName !== void 0 ? cookieName : this.getCookieName(1), value, options);
-        if (cookieValue.length < COOKIE_MAX_LENGTH) {
+        if (cookieValue.length <= COOKIE_MAX_LENGTH) {
             return [cookieValue];
         }
         var valueChunks = this.splitValueToChunks(cookieName, value, options);
@@ -252,20 +260,18 @@ var CookieManager = /** @class */ (function () {
         return this.parseCookie(cookieStr);
     };
     CookieManager.prototype.parseCookie = function (cookieStr) {
+        var cookies = cookie.parse(cookieStr);
         var sealFromCookies = '';
         var i = 1;
-        while (cookie.parse(cookieStr)[this.getCookieName(i)]) {
-            sealFromCookies += cookie.parse(cookieStr)[this.getCookieName(i)];
+        while (cookies[this.getCookieName(i)]) {
+            sealFromCookies += cookies[this.getCookieName(i)];
             i++;
         }
         return sealFromCookies !== '' ? sealFromCookies : undefined;
     };
     CookieManager.prototype.parseCookieFromArray = function (cookies) {
-        var userCookie = cookies.find(function (c) { return c.name === FronteggConfig$1.cookieName; });
-        if (userCookie) {
-            return userCookie.value;
-        }
-        var cookieChunks = cookies.filter(function (c) { return c.name.includes(FronteggConfig$1.cookieName); });
+        var _this = this;
+        var cookieChunks = cookies.filter(function (c) { return c.name.includes(_this.getCookieName()); });
         if (!cookieChunks) {
             return undefined;
         }
@@ -299,5 +305,5 @@ var CookieManager = /** @class */ (function () {
 }());
 var CookieManager$1 = new CookieManager();
 
-export { CookieManager$1 as C, FronteggConfig$1 as F };
-//# sourceMappingURL=CookieManager-c1d6c5b0.js.map
+export { CookieManager$1 as C, FronteggConfig$1 as F, COOKIE_MAX_LENGTH as a, fronteggErrors as f };
+//# sourceMappingURL=CookieManager-27107b90.js.map

package/CookieManager-27107b90.js.map

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

package/{FronteggClientProviderNext13-3259fcd9.js → FronteggClientProviderNext13-d020161d.js}

@@ -1,6 +1,6 @@
 'use client'; 
  import { __assign, __rest } from 'tslib';
-import { useAuthUserOrNull, useAuthActions, FronteggStoreProvider } from '@frontegg/react-hooks';
+import { FronteggStoreProvider } from '@frontegg/react-hooks';
 import { fronteggAuthApiRoutes, ContextHolder } from '@frontegg/rest-api';
 import React, { createContext, useEffect, useRef, useCallback, useMemo } from 'react';
 import { AppHolder, initialize } from '@frontegg/js';
@@ -10,9 +10,10 @@ import { useRouter } from 'next/navigation';
 var AppContext = createContext(null);
 
 var createOrGetFronteggApp = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    var options = _a.options, onRedirectTo = _a.onRedirectTo, appName = _a.appName, user = _a.user, tenants = _a.tenants, storeHolder = _a.storeHolder;
-    var _l = (_b = options.session) !== null && _b !== void 0 ? _b : {}, accessToken = _l.accessToken, refreshToken = _l.refreshToken;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var options = _a.options, onRedirectTo = _a.onRedirectTo, appName = _a.appName, storeHolder = _a.storeHolder;
+    var session = options.session, user = options.user, tenants = options.tenants;
+    var _k = session !== null && session !== void 0 ? session : {}, accessToken = _k.accessToken, refreshToken = _k.refreshToken;
     var contextOptions = __assign(__assign({ requestCredentials: 'include' }, options.contextOptions), { baseUrl: function (path) {
             if (fronteggAuthApiRoutes.indexOf(path) !== -1 ||
                 path.endsWith('/postlogin') ||
@@ -25,13 +26,13 @@ var createOrGetFronteggApp = function (_a) {
             }
         }, clientId: options.envClientId });
     var tenantsState = tenants
-        ? __assign({ tenantTree: null, subTenants: [], tenants: tenants, loading: false }, (_c = options.authOptions) === null || _c === void 0 ? void 0 : _c.tenantsState) : undefined;
+        ? __assign({ tenantTree: null, subTenants: [], tenants: tenants, loading: false }, (_b = options.authOptions) === null || _b === void 0 ? void 0 : _b.tenantsState) : undefined;
     var userData = user
-        ? __assign(__assign(__assign({}, user), { accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '', refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined }), (_d = options.authOptions) === null || _d === void 0 ? void 0 : _d.user) : null;
-    var authOptions = __assign(__assign({}, options.authOptions), { onRedirectTo: onRedirectTo, isLoading: false, isAuthenticated: !!options.session, hostedLoginBox: (_e = options.hostedLoginBox) !== null && _e !== void 0 ? _e : false, disableSilentRefresh: (_g = (_f = options.authOptions) === null || _f === void 0 ? void 0 : _f.disableSilentRefresh) !== null && _g !== void 0 ? _g : false, user: userData, tenantsState: tenantsState });
+        ? __assign(__assign(__assign({}, user), { accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '', refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined }), (_c = options.authOptions) === null || _c === void 0 ? void 0 : _c.user) : null;
+    var authOptions = __assign(__assign({}, options.authOptions), { onRedirectTo: onRedirectTo, isLoading: false, isAuthenticated: !!options.session, hostedLoginBox: (_d = options.hostedLoginBox) !== null && _d !== void 0 ? _d : false, disableSilentRefresh: (_f = (_e = options.authOptions) === null || _e === void 0 ? void 0 : _e.disableSilentRefresh) !== null && _f !== void 0 ? _f : false, user: userData, tenantsState: tenantsState });
     var sharedStore = createFronteggStore({ context: contextOptions }, storeHolder.current, options.previewMode, authOptions, {
         auth: authOptions !== null && authOptions !== void 0 ? authOptions : {},
-        audits: (_h = options.auditsOptions) !== null && _h !== void 0 ? _h : {},
+        audits: (_g = options.auditsOptions) !== null && _g !== void 0 ? _g : {},
     }, false, options.urlStrategy);
     var createdApp;
     try {
@@ -39,31 +40,19 @@ var createOrGetFronteggApp = function (_a) {
         createdApp.store = sharedStore;
     }
     catch (e) {
-        createdApp = initialize(__assign(__assign({}, options), { store: sharedStore, hostedLoginBox: (_j = options.hostedLoginBox) !== null && _j !== void 0 ? _j : false, customLoginBox: (_k = options.customLoginBox) !== null && _k !== void 0 ? _k : false, basename: options.basename, authOptions: authOptions, contextOptions: contextOptions, onRedirectTo: onRedirectTo }), appName !== null && appName !== void 0 ? appName : 'default');
+        createdApp = initialize(__assign(__assign({}, options), { store: sharedStore, hostedLoginBox: (_h = options.hostedLoginBox) !== null && _h !== void 0 ? _h : false, customLoginBox: (_j = options.customLoginBox) !== null && _j !== void 0 ? _j : false, basename: options.basename, authOptions: authOptions, contextOptions: contextOptions, onRedirectTo: onRedirectTo }), appName !== null && appName !== void 0 ? appName : 'default');
     }
     return createdApp;
 };
 
-var ExpireInListener = function () {
-    var user = useAuthUserOrNull();
-    var actions = useAuthActions();
-    useEffect(function () {
-        if (user && (user === null || user === void 0 ? void 0 : user.expiresIn) == null) {
-            actions.setUser(__assign(__assign({}, user), { expiresIn: Math.floor((user['exp'] * 1000 - Date.now()) / 1000) }));
-        }
-    }, [actions, user]);
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    return React.createElement(React.Fragment, null);
-};
-
 var useRequestAuthorizeSSR = function (_a) {
-    var app = _a.app, accessToken = _a.accessToken, user = _a.user, tenants = _a.tenants, refreshToken = _a.refreshToken;
+    var app = _a.app, user = _a.user, tenants = _a.tenants, session = _a.session;
     useEffect(function () {
         app === null || app === void 0 ? void 0 : app.store.dispatch({
             type: 'auth/requestAuthorizeSSR',
             payload: {
-                accessToken: accessToken,
-                user: user ? __assign(__assign({}, user), { refreshToken: refreshToken }) : null,
+                accessToken: session === null || session === void 0 ? void 0 : session.accessToken,
+                user: user ? __assign(__assign({}, user), { refreshToken: session === null || session === void 0 ? void 0 : session.refreshToken }) : null,
                 tenants: tenants,
             },
         });
@@ -71,11 +60,11 @@ var useRequestAuthorizeSSR = function (_a) {
 };
 
 var Connector = function (_a) {
-    var _b, _c;
-    var router = _a.router, _d = _a.appName, appName = _d === void 0 ? 'default' : _d, user = _a.user, tenants = _a.tenants, props = __rest(_a, ["router", "appName", "user", "tenants"]);
+    var _b;
+    var router = _a.router, _c = _a.appName, appName = _c === void 0 ? 'default' : _c, props = __rest(_a, ["router", "appName"]);
     var isSSR = typeof window === 'undefined';
-    var _e = (_b = props.session) !== null && _b !== void 0 ? _b : {}, accessToken = _e.accessToken, refreshToken = _e.refreshToken;
-    var baseName = (_c = props.basename) !== null && _c !== void 0 ? _c : '';
+    var user = props.user, session = props.session, tenants = props.tenants;
+    var baseName = (_b = props.basename) !== null && _b !== void 0 ? _b : '';
     var storeHolder = useRef({});
     var onRedirectTo = useCallback(function (_path, opts) {
         var path = _path;
@@ -96,22 +85,18 @@ var Connector = function (_a) {
     var app = useMemo(function () {
         return createOrGetFronteggApp({
             options: __assign(__assign({}, props), { basename: baseName }),
-            user: user,
-            tenants: tenants,
             onRedirectTo: onRedirectTo,
             appName: appName,
             storeHolder: storeHolder,
         });
     }, [props]);
     ContextHolder.setOnRedirectTo(onRedirectTo);
-    useRequestAuthorizeSSR({ app: app, accessToken: accessToken, user: user, tenants: tenants, refreshToken: refreshToken });
+    useRequestAuthorizeSSR({ app: app, user: user, tenants: tenants, session: session });
     return (React.createElement(AppContext.Provider, { value: app },
         React.createElement(FronteggStoreProvider, __assign({}, __assign(__assign({}, props), { app: app })), props.children)));
 };
 var FronteggBaseProvider = function (props) {
-    return (React.createElement(Connector, __assign({}, props, { framework: 'nextjs' }),
-        React.createElement(ExpireInListener, null),
-        props.children));
+    return (React.createElement(Connector, __assign({}, props, { framework: 'nextjs' }), props.children));
 };
 
 var FronteggClientProviderNext13 = function (_a) {
@@ -122,4 +107,4 @@ var FronteggClientProviderNext13 = function (_a) {
 };
 
 export { AppContext as A, FronteggClientProviderNext13 as F };
-//# sourceMappingURL=FronteggClientProviderNext13-3259fcd9.js.map
+//# sourceMappingURL=FronteggClientProviderNext13-d020161d.js.map

package/FronteggClientProviderNext13-d020161d.js.map

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

package/client/index.js

@@ -1,14 +1,14 @@
 'use client'; 
  import { __assign, __spreadArray } from 'tslib';
-import { F as FronteggConfig } from '../CookieManager-c1d6c5b0.js';
-import '../api-25516652.js';
+import { F as FronteggConfig } from '../CookieManager-27107b90.js';
 import 'iron-session';
 import 'jose';
+import '../api-25516652.js';
+import { useContext, useEffect } from 'react';
 import { useLoginWithRedirect, useLoginActions } from '@frontegg/react-hooks';
 import '@frontegg/rest-api';
-import { useContext, useEffect } from 'react';
-import { A as AppContext } from '../FronteggClientProviderNext13-3259fcd9.js';
-export { F as FronteggClientProviderNext13 } from '../FronteggClientProviderNext13-3259fcd9.js';
+import { A as AppContext } from '../FronteggClientProviderNext13-d020161d.js';
+export { F as FronteggClientProviderNext13 } from '../FronteggClientProviderNext13-d020161d.js';
 import '@frontegg/js';
 import { authInitialState } from '@frontegg/redux-store';
 import { useRouter, notFound } from 'next/navigation';

package/common/CookieManager.d.ts

@@ -21,7 +21,7 @@ type RemoveCookiesArguments = {
 };
 declare class CookieManager {
     constructor();
-    getCookieName: (cookieNumber: number, cookieName?: string) => string;
+    getCookieName: (cookieNumber?: number, cookieName?: string) => string;
     rewriteCookieProperty(header: string | string[], config: any, property: string): string | string[];
     createCookie({ cookieName, value, expires, isSecured, cookieDomain, httpOnly, path, }: CreateCookieArguments): string[];
     splitValueToChunks(cookieName: string | undefined, value: string, options: CookieSerializeOptions): string[];

package/common/client/ExpireInListener.d.ts

@@ -1 +1,2 @@
+export declare const calculateExpiresInFromExp: (exp: number) => number;
 export declare const ExpireInListener: () => JSX.Element;

package/common/client/createOrGetFronteggApp.d.ts

@@ -1,11 +1,11 @@
 import { FronteggApp } from '@frontegg/js';
 import { AuthState } from '@frontegg/redux-store';
-import { FronteggProviderOptions, MeAndTenantsResponse } from '../types';
+import { FronteggProviderOptions } from '../types';
 type CreateOrGetFronteggAppParams = {
     options: FronteggProviderOptions;
     onRedirectTo: AuthState['onRedirectTo'];
     appName?: string;
     storeHolder: any;
-} & MeAndTenantsResponse;
-export declare const createOrGetFronteggApp: ({ options, onRedirectTo, appName, user, tenants, storeHolder, }: CreateOrGetFronteggAppParams) => FronteggApp;
+};
+export declare const createOrGetFronteggApp: ({ options, onRedirectTo, appName, storeHolder, }: CreateOrGetFronteggAppParams) => FronteggApp;
 export {};

package/common/client/hooks/useRequestAuthorizeSSR.d.ts

@@ -1,9 +1,5 @@
 import { FronteggApp } from '@frontegg/js';
-import { MeAndTenantsResponse } from '../../types';
-type useRequestAuthorizeSSR = {
+import { AllUserData } from '../../types';
+export declare const useRequestAuthorizeSSR: ({ app, user, tenants, session }: {
     app: FronteggApp;
-    accessToken?: string;
-    refreshToken?: string;
-} & MeAndTenantsResponse;
-export declare const useRequestAuthorizeSSR: ({ app, accessToken, user, tenants, refreshToken }: useRequestAuthorizeSSR) => void;
-export {};
+} & AllUserData) => void;

package/common/consts.d.ts

@@ -3,3 +3,4 @@ export declare const fronteggErrors: {
     envBaseUrl: string;
     envClientId: string;
 };
+export declare const COOKIE_MAX_LENGTH = 4092;

package/common/helpers.d.ts

@@ -1,3 +1,9 @@
-import { FronteggUserTokens } from './types';
+import { FronteggNextJSSession, FronteggUserTokens, AllUserData } from './types';
 export declare function createSessionFromAccessToken(output: string): Promise<[string, any, string] | []>;
 export declare function getTokensFromCookie(cookie?: string): Promise<FronteggUserTokens | undefined>;
+type UserDataArguments = {
+    getSession: () => Promise<FronteggNextJSSession | undefined | null>;
+    reqHeaders: Record<string, string | string[] | undefined>;
+};
+export declare const getAllUserData: ({ getSession, reqHeaders }: UserDataArguments) => Promise<Partial<AllUserData>>;
+export {};

package/common/index.d.ts

@@ -1,6 +1,5 @@
 export { default as FronteggConfig } from './FronteggConfig';
 export * from './types';
-export * from './getMeAndTenants';
 export * from './helpers';
 export * from './createGetSession';
 export * from './consts';

package/common/index.js

@@ -1,19 +1,12 @@
-export { C as CookieManager, F as FronteggConfig } from '../CookieManager-c1d6c5b0.js';
-export { c as createSessionFromAccessToken, a as getMeAndTenants, g as getTokensFromCookie } from '../helpers-942ef431.js';
-export { c as createGetSession } from '../createGetSession-b2281638.js';
+export { a as COOKIE_MAX_LENGTH, C as CookieManager, F as FronteggConfig, f as fronteggErrors } from '../CookieManager-27107b90.js';
+export { c as createSessionFromAccessToken, a as getAllUserData, g as getTokensFromCookie } from '../helpers-b15628e9.js';
+export { c as createGetSession } from '../createGetSession-bee8af0a.js';
 import 'tslib';
 import 'cookie';
 import 'jose';
+import 'iron-session';
 import '../api-25516652.js';
 import '@frontegg/rest-api';
-import 'iron-session';
-
-var envError = function (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'),
-};
-
-export { fronteggErrors };
+import 'react';
+import '@frontegg/react-hooks';
 //# sourceMappingURL=index.js.map

package/common/types.d.ts

@@ -17,9 +17,10 @@ export interface FronteggUserTokens {
     accessToken: string;
     refreshToken?: string;
 }
-export interface MeAndTenantsResponse {
-    user?: ILoginResponse;
-    tenants?: ITenantsResponse[];
+export interface AllUserData {
+    user?: ILoginResponse | null;
+    tenants?: ITenantsResponse[] | null;
+    session?: FronteggNextJSSession | null;
 }
 export interface FronteggUserSession {
     sub: string;
@@ -47,14 +48,13 @@ export interface AppEnvConfig {
     envBaseUrl?: string;
     envClientId?: string;
 }
-export interface FronteggProviderOptions extends Omit<FronteggAppOptions, 'contextOptions'> {
-    session?: FronteggNextJSSession;
+export interface FronteggProviderOptions extends Omit<FronteggAppOptions, 'contextOptions'>, AllUserData {
     envAppUrl: string;
     envBaseUrl: string;
     envClientId: string;
     contextOptions?: Omit<FronteggAppOptions['contextOptions'], 'baseUrl'>;
 }
-export interface FronteggProviderProps extends FronteggProviderOptions, MeAndTenantsResponse {
+export interface FronteggProviderProps extends FronteggProviderOptions {
     children?: ReactNode;
     router: AppRouterInstance | NextRouter;
     appName?: string;

package/{createGetSession-b2281638.js → createGetSession-bee8af0a.js}

@@ -1,6 +1,6 @@
 import { __awaiter, __generator } from 'tslib';
 import { jwtVerify } from 'jose';
-import { F as FronteggConfig } from './CookieManager-c1d6c5b0.js';
+import { F as FronteggConfig } from './CookieManager-27107b90.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-b2281638.js.map
+//# sourceMappingURL=createGetSession-bee8af0a.js.map

package/createGetSession-bee8af0a.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createGetSession-bee8af0a.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-c1d6c5b0.js';
-import { c as createGetSession } from '../createGetSession-b2281638.js';
+import { C as CookieManager, F as FronteggConfig } from '../CookieManager-27107b90.js';
+import { c as createGetSession } from '../createGetSession-bee8af0a.js';
 import 'cookie';
 import 'jose';
 

package/{helpers-942ef431.js → helpers-b15628e9.js}

@@ -1,27 +1,12 @@
 import { __awaiter, __generator, __assign } from 'tslib';
-import { g as getUsers, a as getTenants } from './api-25516652.js';
 import { sealData, unsealData } from 'iron-session';
 import { jwtVerify } from 'jose';
-import { F as FronteggConfig } from './CookieManager-c1d6c5b0.js';
+import { g as getUsers, a as getTenants } from './api-25516652.js';
+import 'react';
+import '@frontegg/react-hooks';
+import { F as FronteggConfig } from './CookieManager-27107b90.js';
 
-function getMeAndTenants(reqHeaders, accessToken) {
-    return __awaiter(this, void 0, void 0, function () {
-        var headers, _a, user, tenants;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!reqHeaders || !accessToken) {
-                        return [2 /*return*/, {}];
-                    }
-                    headers = __assign(__assign({}, reqHeaders), { Authorization: "Bearer ".concat(accessToken) });
-                    return [4 /*yield*/, Promise.all([getUsers(headers), getTenants(headers)])];
-                case 1:
-                    _a = _b.sent(), user = _a[0], tenants = _a[1];
-                    return [2 /*return*/, { user: user, tenants: tenants }];
-            }
-        });
-    });
-}
+var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
 
 function createSessionFromAccessToken(output) {
     var _a, _b;
@@ -75,7 +60,37 @@ function getTokensFromCookie(cookie) {
             }
         });
     });
-}
+}
+var getAllUserData = function (_a) {
+    var getSession = _a.getSession, reqHeaders = _a.reqHeaders;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var session, headers, _b, baseUser, tenants, user;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _d.trys.push([0, 3, , 4]);
+                    return [4 /*yield*/, getSession()];
+                case 1:
+                    session = _d.sent();
+                    if (!session)
+                        return [2 /*return*/, {}];
+                    headers = __assign(__assign({}, reqHeaders), { Authorization: "Bearer ".concat(session.accessToken) });
+                    return [4 /*yield*/, Promise.all([getUsers(headers), getTenants(headers)])];
+                case 2:
+                    _b = _d.sent(), baseUser = _b[0], tenants = _b[1];
+                    if (!baseUser || !tenants)
+                        return [2 /*return*/, {}];
+                    user = baseUser && session
+                        ? __assign(__assign(__assign({}, session.user), baseUser), { expiresIn: calculateExpiresInFromExp(session.user.exp) }) : undefined;
+                    return [2 /*return*/, { user: user, session: session, tenants: tenants }];
+                case 3:
+                    _d.sent();
+                    return [2 /*return*/, {}];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+};
 
-export { getMeAndTenants as a, createSessionFromAccessToken as c, getTokensFromCookie as g };
-//# sourceMappingURL=helpers-942ef431.js.map
+export { getAllUserData as a, createSessionFromAccessToken as c, getTokensFromCookie as g };
+//# sourceMappingURL=helpers-b15628e9.js.map

package/helpers-b15628e9.js.map

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

package/index.js

@@ -25,9 +25,10 @@ var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 var AppContext = React.createContext(null);
 
 var createOrGetFronteggApp = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    var options = _a.options, onRedirectTo = _a.onRedirectTo, appName = _a.appName, user = _a.user, tenants = _a.tenants, storeHolder = _a.storeHolder;
-    var _l = (_b = options.session) !== null && _b !== void 0 ? _b : {}, accessToken = _l.accessToken, refreshToken = _l.refreshToken;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var options = _a.options, onRedirectTo = _a.onRedirectTo, appName = _a.appName, storeHolder = _a.storeHolder;
+    var session = options.session, user = options.user, tenants = options.tenants;
+    var _k = session !== null && session !== void 0 ? session : {}, accessToken = _k.accessToken, refreshToken = _k.refreshToken;
     var contextOptions = tslib.__assign(tslib.__assign({ requestCredentials: 'include' }, options.contextOptions), { baseUrl: function (path) {
             if (restApi.fronteggAuthApiRoutes.indexOf(path) !== -1 ||
                 path.endsWith('/postlogin') ||
@@ -40,13 +41,13 @@ var createOrGetFronteggApp = function (_a) {
             }
         }, clientId: options.envClientId });
     var tenantsState = tenants
-        ? tslib.__assign({ tenantTree: null, subTenants: [], tenants: tenants, loading: false }, (_c = options.authOptions) === null || _c === void 0 ? void 0 : _c.tenantsState) : undefined;
+        ? tslib.__assign({ tenantTree: null, subTenants: [], tenants: tenants, loading: false }, (_b = options.authOptions) === null || _b === void 0 ? void 0 : _b.tenantsState) : undefined;
     var userData = user
-        ? tslib.__assign(tslib.__assign(tslib.__assign({}, user), { accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '', refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined }), (_d = options.authOptions) === null || _d === void 0 ? void 0 : _d.user) : null;
-    var authOptions = tslib.__assign(tslib.__assign({}, options.authOptions), { onRedirectTo: onRedirectTo, isLoading: false, isAuthenticated: !!options.session, hostedLoginBox: (_e = options.hostedLoginBox) !== null && _e !== void 0 ? _e : false, disableSilentRefresh: (_g = (_f = options.authOptions) === null || _f === void 0 ? void 0 : _f.disableSilentRefresh) !== null && _g !== void 0 ? _g : false, user: userData, tenantsState: tenantsState });
+        ? tslib.__assign(tslib.__assign(tslib.__assign({}, user), { accessToken: accessToken !== null && accessToken !== void 0 ? accessToken : '', refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : undefined }), (_c = options.authOptions) === null || _c === void 0 ? void 0 : _c.user) : null;
+    var authOptions = tslib.__assign(tslib.__assign({}, options.authOptions), { onRedirectTo: onRedirectTo, isLoading: false, isAuthenticated: !!options.session, hostedLoginBox: (_d = options.hostedLoginBox) !== null && _d !== void 0 ? _d : false, disableSilentRefresh: (_f = (_e = options.authOptions) === null || _e === void 0 ? void 0 : _e.disableSilentRefresh) !== null && _f !== void 0 ? _f : false, user: userData, tenantsState: tenantsState });
     var sharedStore = reduxStore.createFronteggStore({ context: contextOptions }, storeHolder.current, options.previewMode, authOptions, {
         auth: authOptions !== null && authOptions !== void 0 ? authOptions : {},
-        audits: (_h = options.auditsOptions) !== null && _h !== void 0 ? _h : {},
+        audits: (_g = options.auditsOptions) !== null && _g !== void 0 ? _g : {},
     }, false, options.urlStrategy);
     var createdApp;
     try {
@@ -54,31 +55,19 @@ var createOrGetFronteggApp = function (_a) {
         createdApp.store = sharedStore;
     }
     catch (e) {
-        createdApp = js.initialize(tslib.__assign(tslib.__assign({}, options), { store: sharedStore, hostedLoginBox: (_j = options.hostedLoginBox) !== null && _j !== void 0 ? _j : false, customLoginBox: (_k = options.customLoginBox) !== null && _k !== void 0 ? _k : false, basename: options.basename, authOptions: authOptions, contextOptions: contextOptions, onRedirectTo: onRedirectTo }), appName !== null && appName !== void 0 ? appName : 'default');
+        createdApp = js.initialize(tslib.__assign(tslib.__assign({}, options), { store: sharedStore, hostedLoginBox: (_h = options.hostedLoginBox) !== null && _h !== void 0 ? _h : false, customLoginBox: (_j = options.customLoginBox) !== null && _j !== void 0 ? _j : false, basename: options.basename, authOptions: authOptions, contextOptions: contextOptions, onRedirectTo: onRedirectTo }), appName !== null && appName !== void 0 ? appName : 'default');
     }
     return createdApp;
 };
 
-var ExpireInListener = function () {
-    var user = reactHooks.useAuthUserOrNull();
-    var actions = reactHooks.useAuthActions();
-    React.useEffect(function () {
-        if (user && (user === null || user === void 0 ? void 0 : user.expiresIn) == null) {
-            actions.setUser(tslib.__assign(tslib.__assign({}, user), { expiresIn: Math.floor((user['exp'] * 1000 - Date.now()) / 1000) }));
-        }
-    }, [actions, user]);
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    return React__default["default"].createElement(React__default["default"].Fragment, null);
-};
-
 var useRequestAuthorizeSSR = function (_a) {
-    var app = _a.app, accessToken = _a.accessToken, user = _a.user, tenants = _a.tenants, refreshToken = _a.refreshToken;
+    var app = _a.app, user = _a.user, tenants = _a.tenants, session = _a.session;
     React.useEffect(function () {
         app === null || app === void 0 ? void 0 : app.store.dispatch({
             type: 'auth/requestAuthorizeSSR',
             payload: {
-                accessToken: accessToken,
-                user: user ? tslib.__assign(tslib.__assign({}, user), { refreshToken: refreshToken }) : null,
+                accessToken: session === null || session === void 0 ? void 0 : session.accessToken,
+                user: user ? tslib.__assign(tslib.__assign({}, user), { refreshToken: session === null || session === void 0 ? void 0 : session.refreshToken }) : null,
                 tenants: tenants,
             },
         });
@@ -86,11 +75,11 @@ var useRequestAuthorizeSSR = function (_a) {
 };
 
 var Connector$1 = function (_a) {
-    var _b, _c;
-    var router = _a.router, _d = _a.appName, appName = _d === void 0 ? 'default' : _d, user = _a.user, tenants = _a.tenants, props = tslib.__rest(_a, ["router", "appName", "user", "tenants"]);
+    var _b;
+    var router = _a.router, _c = _a.appName, appName = _c === void 0 ? 'default' : _c, props = tslib.__rest(_a, ["router", "appName"]);
     var isSSR = typeof window === 'undefined';
-    var _e = (_b = props.session) !== null && _b !== void 0 ? _b : {}, accessToken = _e.accessToken, refreshToken = _e.refreshToken;
-    var baseName = (_c = props.basename) !== null && _c !== void 0 ? _c : '';
+    var user = props.user, session = props.session, tenants = props.tenants;
+    var baseName = (_b = props.basename) !== null && _b !== void 0 ? _b : '';
     var storeHolder = React.useRef({});
     var onRedirectTo = React.useCallback(function (_path, opts) {
         var path = _path;
@@ -111,22 +100,31 @@ var Connector$1 = function (_a) {
     var app = React.useMemo(function () {
         return createOrGetFronteggApp({
             options: tslib.__assign(tslib.__assign({}, props), { basename: baseName }),
-            user: user,
-            tenants: tenants,
             onRedirectTo: onRedirectTo,
             appName: appName,
             storeHolder: storeHolder,
         });
     }, [props]);
     restApi.ContextHolder.setOnRedirectTo(onRedirectTo);
-    useRequestAuthorizeSSR({ app: app, accessToken: accessToken, user: user, tenants: tenants, refreshToken: refreshToken });
+    useRequestAuthorizeSSR({ app: app, user: user, tenants: tenants, session: session });
     return (React__default["default"].createElement(AppContext.Provider, { value: app },
         React__default["default"].createElement(reactHooks.FronteggStoreProvider, tslib.__assign({}, tslib.__assign(tslib.__assign({}, props), { app: app })), props.children)));
 };
 var FronteggBaseProvider = function (props) {
-    return (React__default["default"].createElement(Connector$1, tslib.__assign({}, props, { framework: 'nextjs' }),
-        React__default["default"].createElement(ExpireInListener, null),
-        props.children));
+    return (React__default["default"].createElement(Connector$1, tslib.__assign({}, props, { framework: 'nextjs' }), props.children));
+};
+
+var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
+var ExpireInListener = function () {
+    var user = reactHooks.useAuthUserOrNull();
+    var actions = reactHooks.useAuthActions();
+    React.useEffect(function () {
+        if (user && (user === null || user === void 0 ? void 0 : user.expiresIn) == null) {
+            actions.setUser(tslib.__assign(tslib.__assign({}, user), { expiresIn: calculateExpiresInFromExp(user['exp']) }));
+        }
+    }, [actions, user]);
+    // eslint-disable-next-line react/jsx-no-useless-fragment
+    return React__default["default"].createElement(React__default["default"].Fragment, null);
 };
 
 var FronteggProvider = function (_a) {
@@ -402,25 +400,6 @@ var getTenants = function (headers) { return tslib.__awaiter(void 0, void 0, voi
     });
 }); };
 
-function getMeAndTenants(reqHeaders, accessToken) {
-    return tslib.__awaiter(this, void 0, void 0, function () {
-        var headers, _a, user, tenants;
-        return tslib.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!reqHeaders || !accessToken) {
-                        return [2 /*return*/, {}];
-                    }
-                    headers = tslib.__assign(tslib.__assign({}, reqHeaders), { Authorization: "Bearer ".concat(accessToken) });
-                    return [4 /*yield*/, Promise.all([getUsers(headers), getTenants(headers)])];
-                case 1:
-                    _a = _b.sent(), user = _a[0], tenants = _a[1];
-                    return [2 /*return*/, { user: user, tenants: tenants }];
-            }
-        });
-    });
-}
-
 function createSessionFromAccessToken(output) {
     var _a, _b;
     return tslib.__awaiter(this, void 0, void 0, function () {
@@ -473,7 +452,37 @@ function getTokensFromCookie(cookie) {
             }
         });
     });
-}
+}
+var getAllUserData = function (_a) {
+    var getSession = _a.getSession, reqHeaders = _a.reqHeaders;
+    return tslib.__awaiter(void 0, void 0, void 0, function () {
+        var session, headers, _b, baseUser, tenants, user;
+        return tslib.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    _d.trys.push([0, 3, , 4]);
+                    return [4 /*yield*/, getSession()];
+                case 1:
+                    session = _d.sent();
+                    if (!session)
+                        return [2 /*return*/, {}];
+                    headers = tslib.__assign(tslib.__assign({}, reqHeaders), { Authorization: "Bearer ".concat(session.accessToken) });
+                    return [4 /*yield*/, Promise.all([getUsers(headers), getTenants(headers)])];
+                case 2:
+                    _b = _d.sent(), baseUser = _b[0], tenants = _b[1];
+                    if (!baseUser || !tenants)
+                        return [2 /*return*/, {}];
+                    user = baseUser && session
+                        ? tslib.__assign(tslib.__assign(tslib.__assign({}, session.user), baseUser), { expiresIn: calculateExpiresInFromExp(session.user.exp) }) : undefined;
+                    return [2 /*return*/, { user: user, session: session, tenants: tenants }];
+                case 3:
+                    _d.sent();
+                    return [2 /*return*/, {}];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+};
 
 var createGetSession = function (_a) {
     var getCookie = _a.getCookie, cookieResolver = _a.cookieResolver;
@@ -524,7 +533,8 @@ var fronteggErrors = {
     envAppUrl: envError('FRONTEGG_APP_URL'),
     envBaseUrl: envError('FRONTEGG_BASE_URL'),
     envClientId: envError('FRONTEGG_CLIENT_ID'),
-};
+};
+var COOKIE_MAX_LENGTH = 4092;
 
 function chunkString(str, chunkSize) {
     var numChunks = Math.ceil(str.length / chunkSize);
@@ -537,12 +547,12 @@ function chunkString(str, chunkSize) {
     return chunks;
 }
 
-var COOKIE_MAX_LENGTH = 4096;
 var CookieManager = /** @class */ (function () {
     function CookieManager() {
         var _this = this;
         this.getCookieName = function (cookieNumber, cookieName) {
-            return "".concat(cookieName !== null && cookieName !== void 0 ? cookieName : fronteggConfig.cookieName, "-").concat(cookieNumber);
+            if (cookieName === void 0) { cookieName = fronteggConfig.cookieName; }
+            return cookieNumber ? "".concat(cookieName, "-").concat(cookieNumber) : cookieName;
         };
         this.mapValueChunksToCookies = function (cookieName, valueChunks, options) {
             return valueChunks.map(function (chunk, index) { return cookie__default["default"].serialize(_this.getCookieName(index + 1, cookieName), chunk, options); });
@@ -566,13 +576,13 @@ var CookieManager = /** @class */ (function () {
             }
             try {
                 var cookieStr = _this.getCookieStringFromRequest(req);
-                var allCookies = cookieStr && cookie__default["default"].parse(cookieStr);
-                if (!allCookies) {
+                var cookies = cookieStr && cookie__default["default"].parse(cookieStr);
+                if (!cookies) {
                     return [];
                 }
                 var cookieNumber = 1;
                 var cookieToRemove = [];
-                while (allCookies[_this.getCookieName(cookieNumber)]) {
+                while (cookies[_this.getCookieName(cookieNumber)]) {
                     cookieToRemove.push(_this.getCookieName(cookieNumber));
                     cookieNumber++;
                 }
@@ -639,7 +649,7 @@ var CookieManager = /** @class */ (function () {
             secure: isSecured,
         };
         var cookieValue = cookie__default["default"].serialize(cookieName !== null && cookieName !== void 0 ? cookieName : this.getCookieName(1), value, options);
-        if (cookieValue.length < COOKIE_MAX_LENGTH) {
+        if (cookieValue.length <= COOKIE_MAX_LENGTH) {
             return [cookieValue];
         }
         var valueChunks = this.splitValueToChunks(cookieName, value, options);
@@ -658,20 +668,18 @@ var CookieManager = /** @class */ (function () {
         return this.parseCookie(cookieStr);
     };
     CookieManager.prototype.parseCookie = function (cookieStr) {
+        var cookies = cookie__default["default"].parse(cookieStr);
         var sealFromCookies = '';
         var i = 1;
-        while (cookie__default["default"].parse(cookieStr)[this.getCookieName(i)]) {
-            sealFromCookies += cookie__default["default"].parse(cookieStr)[this.getCookieName(i)];
+        while (cookies[this.getCookieName(i)]) {
+            sealFromCookies += cookies[this.getCookieName(i)];
             i++;
         }
         return sealFromCookies !== '' ? sealFromCookies : undefined;
     };
     CookieManager.prototype.parseCookieFromArray = function (cookies) {
-        var userCookie = cookies.find(function (c) { return c.name === fronteggConfig.cookieName; });
-        if (userCookie) {
-            return userCookie.value;
-        }
-        var cookieChunks = cookies.filter(function (c) { return c.name.includes(fronteggConfig.cookieName); });
+        var _this = this;
+        var cookieChunks = cookies.filter(function (c) { return c.name.includes(_this.getCookieName()); });
         if (!cookieChunks) {
             return undefined;
         }
@@ -969,20 +977,25 @@ var withFronteggApp = function (app, options) {
     var _a, _b;
     var originalGetInitialProps = app.getInitialProps;
     app.getInitialProps = function (appContext) { return tslib.__awaiter(void 0, void 0, void 0, function () {
-        var ctx, Component, session, _a, user, tenants, _b, envAppUrl, envBaseUrl, envClientId, _c, _d, _e, _f, _g, _h, _j, _k;
+        var ctx, Component, _a, user, tenants, session, _b, envAppUrl, envBaseUrl, envClientId, _c, _d, _e, _f, _g, _h, _j, _k;
         var _l, _m;
         var _o;
         return tslib.__generator(this, function (_p) {
             switch (_p.label) {
                 case 0:
                     ctx = appContext.ctx, Component = appContext.Component;
-                    if (!ctx.req) return [3 /*break*/, 9];
-                    return [4 /*yield*/, refreshToken(ctx)];
+                    if (!ctx.req) return [3 /*break*/, 8];
+                    return [4 /*yield*/, getAllUserData({
+                            getSession: function () { return tslib.__awaiter(void 0, void 0, void 0, function () { return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, refreshToken(ctx)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            }); }); },
+                            reqHeaders: (_o = ctx.req) === null || _o === void 0 ? void 0 : _o.headers,
+                        })];
                 case 1:
-                    session = _p.sent();
-                    return [4 /*yield*/, getMeAndTenants((_o = ctx.req) === null || _o === void 0 ? void 0 : _o.headers, session === null || session === void 0 ? void 0 : session.accessToken)];
-                case 2:
-                    _a = _p.sent(), user = _a.user, tenants = _a.tenants;
+                    _a = _p.sent(), user = _a.user, tenants = _a.tenants, session = _a.session;
                     appContext.session = session;
                     appContext.user = user;
                     appContext.tenants = tenants;
@@ -998,49 +1011,49 @@ var withFronteggApp = function (app, options) {
                     }
                     _l = {};
                     _c = [{}];
-                    if (!originalGetInitialProps) return [3 /*break*/, 4];
+                    if (!originalGetInitialProps) return [3 /*break*/, 3];
                     return [4 /*yield*/, originalGetInitialProps(appContext)];
-                case 3:
+                case 2:
                     _d = _p.sent();
-                    return [3 /*break*/, 5];
-                case 4:
+                    return [3 /*break*/, 4];
+                case 3:
                     _d = {};
-                    _p.label = 5;
-                case 5:
+                    _p.label = 4;
+                case 4:
                     _e = [tslib.__assign.apply(void 0, _c.concat([(_d)]))];
-                    if (!Component.getInitialProps) return [3 /*break*/, 7];
+                    if (!Component.getInitialProps) return [3 /*break*/, 6];
                     return [4 /*yield*/, Component.getInitialProps(ctx)];
-                case 6:
+                case 5:
                     _f = _p.sent();
-                    return [3 /*break*/, 8];
-                case 7:
+                    return [3 /*break*/, 7];
+                case 6:
                     _f = {};
-                    _p.label = 8;
-                case 8: return [2 /*return*/, (_l.pageProps = tslib.__assign.apply(void 0, [tslib.__assign.apply(void 0, _e.concat([(_f)])), { session: session, user: user, tenants: tenants, envAppUrl: envAppUrl, envBaseUrl: process.env['FRONTEGG_BASE_URL'], envClientId: process.env['FRONTEGG_CLIENT_ID'] }]),
+                    _p.label = 7;
+                case 7: return [2 /*return*/, (_l.pageProps = tslib.__assign.apply(void 0, [tslib.__assign.apply(void 0, _e.concat([(_f)])), { session: session, user: user, tenants: tenants, envAppUrl: envAppUrl, envBaseUrl: process.env['FRONTEGG_BASE_URL'], envClientId: process.env['FRONTEGG_CLIENT_ID'] }]),
                         _l)];
-                case 9:
+                case 8:
                     appContext.session = null;
                     _m = {};
                     _g = [{}];
-                    if (!originalGetInitialProps) return [3 /*break*/, 11];
+                    if (!originalGetInitialProps) return [3 /*break*/, 10];
                     return [4 /*yield*/, originalGetInitialProps(appContext)];
-                case 10:
+                case 9:
                     _h = _p.sent();
-                    return [3 /*break*/, 12];
-                case 11:
+                    return [3 /*break*/, 11];
+                case 10:
                     _h = {};
-                    _p.label = 12;
-                case 12:
+                    _p.label = 11;
+                case 11:
                     _j = [tslib.__assign.apply(void 0, _g.concat([(_h)]))];
-                    if (!Component.getInitialProps) return [3 /*break*/, 14];
+                    if (!Component.getInitialProps) return [3 /*break*/, 13];
                     return [4 /*yield*/, Component.getInitialProps(ctx)];
-                case 13:
+                case 12:
                     _k = _p.sent();
-                    return [3 /*break*/, 15];
-                case 14:
+                    return [3 /*break*/, 14];
+                case 13:
                     _k = {};
-                    _p.label = 15;
-                case 15: return [2 /*return*/, (_m.pageProps = tslib.__assign.apply(void 0, _j.concat([(_k)])),
+                    _p.label = 14;
+                case 14: return [2 /*return*/, (_m.pageProps = tslib.__assign.apply(void 0, _j.concat([(_k)])),
                         _m)];
             }
         });
@@ -1193,6 +1206,7 @@ Object.defineProperty(exports, 'AdminPortal', {
   get: function () { return js.AdminPortal; }
 });
 exports.AuthorizedContent = AuthorizedContent;
+exports.COOKIE_MAX_LENGTH = COOKIE_MAX_LENGTH;
 exports.CookieManager = CookieManager$1;
 exports.FronteggConfig = fronteggConfig;
 exports.FronteggProvider = FronteggProvider;
@@ -1203,7 +1217,7 @@ exports.createGetSession = createGetSession;
 exports.createSessionFromAccessToken = createSessionFromAccessToken;
 exports.fronteggErrors = fronteggErrors;
 exports.fronteggMiddleware = fronteggMiddleware;
-exports.getMeAndTenants = getMeAndTenants;
+exports.getAllUserData = getAllUserData;
 exports.getSession = getSession;
 exports.getTokensFromCookie = getTokensFromCookie;
 exports.rewritePath = rewritePath;

package/package.json

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

package/server/index.js

@@ -1,19 +1,19 @@
 import { __awaiter, __generator, __rest, __assign } from 'tslib';
 import React from 'react';
 import { cookies, headers } from 'next/headers';
-import { C as CookieManager } from '../CookieManager-c1d6c5b0.js';
-import '../api-25516652.js';
-import { g as getTokensFromCookie, a as getMeAndTenants } from '../helpers-942ef431.js';
-import { c as createGetSession } from '../createGetSession-b2281638.js';
-import 'iron-session';
+import { C as CookieManager } from '../CookieManager-27107b90.js';
+import { g as getTokensFromCookie, a as getAllUserData } from '../helpers-b15628e9.js';
+import { c as createGetSession } from '../createGetSession-bee8af0a.js';
 import 'jose';
 import '@frontegg/react-hooks';
 import '@frontegg/rest-api';
-import { F as FronteggClientProviderNext13 } from '../FronteggClientProviderNext13-3259fcd9.js';
+import { F as FronteggClientProviderNext13 } from '../FronteggClientProviderNext13-d020161d.js';
 import '@frontegg/js';
 import '@frontegg/redux-store';
 import 'next/navigation';
 import 'cookie';
+import 'iron-session';
+import '../api-25516652.js';
 
 var getCookie = function () {
     var allCookies = cookies().getAll();
@@ -52,7 +52,7 @@ function getUserTokens() {
 }
 
 var FronteggAppProvider = function (_a) { return __awaiter(void 0, void 0, void 0, function () {
-    var envAppUrl, envBaseUrl, envClientId, session, allHeaders, _b, user, tenants;
+    var envAppUrl, envBaseUrl, envClientId, reqHeaders, _b, user, tenants, session;
     var children = _a.children, options = __rest(_a, ["children"]);
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -69,14 +69,11 @@ var FronteggAppProvider = function (_a) { return __awaiter(void 0, void 0, void
                 if (!envClientId) {
                     throw Error('@frontegg/nextjs: .env.local must contain FRONTEGG_CLIENT_ID');
                 }
-                return [4 /*yield*/, getSession()];
+                reqHeaders = {};
+                headers().forEach(function (value, key) { return (reqHeaders[key] = value); });
+                return [4 /*yield*/, getAllUserData({ getSession: getSession, reqHeaders: reqHeaders })];
             case 1:
-                session = _c.sent();
-                allHeaders = {};
-                headers().forEach(function (value, key) { return (allHeaders[key] = value); });
-                return [4 /*yield*/, getMeAndTenants(allHeaders, session === null || session === void 0 ? void 0 : session.accessToken)];
-            case 2:
-                _b = _c.sent(), user = _b.user, tenants = _b.tenants;
+                _b = _c.sent(), user = _b.user, tenants = _b.tenants, session = _b.session;
                 return [2 /*return*/, (React.createElement(FronteggClientProviderNext13, __assign({}, { session: session, envAppUrl: envAppUrl, envBaseUrl: envBaseUrl, envClientId: envClientId, user: user, tenants: tenants }, options), children))];
         }
     });

package/withFronteggApp.d.ts

@@ -1,10 +1,8 @@
 import { FronteggAppOptions } from '@frontegg/types';
 import type { AppInitialProps } from 'next/app';
 import type { AppContextType, AppPropsType, NextComponentType } from 'next/dist/shared/lib/utils';
-import { FronteggNextJSSession } from './common';
-type FronteggCustomApp = NextComponentType<AppContextType & {
-    session: FronteggNextJSSession | null;
-}, AppInitialProps, AppPropsType>;
+import { AllUserData } from './common';
+type FronteggCustomApp = NextComponentType<AppContextType & AllUserData, AppInitialProps, AppPropsType>;
 export declare const withFronteggApp: (app: ((props: AppPropsType<any>) => JSX.Element) & {
     getInitialProps?: FronteggCustomApp['getInitialProps'];
 }, options?: Omit<FronteggAppOptions, 'contextOptions'> & {

package/CookieManager-c1d6c5b0.js.map

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

package/FronteggClientProviderNext13-3259fcd9.js.map

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

package/common/getMeAndTenants.d.ts

@@ -1,2 +0,0 @@
-import { MeAndTenantsResponse } from './types';
-export declare function getMeAndTenants(reqHeaders?: Record<string, string | string[] | null | undefined>, accessToken?: string): Promise<MeAndTenantsResponse>;

package/createGetSession-b2281638.js.map

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

package/helpers-942ef431.js.map

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