nitro-web 0.1.4 → 0.2.0

package/components/auth/inviteConfirm.tsx

@@ -1,25 +1,29 @@
-import { Topbar, Field, FormError, Button, request, onChange, getResponseErrors, showError } from 'nitro-web'
-import { Errors } from 'nitro-web/types'
+import { Topbar, Field, FormError, Button, request, onChange, getResponseErrors, getSignoutStore, getInitialStore } from 'nitro-web'
+import { Config, Errors } from 'nitro-web/types'
+import { twMerge } from 'nitro-web/util'
 import { Fragment, useEffect } from 'react'
 
 type InviteConfirmProps = {
   className?: string,
   elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
+  config: Pick<Config, 'getSignoutStore'>
 }
 
-export function InviteConfirm({ className, elements, redirectTo }: InviteConfirmProps) {
+export function InviteConfirm({ className, elements, redirectTo, config }: InviteConfirmProps) {
   const navigate = useNavigate()
   const params = useParams()
-  const [store, setStore] = useTracked()
+  const [, setStore] = useTracked()
+  const getSignoutStoreFn = config.getSignoutStore || getSignoutStore
   const [isLoading, setIsLoading] = useState(false)
-  const [accepted, setAccepted] = useState(false)
+  const [isExistingUser, setIsExistingUser] = useState<boolean | 'pending'>('pending')
+  const [isAccepted, setIsAccepted] = useState(false)
   const [state, setState] = useState(() => ({
     firstName: '',
     lastName: '',
     password: '',
     password2: '',
-    token: params.token,
+    email: '',
     errors: [] as Errors,
   }))
 
@@ -28,45 +32,56 @@ export function InviteConfirm({ className, elements, redirectTo }: InviteConfirm
     Header: elements?.Header || null,
   }
 
-  // Auto-confirm on mount for already signed-in users
+  // Get invite details on mount
   useEffect(() => {
-    if (store.user) submit({ token: params.token })
+    preSubmit()
   }, [])
 
+  async function preSubmit() {
+    try {
+      const result = await request(`get /api/invite-pre-confirm/${params.token}`)
+      setIsExistingUser(result.isExistingUser)
+      setState((s) => ({ ...s, email: result.email }))
+      if (result.isExistingUser) submit({ token: params.token })
+    } catch (e) {
+      setState((s) => ({ ...s, errors: getResponseErrors(e) }))
+    }
+  }
+
   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)
+      const result = await request(`post /api/invite-confirm/${params.token}`, data, event, setIsLoading, setState)
+      // Only update the store if the user was created AND refreshly signed in
+      if (result?.jwt) setStore((s) => ({ ...getSignoutStoreFn(s, getInitialStore()), ...result }))
+      setIsAccepted(true)
       setTimeout(() => navigate(redirectTo || '/'), 5000)
     } catch (e) {
-      showError(setStore, e)
       setState((s) => ({ ...s, errors: getResponseErrors(e) }))
     }
   }
 
-  if (store.user) {
+  if (isExistingUser || isAccepted) {
     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 className={twMerge('min-h-[250px]', className)}>
+        {isAccepted ? (
+          <Fragment>
+            <div class="text-2xl font-bold mb-4">Your invite has been accepted.</div>
+            <p class="">You&apos;ll be redirected back to the <Link to="/">home page</Link> shortly...</p>
+          </Fragment>
+        ) : isExistingUser === 'pending' && !state.errors.length ? (
+          <Fragment>
+            <div class="text-2xl font-bold mb-4">One moment please...</div>
+            <p class="">Verifying your token.</p>
+          </Fragment>
+        ) : (
+          <Fragment>
+            <div class="text-2xl font-bold mb-4">Something went wrong.</div>
+            {state.errors.map((error, i) => {
+              return (<span key={i} class="text-red-500 bg-red-50 p-1 rounded-md">{error.detail} <br /></span>)
+            })}
+          </Fragment>
+        )}
       </div>
     )
   }
@@ -74,19 +89,25 @@ export function InviteConfirm({ className, elements, redirectTo }: InviteConfirm
   return (
     <div className={className}>
       {!!Elements.Header && Elements.Header}
-      <Topbar title={<Fragment>Accept Your Invite</Fragment>} />
+      <Topbar title={<Fragment>Accept Invitation</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..." />
+            <Field name="firstName" type="text" state={state} onChange={(e) => onChange(e, setState)} placeholder="Your first name..." 
+              autoComplete="given-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..." />
+            <Field name="lastName" type="text" state={state} onChange={(e) => onChange(e, setState)} placeholder="Your last name..." 
+              autoComplete="off" />
           </div>
         </div>
+        <div>
+          <label for="email">Email Address</label>
+          <Field name="email" type="email" state={state} placeholder="Your email address..." disabled={true} />
+        </div>
         <div>
           <label for="password">Choose a Password</label>
           <Field name="password" type="password" state={state} onChange={(e) => onChange(e, setState)} />
@@ -97,8 +118,7 @@ export function InviteConfirm({ className, elements, redirectTo }: InviteConfirm
         </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" />
+          <FormError state={state} className="pt-2" fields={['firstName', 'lastName', 'password', 'password2']} />
         </div>
 
         <Elements.Button class="w-full" isLoading={isLoading} type="submit">Accept Invite & Create Account</Elements.Button>

package/components/auth/reset.tsx

@@ -1,5 +1,5 @@
-import { Topbar, Field, FormError, Button, request, onChange } from 'nitro-web'
-import { Errors } from 'nitro-web/types'
+import { Topbar, Field, FormError, Button, request, onChange, getSignoutStore, getInitialStore } from 'nitro-web'
+import { Config, Errors } from 'nitro-web/types'
 import { Fragment } from 'react'
 
 type resetInstructionsProps = {
@@ -8,6 +8,10 @@ type resetInstructionsProps = {
   redirectTo?: string,
 }
 
+type resetPasswordProps = resetInstructionsProps & {
+  config: Pick<Config, 'getSignoutStore'>
+}
+
 export function ResetInstructions({ className, elements, redirectTo }: resetInstructionsProps) {
   const navigate = useNavigate()
   const [isLoading, setIsLoading] = useState(false)
@@ -52,9 +56,10 @@ export function ResetInstructions({ className, elements, redirectTo }: resetInst
   )
 }
 
-export function ResetPassword({ className, elements, redirectTo }: resetInstructionsProps) {
+export function ResetPassword({ className, elements, redirectTo, config }: resetPasswordProps) {
   const navigate = useNavigate()
   const params = useParams()
+  const getSignoutStoreFn = config.getSignoutStore || getSignoutStore
   const [isLoading, setIsLoading] = useState(false)
   const [, setStore] = useTracked()
   const [state, setState] = useState(() => ({
@@ -73,7 +78,7 @@ export function ResetPassword({ className, elements, redirectTo }: resetInstruct
     try {
       if (isLoading) return
       const data = await request('post /api/reset-password', state, event, setIsLoading, setState)
-      setStore((s) => ({ ...s, ...data }))
+      setStore((s) => ({ ...getSignoutStoreFn(s, getInitialStore()), ...data }))
       setTimeout(() => navigate(redirectTo || '/'), 10) // wait for setStore
     } catch (e) {
       return setState({ ...state, errors: e as Errors })

package/components/auth/signin.tsx

@@ -1,5 +1,8 @@
-import { Topbar, Field, Button, FormError, request, queryObject, injectedConfig, updateJwt, onChange } from 'nitro-web'
-import { Errors } from 'nitro-web/types'
+import { 
+  Topbar, Field, Button, FormError, request, queryObject, injectedConfig, updateJwt, onChange, 
+  getSignoutStore, getInitialStore,
+} from 'nitro-web'
+import { Config, Errors } from 'nitro-web/types'
 import { Fragment } from 'react'
 
 type signinProps = {
@@ -7,12 +10,14 @@ type signinProps = {
   elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
   hideSignup?: boolean,
+  config: Pick<Config, 'getSignoutStore'>
 }
 
-export function Signin({ className, elements, redirectTo, hideSignup }: signinProps) {
+export function Signin({ className, elements, redirectTo, hideSignup, config }: signinProps) {
   const navigate = useNavigate()
   const location = useLocation()
   const isSignout = location.pathname == '/signout'
+  const getSignoutStoreFn = config.getSignoutStore || getSignoutStore
   const [isLoading, setIsLoading] = useState(isSignout)
   const [, setStore] = useTracked()
   const [state, setState] = useState({
@@ -32,9 +37,11 @@ export function Signin({ className, elements, redirectTo, hideSignup }: signinPr
     if (query.email) setState({ ...state, email: query.email as string })
   }, [location.search])
 
+
   useEffect(() => {
     if (isSignout) {
-      setStore((s) => ({ ...s, user: undefined }))
+      // Reset the user to the initialStoreData user
+      setStore((s) => getSignoutStoreFn(s, getInitialStore()))
       // util.axios().get('/api/signout')
       Promise.resolve()
         .then(() => setIsLoading(false))
@@ -50,7 +57,7 @@ export function Signin({ className, elements, redirectTo, hideSignup }: signinPr
       const data = await request('post /api/signin', state, e, setIsLoading, setState)
       // Keep it loading until we navigate
       setIsLoading(true)
-      setStore((s) => ({ ...s, ...data }))
+      setStore((s) => ({ ...getSignoutStoreFn(s, getInitialStore()), ...data }))
       setTimeout(() => { // wait for setStore
         if (location.search.includes('redirect')) navigate(location.search.replace('?redirect=', ''))
         else navigate(redirectTo || '/')

package/components/auth/signup.tsx

@@ -1,17 +1,19 @@
-import { Button, Field, FormError, Topbar, request, injectedConfig, onChange } from 'nitro-web'
-import { Errors } from 'nitro-web/types'
+import { Button, Field, FormError, Topbar, request, injectedConfig, onChange, getSignoutStore, getInitialStore } from 'nitro-web'
+import { Config, Errors } from 'nitro-web/types'
 import { Fragment } from 'react'
 
 type signupProps = {
   className?: string,
   elements?: { Button?: typeof Button, Header?: React.ReactNode },
   redirectTo?: string,
+  config: Pick<Config, 'getSignoutStore'>
 }
 
-export function Signup({ className, elements, redirectTo }: signupProps) {
+export function Signup({ className, elements, redirectTo, config }: signupProps) {
   const navigate = useNavigate()
   const [isLoading, setIsLoading] = useState(false)
   const [, setStore] = useTracked()
+  const getSignoutStoreFn = config.getSignoutStore || getSignoutStore
   const [state, setState] = useState({
     email: injectedConfig.env === 'development' ? (injectedConfig.placeholderEmail || '') : '',
     name: injectedConfig.env === 'development' ? 'Bruce Wayne' : '',
@@ -29,7 +31,7 @@ export function Signup({ className, elements, redirectTo }: signupProps) {
     try {
       if (isLoading) return
       const data = await request('post /api/signup', state, e, setIsLoading, setState)
-      setStore((prev) => ({ ...prev, ...data }))
+      setStore((s) => ({ ...getSignoutStoreFn(s, getInitialStore()), ...data }))
       setTimeout(() => navigate(redirectTo || '/'), 10) // wait for setStore
     } catch (e) {
       setState((prev) => ({ ...prev, errors: e as Errors }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "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

@@ -13,6 +13,10 @@ let templates = {}
 let nodemailerMailgun = undefined
 const _dirname = dirname(fileURLToPath(import.meta.url)) + '/'
 
+export const requiredEmailConfigKeys = ['baseUrl', 'emailFrom', 'name', 'env']
+export const optionalEmailConfigKeys = ['emailReplyTo', 'emailTestMode', 'mailgunDomain', 'mailgunKey']
+
+
 /**
  * Sends an email using a predefined template, with optional data/or recipientVariables
  * @typedef {{ baseUrl?: string, emailFrom?: string, mailgunDomain?: string, mailgunKey?: string, name?: string }} Config
@@ -44,24 +48,19 @@ export async function sendEmail({
   skipCssInline,
   test,  
 }) {
-  if (!config) {
-    throw new Error('sendEmail: `config` missing')
-  } else if (!config.baseUrl) {
-    throw new Error('sendEmail: `config.baseUrl` is missing')
-  } else if (!config.emailFrom) {
-    throw new Error('sendEmail: `config.emailFrom` is missing')
-  } else if (!test && (!config.mailgunKey || !config.mailgunDomain)) {
-    throw new Error('sendEmail: `config.mailgunKey` or `config.mailgunDomain` is missing')
-  } else if (!config.name) {
-    throw new Error('sendEmail: `config.name` is missing')
-  } else if (!template) {
-    throw new Error('sendEmail: `template` missing')
-  } else if (!to) {
-    throw new Error('sendEmail: `to` missing')
+  const isTest = config.emailTestMode || test
+  if (!config) throw new Error('sendEmail: `config` missing')
+  for (const key of requiredEmailConfigKeys) {
+    if (!config[key]) throw new Error(`sendEmail: config.${key} is missing`)
+  }
+  if (!isTest && (!config.mailgunKey || !config.mailgunDomain)) {
+    throw new Error('sendEmail: config.mailgunKey and config.mailgunDomain are required')
   }
+  if (!template) throw new Error('sendEmail: `template` missing')
+  if (!to) throw new Error('sendEmail: `to` missing')
 
   // Setup nodemailer once
-  if (!nodemailerMailgun && !test) {
+  if (!nodemailerMailgun && !isTest) {
     nodemailerMailgun = nodemailer.createTransport(
       mailgun({ auth: { api_key: config.mailgunKey, domain: config.mailgunDomain }})
     )
@@ -95,13 +94,13 @@ export async function sendEmail({
     bcc: bcc,
     emailTemplateDir: getDirectories(path, config.pwd).emailTemplateDir,
     from: from,
-    isDev: config.baseUrl.match(/:/), // possibly use config.env here
+    isDev: config.env === 'development',
     recipientVariables: recipientVariables,
     replyTo: replyTo,
     skipCssInline: skipCssInline,
     subject: subject,
     template: template,
-    test: config.emailTestMode || test,
+    test: isTest,
     to: to,
     url: config.baseUrl,
   }
@@ -187,24 +186,27 @@ function processTemplate(settings, html) {
 async function sendWithMailgun(settings, html) {
   // Supports batch sending via recipientVariables, limit 1000 emails
   // https://documentation.mailgun.com/en/latest/user_manual.html?highlight=batch%20sending#batch-sending
-  let processedhtml = await processTemplate(settings, html)
-  // console.log(settings)
+  const processedhtml = await processTemplate(settings, html)
+  const mailgunOpts = {
+    ...(settings.bcc && !settings.isDev? { bcc: settings.bcc } : {}),
+    from: settings.from,
+    html: processedhtml,
+    'h:Reply-To': settings.replyTo,
+    subject: settings.subject,
+    to: settings.to,
+    ...(!settings.recipientVariables? {} : {
+      'recipient-variables': typeof settings.recipientVariables == 'string'
+        ? settings.recipientVariables
+        : JSON.stringify(settings.recipientVariables),
+    }),
+  }
+  if (settings.test && settings.isDev) {
+    console.info('Test mode: sendEmail mailgunOpts', { ...mailgunOpts, html: null, 'recipient-variables': settings.recipientVariables })
+  }
   if (settings.test) return processedhtml
 
   return new Promise((resolve, reject) => {
-    nodemailerMailgun.sendMail({
-      ...(settings.bcc && !settings.isDev? { bcc: settings.bcc } : {}),
-      from: settings.from,
-      html: processedhtml,
-      'h:Reply-To': settings.replyTo,
-      subject: settings.subject,
-      to: settings.to,
-      ...(!settings.recipientVariables? {} : {
-        'recipient-variables': typeof settings.recipientVariables == 'string'
-          ? settings.recipientVariables
-          : JSON.stringify(settings.recipientVariables),
-      }),
-    }, function(err, info) {
+    nodemailerMailgun.sendMail(mailgunOpts, function(err, info) {
       if (err) {
         console.error('SendEmail mailgun error')
         reject(err)

package/server/index.js

@@ -24,7 +24,7 @@ export { userModel, companyModel, setupDefaultModels }
 export { setupRouter, middleware, isValidUserOrRespond, isAdminUser } from './router.js'
 
 // Export email utility
-export { sendEmail } from './email/index.js'
+export { sendEmail, requiredEmailConfigKeys, optionalEmailConfigKeys } from './email/index.js'
 
 // Export API controllers
 export * from '../components/auth/auth.api.js'

package/server/models/company.js

@@ -21,6 +21,7 @@ export default {
     }],
     invites: [{
       email: { type: 'email', required: true },
+      firstName: { type: 'string', required: true },
       role: { type: 'string', enum: ['owner', 'manager'], required: true },
       inviteToken: { type: 'string', required: true },
     }],
@@ -57,8 +58,8 @@ export default {
     publicData: function(models) {
       return models
     },
-    loginPopulate: function() {
-      // return the company with expanded company.users
+    authPopulate: function() {
+      // Special method called by auth.api.js on authentication.
       return [
         {
           as: 'usersExpanded',

package/server/models/user.js

@@ -48,7 +48,8 @@ export default {
   ],
 
   methods: {
-    loginPopulate: function() {
+    authPopulate: function() {
+      // Special method called by auth.api.js on authentication.
       return []
     },
   },

package/server/router.js

@@ -387,7 +387,7 @@ export const middleware = {
     else next()
   },
   isUser: (req, res, next) => {
-    if (!isValidUserOrRespond(req, res)) return
+    if (!isValidUserOrRespond(req, res)) return 
     else next()
   },
   isParamUser: (req, res, next) => {
@@ -401,11 +401,11 @@ export const middleware = {
     else next()
   },
   isCompanyUser: (req, res, next) => {
-    if (!isValidParamCompanyUserOrRespond(req)) return
+    if (!isValidParamCompanyUserOrRespond(req, res)) return
     else next()
   },
   isCompanyOwner: (req, res, next) => {
-    if (!isValidParamCompanyUserOrRespond(req, true)) return
+    if (!isValidParamCompanyUserOrRespond(req, res, true)) return
     else next()
   },
 }
@@ -433,7 +433,8 @@ function isValidParamCompanyUserOrRespond(req, res, checkIsOwner = 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.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.')
+  else if (!isAdminUser(req) && configLocal.isNotMultiTenant) res.unauthorized('Only admins can make this request.')
+  else if (!isAdminUser(req) && !company) res.unauthorized('Only company users can make this request.')
+  else if (!isAdminUser(req) && checkIsOwner && !isCompanyOwner) res.unauthorized('Only company owners can make this request.')
   else return true
 }

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

@@ -1,7 +1,11 @@
 export function resetInstructions(req: any, res: any): Promise<void>;
-export function inviteInstructions(req: any, res: any): Promise<void>;
+export function inviteInstructions(req: any, res: any): Promise<any>;
+export function resendInstructions(req: any, res: any): Promise<any>;
 export function resetConfirm(req: any, res: any): Promise<void>;
 export function inviteConfirm(req: any, res: any): Promise<void>;
+export function invitePreConfirm(req: any, res: any): Promise<void>;
+export function updateMemberRole(req: any, res: any): Promise<void>;
+export function removeMember(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<{
     jwt: string;
@@ -24,10 +28,11 @@ export function userCreate({ password, password2, company, ...userDataProp }: {
     password?: string;
     password2?: string;
     company?: string;
-}, baseUrl?: string, skipSendEmail?: boolean): Promise<object>;
+}, baseUrl?: string, invite: any, 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 addUserToCompany(companyId: any, userId: any, role: any, token: any, justValidate: any): Promise<any>;
 export function tokenConfirmForReset(req: any): Promise<{
     jwt: string;
     user: any;
@@ -39,24 +44,36 @@ export function tokenConfirmForSingleTenant(req: any, isReset: any): Promise<{
 export function tokenConfirmForMultiTenant(req: any): Promise<{
     jwt: string;
     user: any;
+} | {
+    isExistingUser: boolean;
+    email: any;
+} | {
+    isExistingUser?: undefined;
+    email?: undefined;
 }>;
 /**
  * Creates and sends a reset or invite token to a user or company
  * @param {object} options
- * @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 {'reset' | 'invite' | 'companyInvite'} options.type - token type
+ * @param {string} options.id - user or company id
+ * @param {{
+ *   email: string,
+ *   firstName: string,
+ *   [key: string]: any, // other fields to include in the invite row
+ * }} options.payload
  * @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)
  * @param {string} [options.baseUrl] - baseUrl to use for the email
  * @returns {Promise<{token: string, mailgunPromise: Promise<unknown>}>}
  */
-export function tokenSend({ type, _id, email, firstName, beforeUpdate, beforeSendEmail, baseUrl }: {
+export function tokenSend({ type, id, payload, beforeUpdate, beforeSendEmail, baseUrl, isResend }: {
     type: "reset" | "invite" | "companyInvite";
-    _id: string;
-    email: string;
-    firstName: string;
+    id: string;
+    payload: {
+        email: string;
+        firstName: string;
+        [key: string]: any;
+    };
     beforeUpdate?: Function;
     beforeSendEmail?: Function;
     baseUrl?: string;
@@ -64,11 +81,14 @@ export function tokenSend({ type, _id, email, firstName, beforeUpdate, beforeSen
     token: string;
     mailgunPromise: Promise<unknown>;
 }>;
+export function getBaseUrl(req: any): any;
 export function resolveBaseUrl(reqUrl: any, cfgUrl: any): any;
+export function ensureNotLastOwner(companyUsers: any, idNowNonOwner: any): void;
 export namespace auth {
     export { userFindFromProvider };
     export { userSigninGetStore };
     export { getStore };
+    export { addUserToCompany };
     export { userCreate };
     export { passwordValidate };
     export { tokenCreate };
@@ -77,6 +97,11 @@ export namespace auth {
     export { tokenConfirmForReset };
     export { tokenConfirmForSingleTenant };
     export { tokenConfirmForMultiTenant };
+    export { getBaseUrl };
+    export { invitePreConfirm };
+    export { inviteConfirm };
+    export { updateMemberRole };
+    export { removeMember };
 }
 export const routes: {
     'get     /api/store': (typeof store)[];
@@ -86,8 +111,12 @@ export const routes: {
     'post    /api/reset-instructions': (typeof resetInstructions)[];
     'post    /api/reset-confirm': (typeof resetConfirm)[];
     'post    /api/invite-instructions': (typeof inviteInstructions)[];
-    'post    /api/invite-confirm': (typeof inviteConfirm)[];
+    'post    /api/resend-instructions': (typeof resendInstructions)[];
+    'get     /api/invite-pre-confirm/:token': (typeof invitePreConfirm)[];
+    'post    /api/invite-confirm/:token': (typeof inviteConfirm)[];
     'delete  /api/account/:uid': (typeof remove)[];
+    'put     /api/company/:cid/member-role/:uidOrEmail': (string | typeof updateMemberRole)[];
+    'delete  /api/company/:cid/member/:uidOrEmail': (string | typeof removeMember)[];
     setup: typeof setup;
 };
 declare function store(req: any, res: any): Promise<void>;

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":"AA2KA,qEAeC;AAED,sEAuCC;AAED,gEAMC;AAED,iEAgBC;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,kBACN,OAAO,GACL,OAAO,CAAC,MAAM,CAAC,CA0D3B;AAED,kFAiBC;AAED,mEAOC;AAED,+EAWC;AAED;;;GAEC;AAED;;;GAuBC;AAED;;;GAgCC;AAED;;;;;;;;;;;GAWG;AACH,mGATG;IAAsD,IAAI,EAAlD,OAAO,GAAG,QAAQ,GAAG,eAAe;IACpB,GAAG,EAAnB,MAAM;IACU,KAAK,EAArB,MAAM;IACU,SAAS,EAAzB,MAAM;IACa,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,CAuCtE;AAMD,8DAmBC;;;;;;;;;;;;;;AAviBD;;;;;;;;;;;EAaC;AAwED,0DAEC;AAgCD,mDAEC;AAtBD,iDAkBC;AA5BD,2DAQC;AA0BD,2DAwBC;AApID,0EAoEC"}
+{"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"}

package/types/server/email/index.d.ts

@@ -29,6 +29,8 @@ export function sendEmail({ template, to, config, bcc, data, from, replyTo, reci
     skipCssInline?: boolean;
     test?: boolean;
 }): Promise<[any, any]>;
+export const requiredEmailConfigKeys: string[];
+export const optionalEmailConfigKeys: string[];
 /**
  * Sends an email using a predefined template, with optional data/or recipientVariables
  */

package/types/server/email/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/email/index.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;GAiBG;AACH,iIAbG;IAAqB,QAAQ,EAArB,MAAM;IACO,EAAE,EAAf,MAAM;IACO,MAAM,EAAnB,MAAM;IACQ,GAAG,GAAjB,MAAM;IACQ,IAAI,GAAlB,MAAM;IACQ,IAAI,GAAlB,MAAM;IACQ,OAAO,GAArB,MAAM;IACQ,kBAAkB,GAAhC,MAAM;IACQ,OAAO,GAArB,MAAM;IACS,aAAa,GAA5B,OAAO;IACQ,IAAI,GAAnB,OAAO;CACf,GAAU,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAiF/B;;;;qBA/FY;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/email/index.js"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;GAiBG;AACH,iIAbG;IAAqB,QAAQ,EAArB,MAAM;IACO,EAAE,EAAf,MAAM;IACO,MAAM,EAAnB,MAAM;IACQ,GAAG,GAAjB,MAAM;IACQ,IAAI,GAAlB,MAAM;IACQ,IAAI,GAAlB,MAAM;IACQ,OAAO,GAArB,MAAM;IACQ,kBAAkB,GAAhC,MAAM;IACQ,OAAO,GAArB,MAAM;IACS,aAAa,GAA5B,OAAO;IACQ,IAAI,GAAnB,OAAO;CACf,GAAU,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CA4E/B;AAhGD,+CAA8E;AAC9E,+CAAuG;;;;qBAK1F;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE"}

package/types/server/index.d.ts

@@ -2,7 +2,6 @@ export * from "../util.js";
 export * from "../components/auth/auth.api.js";
 export * from "../components/billing/stripe.api.js";
 export * as util from "../util.js";
-export { sendEmail } from "./email/index.js";
 export { routes as authRoutes } from "../components/auth/auth.api.js";
 export { routes as stripeRoutes } from "../components/billing/stripe.api.js";
 /**
@@ -23,4 +22,5 @@ export function setupDefaultModels(db: any): Promise<void>;
 export { userModel, companyModel };
 export { currencies, countries } from "./constants.js";
 export { setupRouter, middleware, isValidUserOrRespond, isAdminUser } from "./router.js";
+export { sendEmail, requiredEmailConfigKeys, optionalEmailConfigKeys } from "./email/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.js"],"names":[],"mappings":";;;;;;;;;;+BAOa,OAAO,aAAa,EAAE,gBAAgB;;;;sBACtC,OAAO,gBAAgB,EAAE,OAAO;;;;uBAChC,OAAO,gBAAgB,EAAE,QAAQ;sBAIxB,kBAAkB;yBACf,qBAAqB;AAC9C,2DAIC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.js"],"names":[],"mappings":";;;;;;;;;+BAOa,OAAO,aAAa,EAAE,gBAAgB;;;;sBACtC,OAAO,gBAAgB,EAAE,OAAO;;;;uBAChC,OAAO,gBAAgB,EAAE,QAAQ;sBAIxB,kBAAkB;yBACf,qBAAqB;AAC9C,2DAIC"}

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

@@ -112,6 +112,10 @@ declare namespace _default {
                 type: string;
                 required: boolean;
             };
+            firstName: {
+                type: string;
+                required: boolean;
+            };
             role: {
                 type: string;
                 enum: string[];
@@ -128,7 +132,7 @@ declare namespace _default {
     let afterFind: ((data: any) => Promise<void>)[];
     namespace methods {
         function publicData(models: any): any;
-        function loginPopulate(): {
+        function authPopulate(): {
             as: string;
             from: string;
             let: {