nitro-web 0.0.183 → 0.0.185

package/components/auth/inviteConfirm.tsx

@@ -0,0 +1,106 @@
+import { Topbar, Field, FormError, Button, request, onChange, getResponseErrors, showError } from 'nitro-web'
+import { Errors } from 'nitro-web/types'
+import { Fragment, useEffect } from 'react'
+
+type InviteConfirmProps = {
+  className?: string,
+  elements?: { Button?: typeof Button },
+  redirectTo?: string,
+}
+
+export function InviteConfirm({ className, elements, redirectTo }: InviteConfirmProps) {
+  const navigate = useNavigate()
+  const params = useParams()
+  const [store, setStore] = useTracked()
+  const [isLoading, setIsLoading] = useState(false)
+  const [accepted, setAccepted] = useState(false)
+  const [state, setState] = useState(() => ({
+    firstName: '',
+    lastName: '',
+    password: '',
+    password2: '',
+    token: params.token,
+    errors: [] as Errors,
+  }))
+
+  const Elements = {
+    Button: elements?.Button || Button,
+  }
+
+  // Auto-confirm on mount for already signed-in users
+  useEffect(() => {
+    if (store.user) submit({ token: params.token })
+  }, [])
+
+  async function submit(data: object, event?: React.FormEvent<HTMLFormElement>) {
+    try {
+      if (isLoading) return
+      const result = await request('post /api/invite-confirm', data, event, setIsLoading, setState)
+      setStore((s) => ({ ...s, ...result }))
+      setAccepted(true)
+      setTimeout(() => navigate(redirectTo || '/'), 5000)
+    } catch (e) {
+      showError(setStore, e)
+      setState((s) => ({ ...s, errors: getResponseErrors(e) }))
+    }
+  }
+
+  if (store.user) {
+    return (
+      <div className={className}>
+        <div class="py-12 text-center">
+          {accepted ? (
+            <Fragment>
+              <p class="text-lg font-semibold">Your invite has been accepted.</p>
+              <p class="text-sm text-gray-500 mt-1">You&apos;ll be redirected back to the <Link to="/">home page</Link> shortly...</p>
+            </Fragment>
+          ) : isLoading ? (
+            <Fragment>
+              <p class="text-lg font-semibold">Accepting your invite...</p>
+              <p class="text-sm text-gray-500 mt-1">Please wait while we confirm your invite.</p>
+            </Fragment>
+          ) : (
+            <Fragment>
+              <p class="text-lg font-semibold mb-2">Oops! Something went wrong.</p>
+              <span class="text-sm text-red-500 bg-red-50 p-1 rounded-md mt-1">{state.errors.map((error) => error.detail).join(', ')}</span>
+            </Fragment>
+          )}
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className={className}>
+      <Topbar title={<Fragment>Accept Your Invite</Fragment>} />
+
+      <form onSubmit={(e) => submit(state, e)} class="mb-0">
+        <div class="grid grid-cols-2 gap-6">  
+          <div>
+            <label for="firstName">First Name</label>
+            <Field name="firstName" type="text" state={state} onChange={(e) => onChange(e, setState)} placeholder="Your first name..." />
+          </div>
+          <div>
+            <label for="lastName">Last Name</label>
+            <Field name="lastName" type="text" state={state} onChange={(e) => onChange(e, setState)} placeholder="Your last name..." />
+          </div>
+        </div>
+        <div>
+          <label for="password">Choose a Password</label>
+          <Field name="password" type="password" state={state} onChange={(e) => onChange(e, setState)} />
+        </div>
+        <div>
+          <label for="password2">Repeat Your Password</label>
+          <Field name="password2" type="password" state={state} onChange={(e) => onChange(e, setState)} />
+        </div>
+
+        <div class="mb-14">
+          Already have an account? <Link to="/signin" class="underline2 is-active">Sign in here</Link> first then revisit this link.
+          <FormError state={state} className="pt-2" />
+        </div>
+
+        <Elements.Button class="w-full" isLoading={isLoading} type="submit">Accept Invite & Create Account</Elements.Button>
+      </form>
+    </div>
+  )
+}

package/components/auth/signup.tsx

@@ -15,7 +15,7 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
   const [state, setState] = useState({
     email: injectedConfig.env === 'development' ? (injectedConfig.placeholderEmail || '') : '',
     name: injectedConfig.env === 'development' ? 'Bruce Wayne' : '',
-    business: { name: injectedConfig.env === 'development' ? 'Wayne Enterprises' : '' },
+    company: { business: { name: injectedConfig.env === 'development' ? 'Wayne Enterprises' : '' } },
     password: injectedConfig.env === 'development' ? '' : '',
     errors: [] as Errors,
   })
@@ -49,8 +49,11 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
             />
           </div>
           <div>
-            <label for="business.name">Company Name</label>
-            <Field name="business.name" placeholder="E.g. Wayne Enterprises" state={state} onChange={(e) => onChange(e, setState)} />
+            <label for="company.business.name">Company Name</label>
+            <Field name="company.business.name" placeholder="E.g. Wayne Enterprises" state={state} 
+              onChange={(e) => onChange(e, setState)}
+              errorTitle={/business\.name/}
+            />
           </div>
         </div>
         <div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.183",
+  "version": "0.0.185",
   "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/constants.js

@@ -0,0 +1,268 @@
+// --- Enums ------------------------------------
+
+/**
+ * @typedef {'af'|'al'|'dz'|'ad'|'ao'|'ag'|'ar'|'am'|'au'|'at'|'az'|'bs'|'bh'|'bd'|'bb'|'by'|'be'|'bz'|'bj'|'bt'|'bo'|'ba'|'bw'|'br'|
+ *  'bn'|'bg'|'bf'|'bi'|'cv'|'kh'|'cm'|'ca'|'cf'|'td'|'cl'|'cn'|'co'|'km'|'cg'|'cr'|'hr'|'cu'|'cy'|'cz'|'cd'|'dk'|'dj'|'dm'|'do'|'ec'|
+ *  'eg'|'sv'|'gq'|'er'|'ee'|'sz'|'et'|'fj'|'fi'|'fr'|'ga'|'gm'|'ge'|'de'|'gh'|'gr'|'gd'|'gt'|'gn'|'gw'|'gy'|'ht'|'hn'|'hu'|'is'|
+ *  'in'|'id'|'ir'|'iq'|'ie'|'il'|'it'|'jm'|'jp'|'jo'|'kz'|'ke'|'ki'|'kw'|'kg'|'la'|'lv'|'lb'|'ls'|'lr'|'ly'|'li'|'lt'|'lu'|'mg'|
+ *  'mw'|'my'|'mv'|'ml'|'mt'|'mh'|'mr'|'mu'|'mx'|'fm'|'md'|'mc'|'mn'|'me'|'ma'|'mz'|'mm'|'na'|'nr'|'np'|'nl'|'nz'|'ni'|'ne'|'ng'|
+ *  'kp'|'mk'|'no'|'om'|'pk'|'pw'|'pa'|'pg'|'py'|'pe'|'ph'|'pl'|'pt'|'qa'|'ro'|'ru'|'rw'|'kn'|'lc'|'vc'|'ws'|'sm'|'st'|'sa'|'sn'|
+ *  'rs'|'sc'|'sl'|'sg'|'sk'|'si'|'sb'|'so'|'za'|'kr'|'ss'|'es'|'lk'|'sd'|'sr'|'se'|'ch'|'sy'|'tj'|'tz'|'th'|'tl'|'tg'|'to'|'tt'|
+ *  'tn'|'tr'|'tm'|'tv'|'ug'|'ua'|'ae'|'gb'|'us'|'uy'|'uz'|'vu'|'va'|'ve'|'vn'|'ye'|'zm'|'zw'} Country
+ * @typedef {'nzd'|'aud'|'usd'|'gbp'|'btc'|'aed'|'ars'|'bdt'|'bhd'|'brl'|'cad'|'chf'|'clp'|'cny'|'cop'|'czk'|'dkk'|'egp'|'eur'|
+ *  'hkd'|'huf'|'idr'|'ils'|'inr'|'jod'|'jpy'|'kes'|'krw'|'kwd'|'lkr'|'mad'|'mxn'|'myr'|'ngn'|'nok'|'omr'|'pen'|'php'|'pkt'|
+ *  'pln'|'qar'|'ron'|'rub'|'sar'|'sek'|'sgd'|'thb'|'try'|'twd'|'uah'|'vnd'|'zar'} Currency
+ */
+
+/** @type {{ [key in Currency]: { name: string, symbol: string, digits: number } }} */
+export const currencies = {
+  nzd: { name: 'New Zealand Dollar', symbol: '$', digits: 2 },
+  aud: { name: 'Australian Dollar', symbol: '$', digits: 2 },
+  usd: { name: 'US Dollar', symbol: '$', digits: 2 },
+  gbp: { name: 'Great Britain Pound', symbol: '£', digits: 2 },
+  btc: { name: 'Bitcoin', symbol: '₿', digits: 8 },
+  aed: { name: 'UAE Dirham', symbol: 'د.إ', digits: 2 },
+  ars: { name: 'Argentine Peso', symbol: '$', digits: 2 },
+  bdt: { name: 'Bangladeshi Taka', symbol: '৳', digits: 2 },
+  bhd: { name: 'Bahraini Dinar', symbol: '.د.ب', digits: 3 },
+  brl: { name: 'Brazilian Real', symbol: 'R$', digits: 2 },
+  cad: { name: 'Canadian Dollar', symbol: '$', digits: 2 },
+  chf: { name: 'Swiss Franc', symbol: 'Fr', digits: 2 },
+  clp: { name: 'Chilean Peso', symbol: '$', digits: 0 },
+  cny: { name: 'Chinese Yuan', symbol: '¥', digits: 2 },
+  cop: { name: 'Colombian Peso', symbol: '$', digits: 2 },
+  czk: { name: 'Czech Koruna', symbol: 'Kč', digits: 2 },
+  dkk: { name: 'Danish Krone', symbol: 'kr', digits: 2 },
+  egp: { name: 'Egyptian Pound', symbol: '£', digits: 2 },
+  eur: { name: 'Euro', symbol: '€', digits: 2 },
+  hkd: { name: 'Hong Kong Dollar', symbol: '$', digits: 2 },
+  huf: { name: 'Hungarian Forint', symbol: 'Ft', digits: 0 },
+  idr: { name: 'Indonesian Rupiah', symbol: 'Rp', digits: 0 },
+  ils: { name: 'Israeli Shekel', symbol: '₪', digits: 2 },
+  inr: { name: 'Indian Rupee', symbol: '₹', digits: 2 },
+  jod: { name: 'Jordanian Dinar', symbol: 'د.ا', digits: 3 },
+  jpy: { name: 'Japanese Yen', symbol: '¥', digits: 0 },
+  kes: { name: 'Kenyan Shilling', symbol: 'Sh', digits: 2 },
+  krw: { name: 'South Korean Won', symbol: '₩', digits: 0 },
+  kwd: { name: 'Kuwaiti Dinar', symbol: 'د.ك', digits: 3 },
+  lkr: { name: 'Sri Lankan Rupee', symbol: 'Rs', digits: 2 },
+  mad: { name: 'Moroccan Dirham', symbol: 'د.م.', digits: 2 },
+  mxn: { name: 'Mexican Peso', symbol: '$', digits: 2 },
+  myr: { name: 'Malaysian Ringgit', symbol: 'RM', digits: 2 },
+  ngn: { name: 'Nigerian Naira', symbol: '₦', digits: 2 },
+  nok: { name: 'Norwegian Krone', symbol: 'kr', digits: 2 },
+  omr: { name: 'Omani Rial', symbol: '﷼', digits: 3 },
+  pen: { name: 'Peruvian Sol', symbol: 'S/', digits: 2 },
+  php: { name: 'Philippine Peso', symbol: '₱', digits: 2 },
+  pkt: { name: 'Pakistani Rupee', symbol: '₨', digits: 2 },
+  pln: { name: 'Polish Zloty', symbol: 'zł', digits: 2 },
+  qar: { name: 'Qatari Riyal', symbol: '﷼', digits: 2 },
+  ron: { name: 'Romanian Leu', symbol: 'lei', digits: 2 },
+  rub: { name: 'Russian Ruble', symbol: '₽', digits: 2 },
+  sar: { name: 'Saudi Riyal', symbol: '﷼', digits: 2 },
+  sek: { name: 'Swedish Krona', symbol: 'kr', digits: 2 },
+  sgd: { name: 'Singapore Dollar', symbol: '$', digits: 2 },
+  thb: { name: 'Thai Baht', symbol: '฿', digits: 2 },
+  try: { name: 'Turkish Lira', symbol: '₺', digits: 2 },
+  twd: { name: 'New Taiwan Dollar', symbol: 'NT$', digits: 2 },
+  uah: { name: 'Ukrainian Hryvnia', symbol: '₴', digits: 2 },
+  vnd: { name: 'Vietnamese Dong', symbol: '₫', digits: 0 },
+  zar: { name: 'South African Rand', symbol: 'R', digits: 2 },
+}
+
+/** @type {{ [key in Country]: { name: string } }} */
+export const countries = {
+  af: { name: 'Afghanistan' },
+  al: { name: 'Albania' },
+  dz: { name: 'Algeria' },
+  ad: { name: 'Andorra' },
+  ao: { name: 'Angola' },
+  ag: { name: 'Antigua and Barbuda' },
+  ar: { name: 'Argentina' },
+  am: { name: 'Armenia' },
+  au: { name: 'Australia' },
+  at: { name: 'Austria' },
+  az: { name: 'Azerbaijan' },
+  bs: { name: 'Bahamas' },
+  bh: { name: 'Bahrain' },
+  bd: { name: 'Bangladesh' },
+  bb: { name: 'Barbados' },
+  by: { name: 'Belarus' },
+  be: { name: 'Belgium' },
+  bz: { name: 'Belize' },
+  bj: { name: 'Benin' },
+  bt: { name: 'Bhutan' },
+  bo: { name: 'Bolivia' },
+  ba: { name: 'Bosnia and Herzegovina' },
+  bw: { name: 'Botswana' },
+  br: { name: 'Brazil' },
+  bn: { name: 'Brunei' },
+  bg: { name: 'Bulgaria' },
+  bf: { name: 'Burkina Faso' },
+  bi: { name: 'Burundi' },
+  cv: { name: 'Cabo Verde' },
+  kh: { name: 'Cambodia' },
+  cm: { name: 'Cameroon' },
+  ca: { name: 'Canada' },
+  cf: { name: 'Central African Republic' },
+  td: { name: 'Chad' },
+  cl: { name: 'Chile' },
+  cn: { name: 'China' },
+  co: { name: 'Colombia' },
+  km: { name: 'Comoros' },
+  cg: { name: 'Congo (Congo-Brazzaville)' },
+  cr: { name: 'Costa Rica' },
+  hr: { name: 'Croatia' },
+  cu: { name: 'Cuba' },
+  cy: { name: 'Cyprus' },
+  cz: { name: 'Czechia' },
+  cd: { name: 'Democratic Republic of the Congo' },
+  dk: { name: 'Denmark' },
+  dj: { name: 'Djibouti' },
+  dm: { name: 'Dominica' },
+  do: { name: 'Dominican Republic' },
+  ec: { name: 'Ecuador' },
+  eg: { name: 'Egypt' },
+  sv: { name: 'El Salvador' },
+  gq: { name: 'Equatorial Guinea' },
+  er: { name: 'Eritrea' },
+  ee: { name: 'Estonia' },
+  sz: { name: 'Eswatini' },
+  et: { name: 'Ethiopia' },
+  fj: { name: 'Fiji' },
+  fi: { name: 'Finland' },
+  fr: { name: 'France' },
+  ga: { name: 'Gabon' },
+  gm: { name: 'Gambia' },
+  ge: { name: 'Georgia' },
+  de: { name: 'Germany' },
+  gh: { name: 'Ghana' },
+  gr: { name: 'Greece' },
+  gd: { name: 'Grenada' },
+  gt: { name: 'Guatemala' },
+  gn: { name: 'Guinea' },
+  gw: { name: 'Guinea-Bissau' },
+  gy: { name: 'Guyana' },
+  ht: { name: 'Haiti' },
+  hn: { name: 'Honduras' },
+  hu: { name: 'Hungary' },
+  is: { name: 'Iceland' },
+  in: { name: 'India' },
+  id: { name: 'Indonesia' },
+  ir: { name: 'Iran' },
+  iq: { name: 'Iraq' },
+  ie: { name: 'Ireland' },
+  il: { name: 'Israel' },
+  it: { name: 'Italy' },
+  jm: { name: 'Jamaica' },
+  jp: { name: 'Japan' },
+  jo: { name: 'Jordan' },
+  kz: { name: 'Kazakhstan' },
+  ke: { name: 'Kenya' },
+  ki: { name: 'Kiribati' },
+  kw: { name: 'Kuwait' },
+  kg: { name: 'Kyrgyzstan' },
+  la: { name: 'Laos' },
+  lv: { name: 'Latvia' },
+  lb: { name: 'Lebanon' },
+  ls: { name: 'Lesotho' },
+  lr: { name: 'Liberia' },
+  ly: { name: 'Libya' },
+  li: { name: 'Liechtenstein' },
+  lt: { name: 'Lithuania' },
+  lu: { name: 'Luxembourg' },
+  mg: { name: 'Madagascar' },
+  mw: { name: 'Malawi' },
+  my: { name: 'Malaysia' },
+  mv: { name: 'Maldives' },
+  ml: { name: 'Mali' },
+  mt: { name: 'Malta' },
+  mh: { name: 'Marshall Islands' },
+  mr: { name: 'Mauritania' },
+  mu: { name: 'Mauritius' },
+  mx: { name: 'Mexico' },
+  fm: { name: 'Micronesia' },
+  md: { name: 'Moldova' },
+  mc: { name: 'Monaco' },
+  mn: { name: 'Mongolia' },
+  me: { name: 'Montenegro' },
+  ma: { name: 'Morocco' },
+  mz: { name: 'Mozambique' },
+  mm: { name: 'Myanmar' },
+  na: { name: 'Namibia' },
+  nr: { name: 'Nauru' },
+  np: { name: 'Nepal' },
+  nl: { name: 'Netherlands' },
+  nz: { name: 'New Zealand' },
+  ni: { name: 'Nicaragua' },
+  ne: { name: 'Niger' },
+  ng: { name: 'Nigeria' },
+  kp: { name: 'North Korea' },
+  mk: { name: 'North Macedonia' },
+  no: { name: 'Norway' },
+  om: { name: 'Oman' },
+  pk: { name: 'Pakistan' },
+  pw: { name: 'Palau' },
+  pa: { name: 'Panama' },
+  pg: { name: 'Papua New Guinea' },
+  py: { name: 'Paraguay' },
+  pe: { name: 'Peru' },
+  ph: { name: 'Philippines' },
+  pl: { name: 'Poland' },
+  pt: { name: 'Portugal' },
+  qa: { name: 'Qatar' },
+  ro: { name: 'Romania' },
+  ru: { name: 'Russia' },
+  rw: { name: 'Rwanda' },
+  kn: { name: 'Saint Kitts and Nevis' },
+  lc: { name: 'Saint Lucia' },
+  vc: { name: 'Saint Vincent and the Grenadines' },
+  ws: { name: 'Samoa' },
+  sm: { name: 'San Marino' },
+  st: { name: 'Sao Tome and Principe' },
+  sa: { name: 'Saudi Arabia' },
+  sn: { name: 'Senegal' },
+  rs: { name: 'Serbia' },
+  sc: { name: 'Seychelles' },
+  sl: { name: 'Sierra Leone' },
+  sg: { name: 'Singapore' },
+  sk: { name: 'Slovakia' },
+  si: { name: 'Slovenia' },
+  sb: { name: 'Solomon Islands' },
+  so: { name: 'Somalia' },
+  za: { name: 'South Africa' },
+  kr: { name: 'South Korea' },
+  ss: { name: 'South Sudan' },
+  es: { name: 'Spain' },
+  lk: { name: 'Sri Lanka' },
+  sd: { name: 'Sudan' },
+  sr: { name: 'Suriname' },
+  se: { name: 'Sweden' },
+  ch: { name: 'Switzerland' },
+  sy: { name: 'Syria' },
+  tj: { name: 'Tajikistan' },
+  tz: { name: 'Tanzania' },
+  th: { name: 'Thailand' },
+  tl: { name: 'Timor-Leste' },
+  tg: { name: 'Togo' },
+  to: { name: 'Tonga' },
+  tt: { name: 'Trinidad and Tobago' },
+  tn: { name: 'Tunisia' },
+  tr: { name: 'Turkey' },
+  tm: { name: 'Turkmenistan' },
+  tv: { name: 'Tuvalu' },
+  ug: { name: 'Uganda' },
+  ua: { name: 'Ukraine' },
+  ae: { name: 'United Arab Emirates' },
+  gb: { name: 'United Kingdom' },
+  us: { name: 'United States' },
+  uy: { name: 'Uruguay' },
+  uz: { name: 'Uzbekistan' },
+  vu: { name: 'Vanuatu' },
+  va: { name: 'Vatican City' },
+  ve: { name: 'Venezuela' },
+  vn: { name: 'Vietnam' },
+  ye: { name: 'Yemen' },
+  zm: { name: 'Zambia' },
+  zw: { name: 'Zimbabwe' },
+}

package/server/index.js

@@ -1,10 +1,13 @@
 // @ts-nocheck
 export * from '../util.js'
 export * as util from '../util.js'
+export { currencies, countries } from './constants.js'
 
 /**
- * Re-export the MiddlewareConfig type from nitro-web/server
+ * Re-export types from nitro-web/server
  * @typedef {import('./router.js').MiddlewareConfig} MiddlewareConfig
+ * @typedef {import('./constants.js').Country} Country
+ * @typedef {import('./constants.js').Currency} Currency
  */
 
 // Export models

package/server/models/company.js

@@ -13,17 +13,20 @@ export default {
       phone: { type: 'string' },
       website: { type: 'string', isURL: true },
     },
-    status: { type: 'string', default: 'active', enum: ['active', 'unpaid', 'deleted'] },
+    status: { type: 'string', default: 'active', enum: ['active', 'unpaid', 'deleted'], required: true },
     users: [{
-      _id: { model: 'user' },
-      role: { type: 'string', enum: ['owner', 'manager', 'accountant'] },
-      status: { type: 'string', required: true, enum: ['invited', 'active', 'deleted'] },
-      inviteEmail: { type: 'string' },
-      inviteToken: { type: 'string' },
+      _id: { model: 'user', required: true },
+      role: { type: 'string', enum: ['owner', 'manager'], required: true },
+      status: { type: 'string', default: 'active', enum: ['active', 'deleted'], required: true },
+    }],
+    invites: [{
+      email: { type: 'email', required: true },
+      role: { type: 'string', enum: ['owner', 'manager'], required: true },
+      inviteToken: { type: 'string', required: true },
     }],
   },
 
-  findBL: ['users.inviteToken'],
+  findBL: ['invites.token'],
   updateBL: ['status', 'users'],
 
   afterFind: [
@@ -34,8 +37,6 @@ export default {
         for (let i=data.users.length; i--;) {
           const user = data.users[i]
           const userExpanded = data.usersExpanded.find(o => String(o._id) == String(user._id))
-          // console.log(userExpanded)
-          if (user.inviteEmail) user.email = user.inviteEmail
           if (userExpanded) Object.assign(user, { ...userExpanded, name: fullName(userExpanded) })
         }
         delete data.usersExpanded

package/server/models/user.js

@@ -5,25 +5,26 @@ export default {
 
   fields: {
     avatar: { type: 'image' },
-    company: { model: 'company', required: true },
+    company: { model: 'company', required: true }, // AKA "active company"
     email: { type: 'email', required: true, index: 'unique' },
-    isInvited: { type: 'boolean' },
+    isAdmin: { type: 'boolean', default: false },
     firstName: { type: 'string', required: true },
     lastName: { type: 'string', required: true },
-    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' },
+    // If single tenancy application
+    // status: { type: 'string', default: 'active', enum: ['active', 'deleted'] },
+    // isInvited: { type: 'boolean' }
+    // inviteToken: { type: 'string' },
   },
 
   findBL: ['password', 'inviteToken', 'resetToken'],
-  updateBL: ['password', 'inviteToken', 'resetToken', 'company', 'status', 'stripeSubscription', 'type', 'usedFreeTrial'],
+  updateBL: ['password', 'inviteToken', 'resetToken', 'company', 'status', 'stripeSubscription', 'isAdmin', 'usedFreeTrial'],
 
   messages: {
     lastName: {

package/server/router.js

@@ -404,7 +404,7 @@ export const middleware = {
 }
 
 export function isAdminUser(req) {
-  return (req.user?.type?.match(/admin/) || req.user?.isAdmin) ? true : false
+  return req.user?.isAdmin ? true : false
 }
 
 export function isValidUserOrRespond(req, res) {
@@ -424,7 +424,7 @@ export function isValidUserOrRespond(req, res) {
 function isValidParamCompanyUserOrRespond(req, res, checkIsOwner = false) {
   const _company = req.user?.company?._id?.toString() == req.params.cid ? req.user.company : false
   const company = _company || req.user?.companies?.find((o) => o._id.toString() == req.params.cid)
-  const isCompanyOwner = company?.users?.find((o) => o._id.toString() == req.user?._id?.toString() && o.type === 'owner')
+  const isCompanyOwner = company?.users?.find((o) => o._id.toString() == req.user?._id?.toString() && o.role === 'owner')
   if (!isValidUserOrRespond(req, res)) return
   else if (!isAdminUser(req) && !company) res.unauthorized('You are not authorised to make this request.')
   else if (!isAdminUser(req) && checkIsOwner && !isCompanyOwner) res.unauthorized('Only owners can make this request.')

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

@@ -1,37 +1,48 @@
-export function findUserFromProvider(query: any, passwordToCheck: any, ...args: any[]): Promise<any>;
-export function getStore(user: any): Promise<{
-    user: any;
-}>;
-export function signinAndGetStore(user: any, isDesktop: any, getStore: any): Promise<any>;
-export function userCreate({ business, password, ...userDataProp }: {
-    [x: string]: any;
-    business: any;
-    password: any;
-}): Promise<any>;
-export function tokenCreate(id: any): Promise<any>;
-export function tokenParse(token: any): any;
-export function validatePassword(password: string, password2: any): Promise<void>;
 export function resetInstructions(req: any, res: any): Promise<void>;
 export function inviteInstructions(req: any, res: any): Promise<void>;
-export function inviteConfirm(req: any, res: any): Promise<void>;
 export function resetConfirm(req: any, res: any): Promise<void>;
-export function inviteOrResetConfirm(type: any, req: any): Promise<any>;
+export function inviteConfirm(req: any, res: any): Promise<void>;
+export function userFindFromProvider(query: any, passwordToCheck: any, ...args: any[]): Promise<any>;
+export function userSigninGetStore(user: any, isDesktop: any): Promise<any>;
+export function getStore(user: any): Promise<{
+    user: any;
+}>;
+/**
+ * Creates a new user and company (if multi tenant and `user.company` is not an id)
+ * @param {object} userData - user data
+ * @param {string} [userData.password] - optional
+ * @param {string} [userData.password2] - optional, to confirm the password
+ * @param {string} [userData.company] - if multi tenant and `user.company` is not an id, create a new company
+ * @param {boolean} [skipSendEmail=false] - whether to skip sending the welcome email
+ * @returns {Promise<object>} - the created user
+ */
+export function userCreate({ password, password2, company, ...userDataProp }: {
+    password?: string;
+    password2?: string;
+    company?: string;
+}, skipSendEmail?: boolean): Promise<object>;
+export function passwordValidate(password: string, password2: any): Promise<void>;
+export function tokenCreate(modelName: any, id: any): Promise<any>;
+export function tokenParse(token: any, modelName: any, maxAgeMs?: number): any;
+export function tokenConfirmForReset(req: any): Promise<any>;
+export function tokenConfirmForSingleTenant(req: any, isReset: any): Promise<any>;
+export function tokenConfirmForMultiTenant(req: any): Promise<any>;
 /**
- * Checks if the user exists, updates the user with the invite token and sends the invite email
+ * Creates and sends a reset or invite token to a user or company
  * @param {object} options
- * @param {'reset' | 'invite'} options.type -  The type of token to send (default: 'reset')
- * @param {{_id: string, email: string, firstName: string}} options.user -  The user to send the invite email to
- * @param {function} [options.beforeUpdate] - callback hook to run before updating the user
- * @param {function} [options.beforeSendEmail] -  callback hook to run before sending the email
+ * @param {'reset' | 'invite' | 'companyInvite'} options.type - token type (default: 'reset')
+ * @param {string} options._id - user or company id
+ * @param {string} options.email - recipient email
+ * @param {string} options.firstName - recipient first name
+ * @param {function} [options.beforeUpdate] - runs before updating the model with the token, return null to skip update
+ * @param {function} [options.beforeSendEmail] - runs before sending the email, receives (options, token)
  * @returns {Promise<{token: string, mailgunPromise: Promise<unknown>}>}
  */
-export function sendToken({ type, user, beforeUpdate, beforeSendEmail }: {
-    type: "reset" | "invite";
-    user: {
-        _id: string;
-        email: string;
-        firstName: string;
-    };
+export function tokenSend({ type, _id, email, firstName, beforeUpdate, beforeSendEmail }: {
+    type: "reset" | "invite" | "companyInvite";
+    _id: string;
+    email: string;
+    firstName: string;
     beforeUpdate?: Function;
     beforeSendEmail?: Function;
 }): Promise<{
@@ -44,26 +55,17 @@ export const routes: {
     'post    /api/signin': (typeof signin)[];
     'post    /api/signup': (typeof signup)[];
     'post    /api/reset-instructions': (typeof resetInstructions)[];
-    'post    /api/reset-password': (typeof resetConfirm)[];
+    'post    /api/reset-confirm': (typeof resetConfirm)[];
     'post    /api/invite-instructions': (typeof inviteInstructions)[];
-    'post    /api/invite-accept': (typeof inviteConfirm)[];
+    'post    /api/invite-confirm': (typeof inviteConfirm)[];
     'delete  /api/account/:uid': (typeof remove)[];
     setup: typeof setup;
-    findUserFromProvider: typeof findUserFromProvider;
-    getStore: typeof getStore;
-    signinAndGetStore: typeof signinAndGetStore;
-    tokenCreate: typeof tokenCreate;
-    tokenParse: typeof tokenParse;
-    userCreate: typeof userCreate;
-    validatePassword: typeof validatePassword;
-    sendToken: typeof sendToken;
-    inviteOrResetConfirm: typeof inviteOrResetConfirm;
 };
 declare function store(req: any, res: any): Promise<void>;
 declare function signout(req: any, res: any): void;
 declare function signin(req: any, res: any): any;
 declare function signup(req: any, res: any): Promise<void>;
 declare function remove(req: any, res: any): Promise<void>;
-declare function setup(middleware: any, _config: any): void;
+declare function setup(middleware: any, _config: any, helpers?: {}): void;
 export {};
 //# sourceMappingURL=auth.api.d.ts.map

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,CAoCtE;AApbD;;;;;;;;;;;;;;;;;;;;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":"AAuKA,qEAeC;AAED,sEAsCC;AAED,gEAMC;AAED,iEAgBC;AAID,qGA8CC;AAED,4EAOC;AAED;;GAKC;AAID;;;;;;;;GAQG;AACH,8EANG;IAA0B,QAAQ,GAA1B,MAAM;IACY,SAAS,GAA3B,MAAM;IACY,OAAO,GAAzB,MAAM;CACd,kBAAQ,OAAO,GACL,OAAO,CAAC,MAAM,CAAC,CA0D3B;AAED,kFAiBC;AAED,mEAOC;AAED,+EAWC;AAED,6DAEC;AAED,kFAoBC;AAED,mEA4BC;AAED;;;;;;;;;;GAUG;AACH,0FARG;IAAsD,IAAI,EAAlD,OAAO,GAAG,QAAQ,GAAG,eAAe;IACpB,GAAG,EAAnB,MAAM;IACU,KAAK,EAArB,MAAM;IACU,SAAS,EAAzB,MAAM;IACa,YAAY;IACZ,eAAe;CAC1C,GAAU,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAC,CAAC,CAuCtE;AA9fD;;;;;;;;;;;EAaC;AAyED,0DAEC;AA6BD,mDAEC;AAnBD,iDAeC;AAzBD,2DAQC;AAuBD,2DAwBC;AAlID,0EAqEC"}