nitro-web 0.0.168 → 0.0.169

package/client/app.tsx

@@ -19,7 +19,7 @@ type Settings = {
   // beforeStoreUpdate: (prevStore: Store | null, newData: Store) => Store
   isStatic?: boolean
   layouts: React.FC<LayoutProps>[]
-  middleware: Record<string, (route: unknown, store: Store) => undefined | { redirect: string }>
+  allMiddleware: Record<string, (route: unknown, store: Store) => undefined | { redirect: string }>
   name: string
   titleSeparator?: string
 }
@@ -52,7 +52,7 @@ export async function setupApp(config: Config, storeContainer: StoreContainer, l
     beforeApp: config.beforeApp || beforeApp,
     isStatic: config.isStatic,
     layouts: layouts,
-    middleware: Object.assign(defaultMiddleware, config.middleware || {}),
+    allMiddleware: Object.assign(middleware, config.middleware || {}),
     name: config.name,
     titleSeparator: config.titleSeparator,
   }
@@ -165,9 +165,9 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
           const layoutNum = (parseInt(String(route.meta?.layout || '1')) || 1) - 1
 
           // get the routes middleware
-          const middleware = toArray(route[routePath]).filter((policyNameOrTrue) => {
+          const routeMiddleware = toArray(route[routePath]).filter((policyNameOrTrue) => {
             if (policyNameOrTrue === true) return // ignore true
-            else if (policyNameOrTrue in settings.middleware) return true
+            else if (policyNameOrTrue in settings.allMiddleware) return true
             else console.error(`No middleware named '${policyNameOrTrue}' defined under config.middleware, skipping..`)
           })
 
@@ -180,7 +180,7 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
               layout: layoutNum,
               title: `${route.meta?.title ? `${route.meta.title}${settings.titleSeparator || ' - '}` : ''}${settings.name}`,
             },
-            middleware: middleware as string[],
+            middleware: routeMiddleware as string[],
             name: componentName,
             path: routePath,
             redirect: route.redirect,
@@ -218,7 +218,7 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
               await setTimeoutPromise(() => {}, 0)
             }
             for (const key of route.middleware) {
-              const error = settings.middleware[key](route, exposedStoreData || {})
+              const error = settings.allMiddleware[key](route, exposedStoreData || {})
               // Note: the redirect uses the new pathname for query string values, e.g. '?example=value'. We also can't use the 
               // current pathname, as this doesn't exist on page refresh.
               if (error && error.redirect) {
@@ -317,22 +317,19 @@ async function beforeApp(config: Config) {
   return { ...storeData, apiAvailable }
 }
 
-const defaultMiddleware = {
-  // Global middleware that can referenced from component routes
+export const middleware = {
+  // Default middleware that can referenced from component routes
   isAdmin: (route: unknown, store: { user?: { type?: string, isAdmin?: boolean } }) => {
-    const user = store.user || { type: 'visitor' }
-    if (user?.type?.match(/admin/) || user?.isAdmin) return
-    else if (user?.type && user?.type !== 'visitor') return { redirect: '/signin?unauth' }
+    if (store.user?.type?.match(/admin/) || store.user?.isAdmin) return
+    else if (store.user) return { redirect: '/signin?unauth' }
     else return { redirect: '/signin?signin' }
   },
   isSubscribed: (route: unknown, store: { user?: { company?: { currentSubscription?: string } } }) => {
-    const user = store?.user || { type: 'visitor', company: { currentSubscription: '' } }
-    if (!user?.company?.currentSubscription) return
+    if (store.user?.company?.currentSubscription) return
     else return { redirect: '/plans/subscribe' }
   },
   isUser: (route: unknown, store: { user?: { type?: string } }) => {
-    const user = store.user || { type: 'visitor' }
-    if (user?.type !== 'visitor') return
+    if (store.user) return
     else return { redirect: '/signin?signin' }
   },
 }

package/client/index.ts

@@ -9,7 +9,7 @@ export * as util from 'nitro-web/util'
 export * from '../types'
 
 // Main app functions
-export { setupApp, updateJwt } from './app'
+export { setupApp, updateJwt, middleware } from './app'
 export { createStore, exposedStoreData, preloadedStoreData, setStoreWrapper } from './store'
 
 // Component Pages

package/components/auth/auth.api.js

@@ -420,10 +420,14 @@ export async function sendToken({ type = 'reset', user, beforeUpdate, beforeSend
   if (!user?.firstName) throw new Error('user.firstName is required')
   const token = await tokenCreate(user._id)
 
+  // get the data
+  const data = beforeUpdate ? beforeUpdate({ [type + 'Token']: token }) : { [type + 'Token']: token }
+  if (type === 'invite') data.isInvited = true
+
   // Update the user with the token
   const result = await db.user.update({
     query: { _id: user._id },
-    data: beforeUpdate ? beforeUpdate({ [type + 'Token']: token }) : { [type + 'Token']: token },
+    data: data,
     blacklist: ['-' + type + 'Token'],
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.168",
+  "version": "0.0.169",
   "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/models/user.js

@@ -7,20 +7,23 @@ export default {
     avatar: { type: 'image' },
     company: { model: 'company', required: true },
     email: { type: 'email', required: true, index: 'unique' },
+    isInvited: { type: 'boolean' },
     firstName: { type: 'string', required: true },
     lastName: { type: 'string', required: true },
-    password: { type: 'string', minLength: 6 },
-    resetToken: { type: 'string' },
     status: { type: 'string', default: 'active', enum: ['active', 'deleted', 'inactive'] },
     stripeCustomer: { type: 'any' },
     stripeSubscription: { type: 'any' },
     stripeIntents: { type: 'any' },
     type: { type: 'string', default: 'user', enum: ['user', 'admin'] },
     usedFreeTrial: { type: 'boolean', default: false },
+    // hidden fields
+    password: { type: 'string', minLength: 6 },
+    inviteToken: { type: 'string' },
+    resetToken: { type: 'string' },
   },
 
-  findBL: ['password', 'resetToken'],
-  updateBL: ['company', 'password', 'resetToken', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
+  findBL: ['password', 'inviteToken', 'resetToken'],
+  updateBL: ['password', 'inviteToken', 'resetToken', 'company', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
 
   messages: {
     lastName: {

package/server/router.js

@@ -1,4 +1,5 @@
 // @ts-nocheck
+// renamed to app, similar to client/app.tsx
 import fs from 'fs'
 import path, { dirname } from 'path'
 import http from 'http'

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":"AAkLA,qGAyCC;AAED;;GAKC;AAED,0FAQC;AAED;;;;iBAkDC;AAED,mDAOC;AAED,4CAYC;AAED,kFAiBC;AAOD,qEAeC;AAED,sEAWC;AAED,iEAMC;AAED,gEAMC;AAID,wEAoBC;AAED;;;;;;;;GAQG;AACH,yEANG;IAAoC,IAAI,EAAhC,OAAO,GAAG,QAAQ;IACuC,IAAI,EAA7D;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC;IAC5B,YAAY;IACZ,eAAe;CAC1C,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAgCtE;AAhbD;;;;;;;;;;;;;;;;;;;;EA6BC;AAmED,0DAEC;AAkCD,mDAEC;AAnBD,iDAeC;AA9BD,2DAaC;AAuBD,2DAwBC;AAjID,4DA+DC"}
+{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAkLA,qGAyCC;AAED;;GAKC;AAED,0FAQC;AAED;;;;iBAkDC;AAED,mDAOC;AAED,4CAYC;AAED,kFAiBC;AAOD,qEAeC;AAED,sEAWC;AAED,iEAMC;AAED,gEAMC;AAID,wEAoBC;AAED;;;;;;;;GAQG;AACH,yEANG;IAAoC,IAAI,EAAhC,OAAO,GAAG,QAAQ;IACuC,IAAI,EAA7D;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC;IAC5B,YAAY;IACZ,eAAe;CAC1C,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAoCtE;AApbD;;;;;;;;;;;;;;;;;;;;EA6BC;AAmED,0DAEC;AAkCD,mDAEC;AAnBD,iDAeC;AA9BD,2DAaC;AAuBD,2DAwBC;AAjID,4DA+DC"}

package/types/server/models/user.d.ts

@@ -14,62 +14,70 @@ declare namespace _default {
             export { required_1 as required };
             export let index: string;
         }
-        export namespace firstName {
+        export namespace isInvited {
             let type_2: string;
             export { type_2 as type };
-            let required_2: boolean;
-            export { required_2 as required };
         }
-        export namespace lastName {
+        export namespace firstName {
             let type_3: string;
             export { type_3 as type };
-            let required_3: boolean;
-            export { required_3 as required };
+            let required_2: boolean;
+            export { required_2 as required };
         }
-        export namespace password {
+        export namespace lastName {
             let type_4: string;
             export { type_4 as type };
-            export let minLength: number;
+            let required_3: boolean;
+            export { required_3 as required };
         }
-        export namespace resetToken {
+        export namespace status {
             let type_5: string;
             export { type_5 as type };
-        }
-        export namespace status {
-            let type_6: string;
-            export { type_6 as type };
             let _default: string;
             export { _default as default };
             let _enum: string[];
             export { _enum as enum };
         }
         export namespace stripeCustomer {
+            let type_6: string;
+            export { type_6 as type };
+        }
+        export namespace stripeSubscription {
             let type_7: string;
             export { type_7 as type };
         }
-        export namespace stripeSubscription {
+        export namespace stripeIntents {
             let type_8: string;
             export { type_8 as type };
         }
-        export namespace stripeIntents {
-            let type_9: string;
-            export { type_9 as type };
-        }
-        export namespace type_10 {
-            let type_11: string;
-            export { type_11 as type };
+        export namespace type_9 {
+            let type_10: string;
+            export { type_10 as type };
             let _default_1: string;
             export { _default_1 as default };
             let _enum_1: string[];
             export { _enum_1 as enum };
         }
-        export { type_10 as type };
+        export { type_9 as type };
         export namespace usedFreeTrial {
-            let type_12: string;
-            export { type_12 as type };
+            let type_11: string;
+            export { type_11 as type };
             let _default_2: boolean;
             export { _default_2 as default };
         }
+        export namespace password {
+            let type_12: string;
+            export { type_12 as type };
+            export let minLength: number;
+        }
+        export namespace inviteToken {
+            let type_13: string;
+            export { type_13 as type };
+        }
+        export namespace resetToken {
+            let type_14: string;
+            export { type_14 as type };
+        }
     }
     let findBL: string[];
     let updateBL: string[];

package/types/server/models/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../server/models/user.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA8CmB,gCAEd"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../server/models/user.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiDmB,gCAEd"}

package/types/server/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAmCA,wHA6HC;AAoPD,+CAEC;AAED,kEAYC;AApGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAkF1B;sBAnYY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;iBA1Ba,MAAM;oBAIH,SAAS"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../server/router.js"],"names":[],"mappings":"AAoCA,wHA6HC;AAoPD,+CAEC;AAED,kEAYC;AApGD,+BAA+B;AAC/B,yBADW,gBAAgB,CAkF1B;sBAnYY,OAAO,CAAC,OAAO,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAoB,CAAC;CAC7B;uBACS,OAAO,CAAC,QAAQ,GAAG;IAC3B,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjE,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC;CACvD;+BACS;IACR,KAAK,EAAE,MAAM,EAAE,CAAC;IACpB,CAAK,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,UAAU,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;CACnF;iBA1Ba,MAAM;oBAIH,SAAS"}

package/types.ts

@@ -29,6 +29,7 @@ export type User = {
   name?: string
   avatar?: MonasteryImage
   isAdmin?: boolean
+  isInvited?: boolean
   type?: string
 }