nitro-web 0.0.56 → 0.0.58

package/components/auth/auth.api.js

@@ -1,5 +1,5 @@
-// @ts-nocheck
 import crypto from 'crypto'
+import bcrypt from 'bcrypt'
 import passport from 'passport'
 import passportLocal from 'passport-local'
 import { Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt'
@@ -8,7 +8,7 @@ import jsonwebtoken from 'jsonwebtoken'
 import { sendEmail } from 'nitro-web/server'
 import { isArray, pick, isString, ucFirst, fullNameSplit } from 'nitro-web/util'
 
-let config = {}
+let authConfig = null
 const JWT_SECRET = process.env.JWT_SECRET || 'replace_this_with_secure_env_secret'
 
 export default {
@@ -34,10 +34,10 @@ export default {
 function setup(middleware, _config) {
   // Setup is called automatically when the server starts
   // Set config values
-  const configKeys = ['clientUrl', 'emailFrom', 'env', 'name', 'mailgunDomain', 'mailgunKey', 'masterPassword']
-  config = pick(_config, configKeys)
+  const configKeys = ['clientUrl', 'emailFrom', 'env', 'name', 'mailgunDomain', 'mailgunKey', 'masterPassword', 'isNotMultiTenant']
+  authConfig = pick(_config, configKeys)
   for (const key of ['clientUrl', 'emailFrom', 'env', 'name']) {
-    if (!config[key]) throw new Error(`Missing config value for: config.${key}`)
+    if (!authConfig[key]) throw new Error(`Missing config value for: config.${key}`)
   }
 
   passport.use(
@@ -104,7 +104,7 @@ async function signup(req, res) {
   try {
     let user = await userCreate(req.body)
     sendEmail({
-      config: config,
+      config: authConfig,
       template: 'welcome',
       to: `${ucFirst(user.firstName)}<${user.email}>`,
     }).catch(console.error)
@@ -147,7 +147,7 @@ async function resetInstructions(req, res) {
 
     res.json({})
     sendEmail({
-      config: config,
+      config: authConfig,
       template: 'reset-password',
       to: `${ucFirst(user.firstName)}<${email}>`,
       data: {
@@ -171,7 +171,7 @@ async function resetPassword(req, res) {
     await db.user.update({
       query: user._id,
       data: {
-        password: await (await import('bcrypt')).hash(password, 10),
+        password: await bcrypt.hash(password, 10),
         resetToken: '',
       },
       blacklist: ['-resetToken', '-password'],
@@ -185,39 +185,75 @@ async function resetPassword(req, res) {
 async function remove(req, res) {
   try {
     const uid = db.id(req.params.uid || 'badid')
-
-    // Get companies owned by user
-    const companyIdsOwned = (await db.company.find({ 
-      query: { users: { $elemMatch: { _id: uid, role: 'owner' } } },
-      project: { _id: 1 },
-    })).map(o => o._id)
-
     // Check for active subscription first...
     if (req.user.stripeSubscription?.status == 'active') {
       throw { title: 'subscription', detail: 'You need to cancel your subscription first.' }
     }
+    // // Get companies owned by user
+    // const companyIdsOwned = (await db.company.find({ 
+    //   query: { users: { $elemMatch: { _id: uid, role: 'owner' } } },
+    //   project: { _id: 1 },
+    // })).map(o => o._id)
     
-    if (companyIdsOwned.length) {
-      await db.transaction.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.statement.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.account.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.document.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.contact.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.product.remove({ query: { company: { $in: companyIdsOwned }}})
-      await db.company.remove({ query: { _id: { $in: companyIdsOwned }}})
-    }
+    // if (companyIdsOwned.length) {
+    //   await db.product.remove({ query: { company: { $in: companyIdsOwned }}})
+    //   await db.company.remove({ query: { _id: { $in: companyIdsOwned }}})
+    // }
     await db.user.remove({ query: { _id: uid }})
     // Logout now so that an error doesn't throw when naviating to /signout
     req.logout()
-    res.send(`User: '${uid}' and companies: '${companyIdsOwned.join(', ')}' removed successfully`)
+    res.send(`User: '${uid}' removed successfully`)
   } catch (err) {
     res.error(err)
   }
 }
 
-/* ---- Private fns ---------------- */
+/* ---- Auth helpers ------------------------- */
 
-async function getStore(user) {
+export async function findUserFromProvider(query, passwordToCheck) {
+  /**
+   * Find user for state (and verify password if signing in with email)
+   * @param {object} query - e.g. { email: 'test@test.com' }
+   * @param {string} <passwordToCheck> - password to test
+   */
+  const isMultiTenant = !authConfig.isNotMultiTenant
+  const checkPassword = arguments.length > 1
+  const user = await db.user.findOne({
+    query: query,
+    blacklist: ['-password'],
+    populate: db.user.loginPopulate(),
+    _privateData: true,
+  })
+  if (isMultiTenant && user?.company) {
+    user.company = await db.company.findOne({
+      query: user.company,
+      populate: db.company.loginPopulate(),
+      _privateData: true,
+    })
+  }
+  if (!user) {
+    throw new Error(checkPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
+  } else if (isMultiTenant && !user.company) {
+    throw new Error('The current company is no longer associated with this user')
+  } else if (isMultiTenant && user.company.status != 'active') {
+    throw new Error('This user is not associated with an active company')
+  } else {
+    if (checkPassword) {
+      if (!user.password) {
+        throw new Error('There is no password associated with this account, please try signing in with another method.')
+      }
+      const match = user.password ? await bcrypt.compare(passwordToCheck, user.password) : false
+      if (!match && !(authConfig.masterPassword && passwordToCheck == authConfig.masterPassword)) {
+        throw new Error('Email or password is incorrect.')
+      }
+    }
+    // Successful return user
+    delete user.password
+    return user
+  }
+}
+
+export async function getStore(user) {
   // Initial store
   return {
     user: user || undefined,
@@ -256,47 +292,29 @@ export function tokenParse(token) {
   }
 }
 
-async function validatePassword(password='', password2) {
-  // let hasLowerChar = password.match(/[a-z]/)
-  // let hasUpperChar = password.match(/[A-Z]/)
-  // let hasNumber = password.match(/\d/)
-  // let hasSymbol = password.match(/\W/)
-  if (!password) {
-    throw [{ title: 'password', detail: 'This field is required.' }]
-  } else if (config.env !== 'development' && password.length < 8) {
-    throw [{ title: 'password', detail: 'Your password needs to be atleast 8 characters long' }]
-    // } else if (!hasLowerChar || !hasUpperChar || !hasNumber || !hasSymbol) {
-    //   throw {
-    //     title: 'password',
-    //     detail: 'You need to include uppercase and lowercase letters, and a number'
-    //   }
-  } else if (typeof password2 != 'undefined' && password !== password2) {
-    throw [{ title: 'password2', detail: 'Your passwords need to match.' }]
-  }
-}
-
 export async function userCreate({ name, business, email, password }) {
   try {
     const options = { blacklist: ['-_id'] }
+    const isMultiTenant = !authConfig.isNotMultiTenant
     const userId = db.id()
-    const companyData = {
+    const companyData = isMultiTenant && {
       _id: db.id(), 
       ...(business ? { business } : {}),
       users: [{ _id: userId, role: 'owner', status: 'active' }],
     }
     const userData = {
       _id: userId, 
-      company: companyData._id,
       email: email,
       firstName: fullNameSplit(name)[0],
       lastName: fullNameSplit(name)[1],
-      password: password ? await (await import('bcrypt')).hash(password, 10) : undefined,
+      password: password ? await bcrypt.hash(password, 10) : undefined,
+      ...(isMultiTenant ? { company: companyData._id } : {}),
     }
 
     // First validate the data so we don't have to create a transaction
     const results = await Promise.allSettled([
       db.user.validate(userData, options),
-      db.company.validate(companyData, options),
+      ...(isMultiTenant ? [db.company.validate(companyData, options)] : []),
       typeof password === 'undefined' ? Promise.resolve() : validatePassword(password),
     ])
 
@@ -310,7 +328,7 @@ export async function userCreate({ name, business, email, password }) {
 
     // Insert company & user
     await db.user.insert({ data: userData, ...options })
-    await db.company.insert({ data: companyData, ...options })
+    if (isMultiTenant) await db.company.insert({ data: companyData, ...options })
 
     // Return the user
     return await findUserFromProvider({ _id: userId })
@@ -324,45 +342,21 @@ export async function userCreate({ name, business, email, password }) {
   }
 }
 
-export async function findUserFromProvider(query, passwordToCheck) {
-  /**
-   * Find user for state (and verify password if signing in with email)
-   * @param {object} query - e.g. { email: 'test@test.com' }
-   * @param {string} <passwordToCheck> - password to test
-   */
-  const checkPassword = arguments.length > 1
-  const user = await db.user.findOne({
-    query: query,
-    blacklist: ['-password'],
-    populate: db.user.loginPopulate(),
-    _privateData: true,
-  })
-  if (user?.company) {
-    user.company = await db.company.findOne({
-      query: user.company,
-      populate: db.company.loginPopulate(),
-      _privateData: true,
-    })
-  }
-  if (!user) {
-    throw new Error(checkPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
-  } else if (!user.company) {
-    throw new Error('The current company is no longer associated with this user')
-  } else if (user.company.status != 'active') {
-    throw new Error('This user is not associated with an active company')
-  } else {
-    if (checkPassword) {
-      if (!user.password) {
-        throw new Error('There is no password associated with this account, please try signing in with another method.')
-      }
-      const match = user.password ? await (await import('bcrypt')).compare(passwordToCheck, user.password) : false
-      if (!match && !(config.masterPassword && passwordToCheck == config.masterPassword)) {
-        throw new Error('Email or password is incorrect.')
-      }
-    }
-    // Successful return user
-    delete user.password
-    return user
+export async function validatePassword(password='', password2) {
+  // let hasLowerChar = password.match(/[a-z]/)
+  // let hasUpperChar = password.match(/[A-Z]/)
+  // let hasNumber = password.match(/\d/)
+  // let hasSymbol = password.match(/\W/)
+  if (!password) {
+    throw [{ title: 'password', detail: 'This field is required.' }]
+  } else if (authConfig.env !== 'development' && password.length < 8) {
+    throw [{ title: 'password', detail: 'Your password needs to be atleast 8 characters long' }]
+    // } else if (!hasLowerChar || !hasUpperChar || !hasNumber || !hasSymbol) {
+    //   throw {
+    //     title: 'password',
+    //     detail: 'You need to include uppercase and lowercase letters, and a number'
+    //   }
+  } else if (typeof password2 != 'undefined' && password !== password2) {
+    throw [{ title: 'password2', detail: 'Your passwords need to match.' }]
   }
 }
-

package/components/partials/element/message.tsx

@@ -2,13 +2,14 @@
 import { isObject, isString, queryObject } from 'nitro-web/util'
 import { X, CircleCheck } from 'lucide-react'
 import { MessageObject } from 'nitro-web/types'
+import { twMerge } from 'nitro-web'
 
 /**
  * Shows a message
  * Triggered by navigating to a link with a valid query string, or
  * by setting store.message to a string or more explicitly, to an object
  **/
-export function Message() {
+export function Message({ className }: { className?: string }) {
   const devDontHide = false
   const [store, setStore] = useTracked()
   const [visible, setVisible] = useState(false)
@@ -81,13 +82,13 @@ export function Message() {
     setVisible(false)
     setTimeout(() => setStore(s => ({ ...s, message: undefined })), 250)
   }
-
+  
   return (
     <>
       {/* Global notification live region, render this permanently at the end of the document */}
       <div
         aria-live="assertive"
-        className="pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-start sm:p-6 z-20 nitro-message"
+        className={`${twMerge(`pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-start sm:p-6 z-[101] ${className||''}`)} nitro-message`}
       >
         <div className="flex w-full flex-col items-center space-y-4 sm:items-end">
           {isObject(store.message) && (

package/components/partials/element/modal.tsx

@@ -1,4 +1,4 @@
-import { IsFirstRender } from 'nitro-web'
+import { IsFirstRender, twMerge } from 'nitro-web'
 import SvgX1 from 'nitro-web/client/imgs/icons/x1.svg'
 
 type ModalProps = {
@@ -64,7 +64,7 @@ export function Modal({ show, setShow, children, maxWidth, minHeight, dismissabl
   return (
     <div 
       onClick={(e) => e.stopPropagation()} 
-      class={`fixed top-0 w-[100vw] h-[100vh] z-[700] nitro-modal ${_state.root}`}
+      class={`${twMerge(`fixed top-0 w-[100vw] h-[100vh] z-[100] ${_state.root} ${props.className}`)} nitro-modal`}
     >
       <div class={`!absolute inset-0 box-content bg-gray-500/70 transition-opacity ${_state.bg}`}></div>
       <div class={`relative h-[100vh] overflow-y-auto transition-[opacity,transform] ${_state.container}`}>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "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/index.js

@@ -19,6 +19,15 @@ export { setupRouter } from './router.js'
 export { sendEmail } from './email/index.js'
 
 // Export api default controllers
-export { default as auth, findUserFromProvider, signinAndGetState, userCreate } from '../components/auth/auth.api.js'
+export { 
+  default as auth, 
+  findUserFromProvider, 
+  signinAndGetState, 
+  userCreate, 
+  tokenCreate, 
+  tokenParse,
+  validatePassword,
+  getStore,
+} from '../components/auth/auth.api.js'
 export { default as settings } from '../components/settings/settings.api.js'
 export { default as stripe } from '../components/billing/stripe.api.js'