npm - @frontegg/nextjs - Versions diffs - 6.1.0-alpha.2953035347 → 6.1.0-alpha.2964491622 - Mend

@frontegg/nextjs 6.1.0-alpha.2953035347 → 6.1.0-alpha.2964491622

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/FronteggConfig.d.ts CHANGED Viewed

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

package/index.cjs.js CHANGED Viewed

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

package/index.esm.js CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,9 +1,9 @@
 {
   "name": "@frontegg/nextjs",
-  "version": "6.1.0-alpha.2953035347",
+  "version": "6.1.0-alpha.2964491622",
   "dependencies": {
-    "@frontegg/js": "6.0.3-alpha.4",
-    "@frontegg/react-hooks": "6.0.3-alpha.4",
+    "@frontegg/js": "6.2.0",
+    "@frontegg/react-hooks": "6.2.0",
     "jose": "^4.8.0",
     "iron-session": "^6.1.2",
     "http-proxy": "^1.18.1",