@frontegg/nextjs 6.7.15-alpha.4096079815 → 6.7.15-alpha.4096825791

package/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 
 ### NextJS Wrapper 6.7.15:
+- FR-10557 - Fix url for hosted login refresh token
 - FR-10557 - Fix jose import JWK key
 - FR-10557 - Fix social login embedded mode
 - FR-10557 - Add playwright tests for FornteggMiddleware

package/client/index.js

@@ -4,9 +4,9 @@ import { F as FronteggConfig } from '../CookieManager-e50dc144.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-6f27dcd0.js';
 export { F as FronteggClientProviderNext13 } from '../FronteggClientProviderNext13-6f27dcd0.js';
 import '@frontegg/js';

package/common/index.js

@@ -1,5 +1,5 @@
 export { a as COOKIE_MAX_LENGTH, C as CookieManager, F as FronteggConfig, f as fronteggErrors } from '../CookieManager-e50dc144.js';
-export { c as createSessionFromAccessToken, a as getAllUserData, g as getTokensFromCookie } from '../helpers-26190cc3.js';
+export { c as createSessionFromAccessToken, a as getAllUserData, g as getTokensFromCookie } from '../helpers-dac37998.js';
 export { c as createGetSession } from '../createGetSession-2e1e4506.js';
 import 'tslib';
 import 'cookie';
@@ -7,6 +7,4 @@ import 'jose';
 import 'iron-session';
 import '../api-25516652.js';
 import '@frontegg/rest-api';
-import 'react';
-import '@frontegg/react-hooks';
 //# sourceMappingURL=index.js.map

package/{helpers-26190cc3.js → helpers-dac37998.js}

@@ -2,12 +2,9 @@ import { __awaiter, __generator, __assign } from 'tslib';
 import { sealData, unsealData } from 'iron-session';
 import { jwtVerify } from 'jose';
 import { g as getUsers, a as getTenants } from './api-25516652.js';
-import 'react';
-import '@frontegg/react-hooks';
 import { F as FronteggConfig } from './CookieManager-e50dc144.js';
 
-var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
-
+var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
 function createSessionFromAccessToken(data) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
@@ -88,4 +85,4 @@ var getAllUserData = function (_a) {
 };
 
 export { getAllUserData as a, createSessionFromAccessToken as c, getTokensFromCookie as g };
-//# sourceMappingURL=helpers-26190cc3.js.map
+//# sourceMappingURL=helpers-dac37998.js.map

package/helpers-dac37998.js.map

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

package/index.js

@@ -170,13 +170,13 @@ var FronteggBaseProvider = function (props) {
     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 calculateExpiresInFromExp$1 = 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.setUser(tslib.__assign(tslib.__assign({}, user), { expiresIn: calculateExpiresInFromExp$1(user['exp']) }));
         }
     }, [actions, user]);
     // eslint-disable-next-line react/jsx-no-useless-fragment
@@ -456,6 +456,7 @@ var getTenants = function (headers) { return tslib.__awaiter(void 0, void 0, voi
     });
 }); };
 
+var calculateExpiresInFromExp = function (exp) { return Math.floor((exp * 1000 - Date.now()) / 1000); };
 function createSessionFromAccessToken(data) {
     var _a, _b;
     return tslib.__awaiter(this, void 0, void 0, function () {
@@ -831,7 +832,7 @@ function FronteggRouterProps(context) {
 
 function refreshTokenHostedLogin(ctx, headers) {
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var sealFromCookies, tokens;
+        var sealFromCookies, tokens, e_1;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -843,7 +844,7 @@ function refreshTokenHostedLogin(ctx, headers) {
                     if (!(tokens === null || tokens === void 0 ? void 0 : tokens.refreshToken)) {
                         return [2 /*return*/, null];
                     }
-                    return [4 /*yield*/, fetch("".concat(process.env['FRONTEGG_BASE_URL'], "/frontegg").concat(restApi.fronteggSilentRefreshTokenUrl), {
+                    return [4 /*yield*/, fetch("".concat(process.env['FRONTEGG_BASE_URL'], "/frontegg/oauth/token"), {
                             method: 'POST',
                             credentials: 'include',
                             body: JSON.stringify({
@@ -853,8 +854,9 @@ function refreshTokenHostedLogin(ctx, headers) {
                             headers: {
                                 'accept-encoding': headers['accept-encoding'],
                                 'accept-language': headers['accept-language'],
-                                cookie: headers['cookie'],
                                 accept: headers['accept'],
+                                'content-type': 'application/json',
+                                origin: headers['origin'],
                                 'user-agent': headers['user-agent'],
                                 connection: headers['connection'],
                                 'cache-control': headers['cache-control'],
@@ -864,7 +866,8 @@ function refreshTokenHostedLogin(ctx, headers) {
                         })];
                 case 2: return [2 /*return*/, _a.sent()];
                 case 3:
-                    _a.sent();
+                    e_1 = _a.sent();
+                    console.error('refreshTokenHostedLogin', e_1);
                     return [2 /*return*/, null];
                 case 4: return [2 /*return*/];
             }
@@ -906,10 +909,9 @@ function refreshTokenEmbedded(ctx, headers, cookies) {
     });
 }
 function refreshToken(ctx) {
-    var _a, _b;
+    var _a, _b, _c;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var request, isSecured, headers, cookies, response, data, cookieHeader, newSetCookie, _c, session, decodedJwt, refreshToken_1, cookieValue, e_2;
-        var _d;
+        var request, isSecured, headers, cookies, response, data, cookieHeader, newSetCookie, _d, session, decodedJwt, refreshToken_1, cookieValue, e_2;
         return tslib.__generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -947,14 +949,11 @@ function refreshToken(ctx) {
                     return [4 /*yield*/, response.json()];
                 case 5:
                     data = _e.sent();
-                    (_d = {},
-                        _d[fronteggConfig.baseUrlHost] = fronteggConfig.cookieDomain,
-                        _d);
                     cookieHeader = response.headers.raw()['set-cookie'];
                     newSetCookie = (_a = CookieManager$1.modifySetCookie(cookieHeader, isSecured)) !== null && _a !== void 0 ? _a : [];
                     return [4 /*yield*/, createSessionFromAccessToken(data)];
                 case 6:
-                    _c = _e.sent(), session = _c[0], decodedJwt = _c[1], refreshToken_1 = _c[2];
+                    _d = _e.sent(), session = _d[0], decodedJwt = _d[1], refreshToken_1 = _d[2];
                     if (!session) {
                         return [2 /*return*/, null];
                     }
@@ -963,13 +962,10 @@ function refreshToken(ctx) {
                         expires: new Date(decodedJwt.exp * 1000),
                         isSecured: isSecured,
                     });
-                    // if (typeof newSetCookie === 'string') {
-                    //   newSetCookie = [ newSetCookie ];
-                    // }
                     newSetCookie.push.apply(newSetCookie, cookieValue);
                     (_b = ctx.res) === null || _b === void 0 ? void 0 : _b.setHeader('set-cookie', newSetCookie);
                     return [2 /*return*/, {
-                            accessToken: data.accessToken,
+                            accessToken: (_c = data.accessToken) !== null && _c !== void 0 ? _c : data.access_token,
                             user: decodedJwt,
                             refreshToken: refreshToken_1,
                         }];
@@ -1162,7 +1158,7 @@ var proxyResCallback = function (proxyRes, req, res) {
         buffer = Buffer.concat([buffer, chunk], totalLength);
     });
     proxyRes.on('end', function () { return tslib.__awaiter(void 0, void 0, void 0, function () {
-        var url, statusCode, isSuccess, bodyStr, isLogout, cookies, body, _a, session, decodedJwt, sessionCookie, e_2;
+        var url, statusCode, isSuccess, bodyStr, isLogout, cookies, body, _a, session, decodedJwt, sessionCookie, e_1, e_2;
         var _b, _c;
         return tslib.__generator(this, function (_d) {
             switch (_d.label) {
@@ -1189,7 +1185,7 @@ var proxyResCallback = function (proxyRes, req, res) {
                 case 1:
                     _d.trys.push([1, 4, , 5]);
                     body = JSON.parse(bodyStr);
-                    if (!(body.accessToken && body.access_token)) return [3 /*break*/, 3];
+                    if (!(body.accessToken || body.access_token)) return [3 /*break*/, 3];
                     return [4 /*yield*/, createSessionFromAccessToken(body)];
                 case 2:
                     _a = _d.sent(), session = _a[0], decodedJwt = _a[1];
@@ -1204,7 +1200,12 @@ var proxyResCallback = function (proxyRes, req, res) {
                     _d.label = 3;
                 case 3: return [3 /*break*/, 5];
                 case 4:
-                    _d.sent();
+                    e_1 = _d.sent();
+                    /** ignore api call if:
+                     * - Does not have accessToken / access_token
+                     * - Not json response
+                     */
+                    console.log('failed to create session', e_1);
                     return [3 /*break*/, 5];
                 case 5:
                     Object.keys(proxyRes.headers)

package/package.json

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

package/refreshToken.d.ts

@@ -1,3 +1,3 @@
 import { NextPageContext } from 'next/dist/shared/lib/utils';
-import { FronteggNextJSSession } from './common/types';
+import { FronteggNextJSSession } from './common';
 export declare function refreshToken(ctx: NextPageContext): Promise<FronteggNextJSSession | null>;

package/server/index.js

@@ -2,7 +2,7 @@ import { __awaiter, __generator, __rest, __assign } from 'tslib';
 import React from 'react';
 import { cookies, headers } from 'next/headers';
 import { C as CookieManager } from '../CookieManager-e50dc144.js';
-import { g as getTokensFromCookie, a as getAllUserData } from '../helpers-26190cc3.js';
+import { g as getTokensFromCookie, a as getAllUserData } from '../helpers-dac37998.js';
 import { c as createGetSession } from '../createGetSession-2e1e4506.js';
 import 'jose';
 import '@frontegg/react-hooks';

package/helpers-26190cc3.js.map

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