nitro-web 0.2.7 → 0.2.9

package/components/auth/auth.api.js

@@ -13,6 +13,7 @@ import { isArray, pick, ucFirst, fullNameSplit, isEmail } from 'nitro-web/util'
 
 const JWT_SECRET = process.env.JWT_SECRET || 'replace_this_with_secure_env_secret'
 let authConfig = null
+const resolveBaseUrlWarned = new Set()
 const requiredConfigKeys = [...requiredEmailConfigKeys]
 const optionalConfigKeys = [...optionalEmailConfigKeys, 'masterPassword', 'isNotMultiTenant', 'autoAddExistingUsers', 'limitOneTenantPerUser']
 
@@ -729,7 +730,7 @@ export async function tokenSend({ type, id, payload, beforeUpdate, beforeSendEma
 }
 
 export function getBaseUrl(req) {
-  return resolveBaseUrl(req?.nitroBaseUrl, authConfig.baseUrl)
+  return resolveBaseUrl(req?.requestOrigin, authConfig.baseUrl)
 }
 
 export function resolveBaseUrl(reqUrl, cfgUrl) {
@@ -740,12 +741,22 @@ export function resolveBaseUrl(reqUrl, cfgUrl) {
     const cfgHost = new URL(cfgUrl).hostname
     const reqApex = getDomain(reqHost)
     const cfgApex = getDomain(cfgHost)
+    const errorMessage = 'Nitro warning: auth.resolveBaseUrl: The request origin and the config baseUrl ' +
+      'are not the same apex domain. Defaulting to the Cfg baseUrl. Req:'
 
     if (reqApex && cfgApex) {
+      if (reqApex !== cfgApex && !resolveBaseUrlWarned.has(reqHost)) {
+        resolveBaseUrlWarned.add(reqHost)
+        console.warn(errorMessage, reqApex, '!=', cfgApex)
+      }
       return reqApex === cfgApex ? reqUrl : cfgUrl
     } else if (reqHost === cfgHost || reqHost.endsWith('.' + cfgHost)) {
       return reqUrl
     } else {
+      if (!resolveBaseUrlWarned.has(reqHost)) {
+        resolveBaseUrlWarned.add(reqHost)
+        console.warn(errorMessage, reqHost, '!=', cfgHost)
+      }
       return cfgUrl
     }
   } catch (_) {

package/components/billing/stripe.api.js

@@ -82,7 +82,7 @@ async function billingPortalSessionCreate(req, res) {
     }
     const session = await stripe.billingPortal.sessions.create({
       customer: req.user.stripeCustomer.id,
-      return_url: resolveBaseUrl(req.nitroBaseUrl, config.baseUrl) + '/subscriptions',
+      return_url: resolveBaseUrl(req.requestOrigin, config.baseUrl) + '/subscriptions',
     })
     res.json(session.url)
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",

package/server/router.js

@@ -333,7 +333,7 @@ export const middleware = {
     // Handy boolean denoting that the request wants JSON returned
     req.json = req.xhr || req.accepts(['html', 'json']) == 'json'
     // Dynamic baseUrl from the request headers, may require app.set('trust proxy', 1) in the server setup for heroku proxying
-    req.nitroBaseUrl = req.protocol + '://' + req.headers.host
+    req.requestOrigin = req.protocol + '://' + req.headers.host
     // log the headers if the config.logHeaders is true
     if (configLocal.logHeaders) {
       console.info('Headers:', req.headers)

package/types/components/auth/auth.api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAoLA,qEAUC;AAED,qEAwEC;AAED,qEAGC;AAED,gEAMC;AAED,iEAgBC;AAED,oEAGC;AAED,oEA8BC;AAED,gEAgCC;AAID,qGAkDC;AAED;;;GAOC;AAED;;GAKC;AAID;;;;;;;;;GASG;AACH,8EAPG;IAA0B,QAAQ,GAA1B,MAAM;IACY,SAAS,GAA3B,MAAM;IACY,OAAO,GAAzB,MAAM;CACd,YAAQ,MAAM,+BACN,OAAO,GACL,OAAO,CAAC,MAAM,CAAC,CAqE3B;AAED,kFAiBC;AAED,mEAOC;AAED,+EAWC;AAED,sHAiBC;AAED;;;GAEC;AAED;;;GA0BC;AAED;;;;;;;;;GAmCC;AAED;;;;;;;;;;;;;;GAcG;AACH,mGAZG;IAAsD,IAAI,EAAlD,OAAO,GAAG,QAAQ,GAAG,eAAe;IACpB,EAAE,EAAlB,MAAM;IAKH,OAAO,EAJV;QACN,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QACtB,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB;IAC0B,YAAY;IACZ,eAAe;IACjB,OAAO,GAAxB,MAAM;CACd,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAmEtE;AAED,0CAEC;AAED,8DAmBC;AAED,gFAKC;;;;;;;;;;;;;;;;;;;;AA/tBD;;;;;;;;;;;;;;;EAiBC;AA0ED,0DAEC;AAgCD,mDAEC;AAtBD,iDAkBC;AA5BD,2DAQC;AA0BD,2DAwBC;AAtID,0EAsEC"}
+{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAqLA,qEAUC;AAED,qEAwEC;AAED,qEAGC;AAED,gEAMC;AAED,iEAgBC;AAED,oEAGC;AAED,oEA8BC;AAED,gEAgCC;AAID,qGAkDC;AAED;;;GAOC;AAED;;GAKC;AAID;;;;;;;;;GASG;AACH,8EAPG;IAA0B,QAAQ,GAA1B,MAAM;IACY,SAAS,GAA3B,MAAM;IACY,OAAO,GAAzB,MAAM;CACd,YAAQ,MAAM,+BACN,OAAO,GACL,OAAO,CAAC,MAAM,CAAC,CAqE3B;AAED,kFAiBC;AAED,mEAOC;AAED,+EAWC;AAED,sHAiBC;AAED;;;GAEC;AAED;;;GA0BC;AAED;;;;;;;;;GAmCC;AAED;;;;;;;;;;;;;;GAcG;AACH,mGAZG;IAAsD,IAAI,EAAlD,OAAO,GAAG,QAAQ,GAAG,eAAe;IACpB,EAAE,EAAlB,MAAM;IAKH,OAAO,EAJV;QACN,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QACtB,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB;IAC0B,YAAY;IACZ,eAAe;IACjB,OAAO,GAAxB,MAAM;CACd,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAmEtE;AAED,0CAEC;AAED,8DA6BC;AAED,gFAKC;;;;;;;;;;;;;;;;;;;;AAzuBD;;;;;;;;;;;;;;;EAiBC;AA0ED,0DAEC;AAgCD,mDAEC;AAtBD,iDAkBC;AA5BD,2DAQC;AA0BD,2DAwBC;AAtID,0EAsEC"}