nitro-web 0.0.33 → 0.0.35

package/components/auth/auth.api.js

@@ -6,7 +6,7 @@ import { Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt'
 import db from 'monastery'
 import jsonwebtoken from 'jsonwebtoken'
 import { sendEmail } from 'nitro-web/server'
-import * as util from 'nitro-web/util'
+import { isArray, pick, isString, ucFirst, fullNameSplit } from 'nitro-web/util'
 
 let config = {}
 const JWT_SECRET = process.env.JWT_SECRET || 'replace_this_with_secure_env_secret'
@@ -32,9 +32,13 @@ export default {
 }
 
 function setup(middleware, _config) {
+  // Setup is called automatically when the server starts
   // Set config values
-  config = { env: _config.env, masterPassword: _config.masterPassword }
-  if (!config.env) throw new Error('Missing config value for: config.env')
+  const configKeys = ['clientUrl', 'emailFrom', 'env', 'mailgunDomain', 'mailgunKey', 'masterPassword', 'name']
+  config = pick(_config, configKeys)
+  for (const key of configKeys) {
+    if (!config[key]) throw new Error(`Missing config value for: config.${key}`)
+  }
 
   passport.use(
     new passportLocal.Strategy(
@@ -102,7 +106,7 @@ async function signup(req, res) {
     sendEmail({
       config: config,
       template: 'welcome',
-      to: `${util.ucFirst(user.firstName)}<${user.email}>`,
+      to: `${ucFirst(user.firstName)}<${user.email}>`,
     }).catch(console.error)
     res.send(await signinAndGetState(user, req.query.desktop))
   } catch (err) {
@@ -133,7 +137,7 @@ function signout(req, res) {
 async function resetInstructions(req, res) {
   try {
     let email = (req.body.email || '').trim().toLowerCase()
-    if (!email || !util.isString(email)) throw { title: 'email', detail: 'The email you entered is incorrect.' }
+    if (!email || !isString(email)) throw { title: 'email', detail: 'The email you entered is incorrect.' }
 
     let user = await db.user.findOne({ query: { email }, _privateData: true })
     if (!user) throw { title: 'email', detail: 'The email you entered is incorrect.' }
@@ -145,7 +149,7 @@ async function resetInstructions(req, res) {
     sendEmail({
       config: config,
       template: 'reset-password',
-      to: `${util.ucFirst(user.firstName)}<${email}>`,
+      to: `${ucFirst(user.firstName)}<${email}>`,
       data: {
         token: resetToken + (req.query.hasOwnProperty('desktop') ? '?desktop' : ''),
       },
@@ -271,21 +275,21 @@ async function validatePassword(password='', password2) {
   }
 }
 
-export async function userCreate({ name, businessName, email, password }) {
+export async function userCreate({ name, business, email, password }) {
   try {
     const options = { blacklist: ['-_id'] }
     const userId = db.id()
     const companyData = {
       _id: db.id(), 
-      business: { name: businessName },
+      ...(business ? { business } : {}),
       users: [{ _id: userId, role: 'owner', status: 'active' }],
     }
     const userData = {
       _id: userId, 
       company: companyData._id,
       email: email,
-      firstName: util.fullNameSplit(name)[0],
-      lastName: util.fullNameSplit(name)[1],
+      firstName: fullNameSplit(name)[0],
+      lastName: fullNameSplit(name)[1],
       password: password ? await (await import('bcrypt')).hash(password, 10) : undefined,
     }
 
@@ -298,7 +302,7 @@ export async function userCreate({ name, businessName, email, password }) {
 
     // Throw all the errors from at once
     const errors = results.filter(o => o.status == 'rejected').reduce((acc, o) => {
-      if (util.isArray(o.reason)) acc.push(...o.reason)
+      if (isArray(o.reason)) acc.push(...o.reason)
       else throw o.reason
       return acc
     }, [])
@@ -312,7 +316,7 @@ export async function userCreate({ name, businessName, email, password }) {
     return await findUserFromProvider({ _id: userId })
 
   } catch (err) {
-    if (!util.isArray(err)) throw err
+    if (!isArray(err)) throw err
     throw err.map((o) => {
       if (o.title == 'firstName') o.title = 'name'
       return o
@@ -320,13 +324,13 @@ export async function userCreate({ name, businessName, email, password }) {
   }
 }
 
-export async function findUserFromProvider(query, passwordToTest) {
+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} <passwordToTest> - password to test
+   * @param {string} <passwordToCheck> - password to test
    */
-  const testPassword = arguments.length > 1
+  const checkPassword = arguments.length > 1
   const user = await db.user.findOne({
     query: query,
     blacklist: ['-password'],
@@ -341,15 +345,18 @@ export async function findUserFromProvider(query, passwordToTest) {
     })
   }
   if (!user) {
-    throw new Error(testPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
+    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 (testPassword) {
-      const match = user.password ? await (await import('bcrypt')).compare(passwordToTest, user.password) : false
-      if (!match && !(config.masterPassword && passwordToTest == config.masterPassword)) {
+    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.')
       }
     }

package/components/auth/reset.tsx

@@ -3,7 +3,7 @@ import { Errors } from 'nitro-web/types'
 
 export function ResetInstructions() {
   const navigate = useNavigate()
-  const isLoading = useState()
+  const isLoading = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState({ email: '', errors: [] as Errors })
 
@@ -41,7 +41,7 @@ export function ResetInstructions() {
 export function ResetPassword() {
   const navigate = useNavigate()
   const params = useParams()
-  const isLoading = useState()
+  const isLoading = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState(() => ({
     password: '',

package/components/partials/element/button.tsx

@@ -29,16 +29,16 @@ export function Button({
   const iconPosition = IconLeft ? 'left' : IconLeftEnd ? 'leftEnd' : IconRight ? 'right' : IconRightEnd ? 'rightEnd' : 'none'
   const base = 
     'relative inline-block text-center font-medium shadow-sm focus-visible:outline focus-visible:outline-2 ' +
-    'focus-visible:outline-offset-2 text-white'
+    'focus-visible:outline-offset-2 text-white [&>.loader]:border-white'
 
   // Button colors, you can use custom colors by using className instead
   const colors = {
     primary: 'bg-primary hover:bg-primary-hover',
     secondary: 'bg-secondary hover:bg-secondary-hover',
     black: 'bg-black hover:bg-gray-700',
-    white: 'bg-white text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 [&>.loader]:border-black',
+    white: 'bg-white ring-1 ring-inset ring-gray-300 hover:bg-gray-50 text-gray-900 [&>.loader]:border-black',
   }
-
+  
   // Button sizes
   const sizes = {
     xs: 'px-2 py-1 px-button-x-xs py-button-y-xs text-xs rounded',
@@ -67,7 +67,7 @@ export function Button({
         isLoading &&
         <span className={
           'loader !opacity-100 absolute top-[50%] left-[50%] w-[1rem] h-[1rem] ml-[-0.5rem] mt-[-0.5rem] ' +
-          'rounded-full animate-spin border-2 !border-t-transparent border-white'
+          'rounded-full animate-spin border-2 !border-t-transparent'
         } />
       }
     </button>

package/package.json

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

@@ -7,21 +7,21 @@ import inlineCss from 'inline-css'
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 import path from 'path'
-import { getDirectories } from 'nitro-web/util'
+import { getDirectories, ucFirst } from 'nitro-web/util'
 
 let templates = {}
 let nodemailerMailgun = undefined
 const _dirname = dirname(fileURLToPath(import.meta.url)) + '/'
 
-export async function sendEmail({ template, to, bcc, data={}, from, replyTo, recipientVariables, subject, test, skipCssInline, config }) {
+export async function sendEmail({ template, to, bcc, data, from, replyTo, recipientVariables, subject, test, skipCssInline, config }) {
   /**
    * Email recipient a predefined template with data and/or recipientVariables
    *
    * @param {string} template = e.g. 'reset-password' or html
-   * @param {string} to - e.g. "Bruce Lee<bruce@gmail.com>, ..."
-   * @param {object} config - e.g. { mailgunKey, mailgunDomain, emailFrom, clientUrl }
+   * @param {string} to - e.g. "Bruce Wayne<bruce@wayneenterprises.com>, ..."
+   * @param {object} config - e.g. { mailgunKey, mailgunDomain, emailFrom, clientUrl, name }
    * @param {string} <bcc> - e.g. "Chuck Norris<chuck@gmail.com>" (not sent in development)
-   * @param {object} <data> - recipientVariables[to] shorthand
+   * @param {object} <data> - recipientVariables[to] shorthand, data is copied to all recipients
    * @param {string} <from> - e.g. "Chuck Norris<chuck@gmail.com>"
    * @param {string} <replyTo> - e.g. "Chuck Norris<chuck@gmail.com>"
    * @param {object} <recipientVariables> - mailgun recipient-variables for batch sending
@@ -32,8 +32,12 @@ export async function sendEmail({ template, to, bcc, data={}, from, replyTo, rec
    */
   if (!config) {
     throw new Error('sendEmail: `config` missing')
-  } else if (!config.emailFrom || !config.clientUrl) {
-    throw new Error('sendEmail: `config.emailFrom` or `config.clientUrl` is missing')
+  } else if (!config.emailFrom) {
+    throw new Error('sendEmail: `config.emailFrom` is missing')
+  } else if (!config.clientUrl) {
+    throw new Error('sendEmail: `config.clientUrl` is missing')
+  } else if (!config.name) {
+    throw new Error('sendEmail: `config.name` is missing')
   } else if (!test && (!config.mailgunKey || !config.mailgunDomain)) {
     throw new Error('sendEmail: `config.mailgunKey` or `config.mailgunDomain` is missing')
   } else if (!template) {
@@ -52,27 +56,30 @@ export async function sendEmail({ template, to, bcc, data={}, from, replyTo, rec
   // From, replayTo
   from = from || config.emailFrom
   replyTo = replyTo || config.emailReplyTo || from
-
-  // Data is recipientVariables[to] shorthand
-  if (data) {
-    recipientVariables = { [getNameEmail(to)[1]]: data }
-  }
+  const toSplit = to.split(',')
 
   // Add default recipientVariables
-  for (let toEmail in recipientVariables) {
+  if (!recipientVariables) recipientVariables = {}
+
+  // Add default values to recipientVariables
+  for (let toNameEmail of toSplit) {
+    const [toName, toEmail] = getNameEmail(toNameEmail)
     recipientVariables[toEmail] = {
+      ...(data || {}),
+      configName: ucFirst(config.name),
       domain: config.clientUrl,
-      email: toEmail,
-      greet: data.name || getNameEmail(to)[0]? 'Hi ' + (data.name || getNameEmail(to)[0]) : 'Hello',
-      name: getNameEmail(to)[0],
       replyToEmail: getNameEmail(replyTo)[1],
       replyToName: getNameEmail(replyTo)[0],
-      ...recipientVariables[toEmail],
+      email: toEmail,
+      greet: toName ? 'Hi ' + toName : 'Hello',
+      name: toName,
+      ...(recipientVariables[toEmail] || {}),
     }
   }
 
   let settings = {
     bcc: bcc,
+    emailTemplateDir: getDirectories(path, config.pwd).emailTemplateDir,
     from: from,
     isDev: config.clientUrl.match(/:/), // possibly use config.env here
     recipientVariables: recipientVariables,
@@ -83,7 +90,6 @@ export async function sendEmail({ template, to, bcc, data={}, from, replyTo, rec
     test: config.emailTestMode || test,
     to: to,
     url: config.clientUrl,
-    emailTemplateDir: getDirectories(path, config.pwd).emailTemplateDir,
   }
 
   // Grab html and send

package/server/email/partials/layout1.swig

@@ -31,7 +31,7 @@
                               <tr>
                                 <td width="180px" align="left">
                                   <a href="%recipient.domain%" target="_blank">
-                                    <img src="%recipient.domain%/assets/imgs/logo/logo-white.svg" width="auto" height="22" border="0">
+                                    <img src="%recipient.domain%/assets/imgs/logo/logo.svg" width="auto" height="22" border="0">
                                   </a>
                                 </td>
                                 <td align="right">

package/server/email/partials/vert-25.swig

@@ -2,7 +2,7 @@
 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
   <tbody>
     <tr>
-      <td width="100%" height="28"></td>
+      <td width="100%" height="25"></td>
     </tr>
   </tbody>
 </table>

package/server/email/reset-password.html

@@ -1,4 +1,13 @@
+<!-- 
+  - You can view templates at http://localhost:3001/email/reset-password
+  - To modify the css, add your own /server/email/partials/email.css file
+  - You can copy any nitro email .swig/html template to your project, and modify it
+-->
+  
+<!-- extends references the default nitro layout file -->
 {% extends "partials/layout1.swig" %}
+
+<!-- block content is the content of the email -->
 {% block content %}
 
   [[ subject = Reset your Password ]]
@@ -15,7 +24,6 @@
   </span><br/>
   <br/>
   Thanks,<br/>
-  <b>The Nitro Team</b>
-
+  <b>The %recipient.configName% Team</b>
 
 {% endblock %}

package/server/email/welcome.html

@@ -1,10 +1,19 @@
+<!-- 
+  - You can view templates at http://localhost:3001/email/welcome
+  - To modify the css, add your own /server/email/partials/email.css file
+  - You can copy any nitro email .swig/html template to your project, and modify it
+-->
+
+<!-- extends references the default nitro layout file -->
 {% extends "partials/layout1.swig" %}
+
+<!-- block content is the content of the email -->
 {% block content %}
 
-  [[ subject = Welcome to Nitro ]]
+  [[ subject = Welcome to %recipient.configName% ]]
   <b>%recipient.greet%</b>,<br/>
   <br/>
-  Thanks for trying out Nitro! <br/>
+  Thanks for trying out %recipient.configName%! <br/>
   <br/>
   If you have any feature requests, feedback or questions, please don't hesitate to reach out to us at <a href="mailto:%recipient.replyToEmail%">%recipient.replyToEmail%</a>.<br/>
   <br/>
@@ -16,6 +25,6 @@
   </span><br/>
   <br/>
   Thanks,<br/>
-  <b>The Nitro Team</b>
+  <b>The %recipient.configName% Team</b>
 
 {% endblock %}

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BC;AAED,6DAaC;AAED,4DAQC;AAED,iFAaC;AAED,0EAIC;AAED,gDAEC;AAED,0CAEC;AAED,qFAQC;AAED,uDAIC;AAED,iEAoBC;AAED;;;;EAgIC;AAED,wCASC;AAED,mDAYC;AAED,+DAyBC;AAED,iEAeC;AAED,kFA2BC;AAED,gEAIC;AAED,6CASC;AAED,qEAsEC;AAED,8CAGC;AAED,kDAQC;AAED;;;;IAOC;AAED;;;IAOC;AAED;;;;;GAKG;AACH,uCAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAYlB;AAED;;;;;;;EAUC;AAED,sDAYC;AAED,uEAEC;AAED,kDAsBC;AAED,+DAaC;AAED,0DAEC;AAED,+CAEC;AAED,kDAEC;AAED,6CAIC;AAED,kEAOC;AAED,mDAEC;AAED,6CAiBC;AAED,iDAEC;AAED;;;;GAIG;AACH,mCAHW,OAAO,GACL,OAAO,CAKnB;AAED,gDAEC;AAED,iDAEC;AAED,0CAEC;AAED,yEAWC;AAED,mFAwCC;AAED;;;;;;;;;;;;;;;;;;;;;;;;EA0CC;AAED,uEAmBC;AAED,oDAKC;AAED,iDAOC;AAED;;;;;;;;GAQG;AACH,8FAyCC;AAED,kEAQC;AAED,8CAeC;AAED,+DAiCC;AAED,8CAcC;AAED,yFAiDC;AAED,oDAYC;AAED,4EAmBC;AAED,kDAUC;AAED,mFAiDC;AAED,oEAaC;AAED,8EAIC;AAED,0DAQC;AAED,uDAMC;AAED,mFAwBC;AAED;;;;EAyBC;AAED,8CAIC;AAED,uCAGC;AAED,0CAGC;AAxoCD,6BAAoC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BC;AAED,6DAaC;AAED,4DAQC;AAED,iFAaC;AAED,0EAIC;AAED,gDAEC;AAED,0CAEC;AAED,qFAQC;AAED,uDAIC;AAED,iEAoBC;AAED;;;;EAgIC;AAED,wCASC;AAED,mDAYC;AAED,+DAyBC;AAED,iEAeC;AAED,kFA2BC;AAED,gEAIC;AAED,6CASC;AAED,qEAsEC;AAED,8CAGC;AAED,kDAQC;AAED;;;;IAOC;AAED;;;IAOC;AAED;;;;;GAKG;AACH,uCAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAYlB;AAED;;;;;;;EAUC;AAED,sDAYC;AAED,uEAEC;AAED,kDAsBC;AAED,+DAaC;AAED,0DAEC;AAED,+CAEC;AAED,kDAEC;AAED,6CAIC;AAED,kEAOC;AAED,mDAEC;AAED,6CAiBC;AAED,iDAEC;AAED;;;;GAIG;AACH,mCAHW,OAAO,GACL,OAAO,CAKnB;AAED,gDAEC;AAED,iDAEC;AAED,0CAEC;AAED,yEAWC;AAED,mFAwCC;AAED;;;;;;;;;;;;;;;;;;;;;;;;EA0CC;AAED,uEAmBC;AAED,oDAKC;AAED,iDAOC;AAED;;;;;;;;GAQG;AACH,8FAyCC;AAED,kEAQC;AAED,8CAeC;AAED,+DAiCC;AAED,8CAcC;AAED,yFAkDC;AAED,oDAYC;AAED,4EAmBC;AAED,kDAUC;AAED,mFAiDC;AAED,oEAaC;AAED,8EAIC;AAED,0DAQC;AAED,uDAMC;AAED,mFAwBC;AAED;;;;EAyBC;AAED,8CAIC;AAED,uCAGC;AAED,0CAGC;AAzoCD,6BAAoC"}

package/util.js

@@ -955,6 +955,7 @@ export async function request (route, data, event, isLoading) {
     return res.value.data
 
   } catch (errs) {
+    if (isLoading) isLoading[1](false)
     throw getResponseErrors(errs)
   }
 }