nitro-web 0.0.187 → 0.0.188

package/components/auth/auth.api.js

@@ -12,7 +12,7 @@ import { isArray, pick, ucFirst, fullNameSplit } from 'nitro-web/util'
 
 const JWT_SECRET = process.env.JWT_SECRET || 'replace_this_with_secure_env_secret'
 let authConfig = null
-let auth = {
+export const auth = {
   userFindFromProvider, userSigninGetStore, getStore,
   userCreate, passwordValidate, tokenCreate, tokenParse, tokenSend,
   tokenConfirmForReset, tokenConfirmForSingleTenant, tokenConfirmForMultiTenant,
@@ -34,15 +34,14 @@ export const routes = {
 }
 
 function setup(middleware, _config, helpers = {}) {
-  // Tip: you can pass in your own helpers to override the default helpers, `this` context contains all helpers.
+  // Tip: you can pass in your own helpers to override the default helpers, internally all functions are called
+  // with `auth` as the context, so `this` context contains all helpers.
   // E.g. setup: (middleware, config, helpers) => authRoutes.setup(middleware, config, { getStore, ... })
   const configKeys = ['baseUrl', 'emailFrom', 'env', 'name', 'mailgunDomain', 'mailgunKey', 'masterPassword', 'isNotMultiTenant', 
     'confirmInvites']
   authConfig = pick(_config, configKeys)
-  auth = { ...auth, ...helpers }
-  // Bind all the functions to the auth object (so the can be individually overridden and reference other helpers)
-  for (const key of Object.keys(auth)) {
-    if (typeof auth[key] === 'function') auth[key] = auth[key].bind(auth)
+  for (const key of Object.keys(helpers)) {
+    auth[key] = helpers[key]
   }
   for (const key of ['baseUrl', 'emailFrom', 'env', 'name']) {
     if (!authConfig[key]) throw new Error(`Missing config value for: config.${key}`)
@@ -274,8 +273,12 @@ export async function userFindFromProvider(query, passwordToCheck) {
   }
   if (!user) {
     throw new Error(checkPassword ? 'Email or password is incorrect.' : 'Session-user is invalid.')
-  } else if (user.status && user.status !== 'active') {
-    throw new Error('This user account is not active.')
+  } else if (user.status?.match(/removed|deleted|unavailable/)) {
+    throw new Error('This user account is not available.')
+  } else if (user.status === 'terminated') {
+    throw new Error('This user account has been terminated.')
+  } else if (user.status === 'invited') {
+    throw new Error('This user account is not yet active.')
   } 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') {
@@ -303,7 +306,7 @@ export async function userSigninGetStore(user, isDesktop) {
   user.desktop = isDesktop
 
   const jwt = jsonwebtoken.sign({ _id: user._id }, JWT_SECRET, { expiresIn: '30d' })
-  const store = await this.getStore(user)
+  const store = await auth.getStore(user)
   return { ...store, jwt }
 }
 
@@ -349,7 +352,7 @@ export async function userCreate({ password, password2, company, ...userDataProp
     // First validate the data so we don't have to create a transaction
     const results = await Promise.allSettled([
       db.user.validate(userData, options),
-      typeof password === 'undefined' ? Promise.resolve() : this.passwordValidate(password, password2),
+      typeof password === 'undefined' ? Promise.resolve() : auth.passwordValidate(password, password2),
       ...(companyData ? [db.company.validate(companyData, options)] : []),
     ])
 
@@ -375,7 +378,7 @@ export async function userCreate({ password, password2, company, ...userDataProp
     }
 
     // Return the user
-    return await this.userFindFromProvider({ _id: userId })
+    return await auth.userFindFromProvider({ _id: userId })
 
   } catch (err) {
     if (!isArray(err)) throw err
@@ -425,21 +428,22 @@ export function tokenParse(token, modelName, maxAgeMs = 1000 * 60 * 60 * 24) {
 }
 
 export async function tokenConfirmForReset(req) {
-  return await this.tokenConfirmForSingleTenant(req, true)
+  return await auth.tokenConfirmForSingleTenant(req, true)
 }
 
 export async function tokenConfirmForSingleTenant(req, isReset) {
   const { token, password, password2, ...userData } = req.body
   const tokenName = isReset ? 'resetToken' : 'inviteToken'
   const desktop = req.query.desktop
-  const id = this.tokenParse(token, 'user')
-  await this.passwordValidate(password, password2)
+  const _id = db.id(auth.tokenParse(token, 'user'))
+  await auth.passwordValidate(password, password2)
 
-  const user = await db.user.findOne({ query: id, blacklist: ['-' + tokenName], _privateData: true })
-  if (!user || user[tokenName] !== token) throw new Error('Sorry your token is invalid or has already been used.')
+  // Find the inviteToken, but bypass hooks because inviteToken may = true in a potential afterFind hook.
+  const user1 = await db.user._findOne({ _id: _id}, { projection: { [tokenName]: 1 } })
+  if (!user1 || user1[tokenName] !== token) throw new Error('Sorry your token is invalid or has already been used.')
 
   await db.user.update({
-    query: user._id,
+    query: _id,
     data: {
       password: await bcrypt.hash(password, 10),
       [tokenName]: '', // remove token
@@ -447,16 +451,22 @@ export async function tokenConfirmForSingleTenant(req, isReset) {
     },
     blacklist: ['-' + tokenName, '-password'],
   })
-  return await this.userSigninGetStore({ ...user, [tokenName]: undefined }, desktop)
+
+  const user2 = await db.user.findOne({ query: _id })
+  return await auth.userSigninGetStore({ ...user2, [tokenName]: undefined }, desktop)
 }
 
 export async function tokenConfirmForMultiTenant(req) {
   const { token, ...userData } = req.body
   const desktop = req.query.desktop
-  const companyId = db.id(this.tokenParse(token, 'company'))
+  const companyId = db.id(auth.tokenParse(token, 'company'))
 
-  // Find the invite from the token (company.invites[] entry)
-  const company = await db.company.findOne({ query: { _id: companyId, 'invites.inviteToken': token }, _privateData: true })
+  // Find the invite from the token (company.invites[] entry), but bypass hooks because inviteToken may = true in 
+  // a potential afterFind hook.
+  const company = await db.company._findOne(
+    { _id: companyId, 'invites.inviteToken': token }, 
+    { projection: { 'invites.inviteToken': 1 } }
+  )
   if (!company) throw new Error('Sorry your token is invalid or has already been used.')
   const invite = company.invites.find(inv => inv.inviteToken === token)
 
@@ -467,7 +477,7 @@ export async function tokenConfirmForMultiTenant(req) {
   }
 
   // Find or create new user
-  const user = existingUser || await this.userCreate({ ...userData, company: companyId }, true) // AKA "active company"
+  const user = existingUser || await auth.userCreate({ ...userData, company: companyId }, true) // AKA "active company"
   
   // Add the user to the company
   await db.company.update({
@@ -477,7 +487,7 @@ export async function tokenConfirmForMultiTenant(req) {
   })
 
   // Signin
-  return await this.userSigninGetStore(user, desktop)
+  return await auth.userSigninGetStore(user, desktop)
 }
 
 /**
@@ -498,7 +508,7 @@ export async function tokenSend({ type = 'reset', _id, email, firstName, beforeU
 
   const tokenName = type === 'companyInvite' ? 'inviteToken' : type + 'Token'
   const modelName = type === 'companyInvite' ? 'company' : 'user'
-  const token = await this.tokenCreate(modelName, _id)
+  const token = await auth.tokenCreate(modelName, _id)
   const _beforeUpdate = beforeUpdate || (o => o)
 
   if (modelName === 'company') {

package/components/partials/element/topbar.tsx

@@ -6,7 +6,7 @@ type TopbarProps = {
 
 export function Topbar({ title, subtitle, className }: TopbarProps) {
   return (
-    <div class={`flex flex-col min-h-12 gap-0.5 mb-6 nitro-topbar ${className||''}`}>
+    <div class={`flex flex-col min-h-12---removed gap-0.5 mb-8 nitro-topbar ${className||''}`}>
       <div class="text-2xl font-bold">{title}</div>
       { subtitle && <div class="text-sm text-muted-foreground">{subtitle}</div>}
       {/* { submenu && <div class="pt-2 text-large weight-500">{submenu}</div> } */}

package/package.json

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

@@ -70,199 +70,199 @@ export const currencies = {
   zar: { name: 'South African Rand', symbol: 'R', digits: 2 },
 }
 
-/** @type {{ [key in Country]: { name: string } }} */
+/** @type {{ [key in Country]: { name: string, flag: 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' },
+  af: { name: 'Afghanistan', flag: '🇦🇫' },
+  al: { name: 'Albania', flag: '🇦🇱' },
+  dz: { name: 'Algeria', flag: '🇩🇿' },
+  ad: { name: 'Andorra', flag: '🇦🇩' },
+  ao: { name: 'Angola', flag: '🇦🇴' },
+  ag: { name: 'Antigua and Barbuda', flag: '🇦🇬' },
+  ar: { name: 'Argentina', flag: '🇦🇷' },
+  am: { name: 'Armenia', flag: '🇦🇲' },
+  au: { name: 'Australia', flag: '🇦🇺' },
+  at: { name: 'Austria', flag: '🇦🇹' },
+  az: { name: 'Azerbaijan', flag: '🇦🇿' },
+  bs: { name: 'Bahamas', flag: '🇧🇸' },
+  bh: { name: 'Bahrain', flag: '🇧🇭' },
+  bd: { name: 'Bangladesh', flag: '🇧🇩' },
+  bb: { name: 'Barbados', flag: '🇧🇧' },
+  by: { name: 'Belarus', flag: '🇧🇾' },
+  be: { name: 'Belgium', flag: '🇧🇪' },
+  bz: { name: 'Belize', flag: '🇧🇿' },
+  bj: { name: 'Benin', flag: '🇧🇯' },
+  bt: { name: 'Bhutan', flag: '🇧🇹' },
+  bo: { name: 'Bolivia', flag: '🇧🇴' },
+  ba: { name: 'Bosnia and Herzegovina', flag: '🇧🇦' },
+  bw: { name: 'Botswana', flag: '🇧🇼' },
+  br: { name: 'Brazil', flag: '🇧🇷' },
+  bn: { name: 'Brunei', flag: '🇧🇳' },
+  bg: { name: 'Bulgaria', flag: '🇧🇬' },
+  bf: { name: 'Burkina Faso', flag: '🇧🇫' },
+  bi: { name: 'Burundi', flag: '🇧🇮' },
+  cv: { name: 'Cabo Verde', flag: '🇨🇻' },
+  kh: { name: 'Cambodia', flag: '🇰🇭' },
+  cm: { name: 'Cameroon', flag: '🇨🇲' },
+  ca: { name: 'Canada', flag: '🇨🇦' },
+  cf: { name: 'Central African Republic', flag: '🇨🇫' },
+  td: { name: 'Chad', flag: '🇹🇩' },
+  cl: { name: 'Chile', flag: '🇨🇱' },
+  cn: { name: 'China', flag: '🇨🇳' },
+  co: { name: 'Colombia', flag: '🇨🇴' },
+  km: { name: 'Comoros', flag: '🇰🇲' },
+  cg: { name: 'Congo (Congo-Brazzaville)', flag: '🇨🇬' },
+  cr: { name: 'Costa Rica', flag: '🇨🇷' },
+  hr: { name: 'Croatia', flag: '🇭🇷' },
+  cu: { name: 'Cuba', flag: '🇨🇺' },
+  cy: { name: 'Cyprus', flag: '🇨🇾' },
+  cz: { name: 'Czechia', flag: '🇨🇿' },
+  cd: { name: 'Democratic Republic of the Congo', flag: '🇨🇩' },
+  dk: { name: 'Denmark', flag: '🇩🇰' },
+  dj: { name: 'Djibouti', flag: '🇩🇯' },
+  dm: { name: 'Dominica', flag: '🇩🇲' },
+  do: { name: 'Dominican Republic', flag: '🇩🇴' },
+  ec: { name: 'Ecuador', flag: '🇪🇨' },
+  eg: { name: 'Egypt', flag: '🇪🇬' },
+  sv: { name: 'El Salvador', flag: '🇸🇻' },
+  gq: { name: 'Equatorial Guinea', flag: '🇬🇶' },
+  er: { name: 'Eritrea', flag: '🇪🇷' },
+  ee: { name: 'Estonia', flag: '🇪🇪' },
+  sz: { name: 'Eswatini', flag: '🇸🇿' },
+  et: { name: 'Ethiopia', flag: '🇪🇹' },
+  fj: { name: 'Fiji', flag: '🇫🇯' },
+  fi: { name: 'Finland', flag: '🇫🇮' },
+  fr: { name: 'France', flag: '🇫🇷' },
+  ga: { name: 'Gabon', flag: '🇬🇦' },
+  gm: { name: 'Gambia', flag: '🇬🇲' },
+  ge: { name: 'Georgia', flag: '🇬🇪' },
+  de: { name: 'Germany', flag: '🇩🇪' },
+  gh: { name: 'Ghana', flag: '🇬🇭' },
+  gr: { name: 'Greece', flag: '🇬🇷' },
+  gd: { name: 'Grenada', flag: '🇬🇩' },
+  gt: { name: 'Guatemala', flag: '🇬🇹' },
+  gn: { name: 'Guinea', flag: '🇬🇳' },
+  gw: { name: 'Guinea-Bissau', flag: '🇬🇼' },
+  gy: { name: 'Guyana', flag: '🇬🇾' },
+  ht: { name: 'Haiti', flag: '🇭🇹' },
+  hn: { name: 'Honduras', flag: '🇭🇳' },
+  hu: { name: 'Hungary', flag: '🇭🇺' },
+  is: { name: 'Iceland', flag: '🇮🇸' },
+  in: { name: 'India', flag: '🇮🇳' },
+  id: { name: 'Indonesia', flag: '🇮🇩' },
+  ir: { name: 'Iran', flag: '🇮🇷' },
+  iq: { name: 'Iraq', flag: '🇮🇶' },
+  ie: { name: 'Ireland', flag: '🇮🇪' },
+  il: { name: 'Israel', flag: '🇮🇱' },
+  it: { name: 'Italy', flag: '🇮🇹' },
+  jm: { name: 'Jamaica', flag: '🇯🇲' },
+  jp: { name: 'Japan', flag: '🇯🇵' },
+  jo: { name: 'Jordan', flag: '🇯🇴' },
+  kz: { name: 'Kazakhstan', flag: '🇰🇿' },
+  ke: { name: 'Kenya', flag: '🇰🇪' },
+  ki: { name: 'Kiribati', flag: '🇰🇮' },
+  kw: { name: 'Kuwait', flag: '🇰🇼' },
+  kg: { name: 'Kyrgyzstan', flag: '🇰🇬' },
+  la: { name: 'Laos', flag: '🇱🇦' },
+  lv: { name: 'Latvia', flag: '🇱🇻' },
+  lb: { name: 'Lebanon', flag: '🇱🇧' },
+  ls: { name: 'Lesotho', flag: '🇱🇸' },
+  lr: { name: 'Liberia', flag: '🇱🇷' },
+  ly: { name: 'Libya', flag: '🇱🇾' },
+  li: { name: 'Liechtenstein', flag: '🇱🇮' },
+  lt: { name: 'Lithuania', flag: '🇱🇹' },
+  lu: { name: 'Luxembourg', flag: '🇱🇺' },
+  mg: { name: 'Madagascar', flag: '🇲🇬' },
+  mw: { name: 'Malawi', flag: '🇲🇼' },
+  my: { name: 'Malaysia', flag: '🇲🇾' },
+  mv: { name: 'Maldives', flag: '🇲🇻' },
+  ml: { name: 'Mali', flag: '🇲🇱' },
+  mt: { name: 'Malta', flag: '🇲🇹' },
+  mh: { name: 'Marshall Islands', flag: '🇲🇭' },
+  mr: { name: 'Mauritania', flag: '🇲🇷' },
+  mu: { name: 'Mauritius', flag: '🇲🇺' },
+  mx: { name: 'Mexico', flag: '🇲🇽' },
+  fm: { name: 'Micronesia', flag: '🇫🇲' },
+  md: { name: 'Moldova', flag: '🇲🇩' },
+  mc: { name: 'Monaco', flag: '🇲🇨' },
+  mn: { name: 'Mongolia', flag: '🇲🇳' },
+  me: { name: 'Montenegro', flag: '🇲🇪' },
+  ma: { name: 'Morocco', flag: '🇲🇦' },
+  mz: { name: 'Mozambique', flag: '🇲🇿' },
+  mm: { name: 'Myanmar', flag: '🇲🇲' },
+  na: { name: 'Namibia', flag: '🇳🇦' },
+  nr: { name: 'Nauru', flag: '🇳🇷' },
+  np: { name: 'Nepal', flag: '🇳🇵' },
+  nl: { name: 'Netherlands', flag: '🇳🇱' },
+  nz: { name: 'New Zealand', flag: '🇳🇿' },
+  ni: { name: 'Nicaragua', flag: '🇳🇮' },
+  ne: { name: 'Niger', flag: '🇳🇪' },
+  ng: { name: 'Nigeria', flag: '🇳🇬' },
+  kp: { name: 'North Korea', flag: '🇰🇵' },
+  mk: { name: 'North Macedonia', flag: '🇲🇰' },
+  no: { name: 'Norway', flag: '🇳🇴' },
+  om: { name: 'Oman', flag: '🇴🇲' },
+  pk: { name: 'Pakistan', flag: '🇵🇰' },
+  pw: { name: 'Palau', flag: '🇵🇼' },
+  pa: { name: 'Panama', flag: '🇵🇦' },
+  pg: { name: 'Papua New Guinea', flag: '🇵🇬' },
+  py: { name: 'Paraguay', flag: '🇵🇾' },
+  pe: { name: 'Peru', flag: '🇵🇪' },
+  ph: { name: 'Philippines', flag: '🇵🇭' },
+  pl: { name: 'Poland', flag: '🇵🇱' },
+  pt: { name: 'Portugal', flag: '🇵🇹' },
+  qa: { name: 'Qatar', flag: '🇶🇦' },
+  ro: { name: 'Romania', flag: '🇷🇴' },
+  ru: { name: 'Russia', flag: '🇷🇺' },
+  rw: { name: 'Rwanda', flag: '🇷🇼' },
+  kn: { name: 'Saint Kitts and Nevis', flag: '🇰🇳' },
+  lc: { name: 'Saint Lucia', flag: '🇱🇨' },
+  vc: { name: 'Saint Vincent and the Grenadines', flag: '🇻🇨' },
+  ws: { name: 'Samoa', flag: '🇼🇸' },
+  sm: { name: 'San Marino', flag: '🇸🇲' },
+  st: { name: 'Sao Tome and Principe', flag: '🇸🇹' },
+  sa: { name: 'Saudi Arabia', flag: '🇸🇦' },
+  sn: { name: 'Senegal', flag: '🇸🇳' },
+  rs: { name: 'Serbia', flag: '🇷🇸' },
+  sc: { name: 'Seychelles', flag: '🇸🇨' },
+  sl: { name: 'Sierra Leone', flag: '🇸🇱' },
+  sg: { name: 'Singapore', flag: '🇸🇬' },
+  sk: { name: 'Slovakia', flag: '🇸🇰' },
+  si: { name: 'Slovenia', flag: '🇸🇮' },
+  sb: { name: 'Solomon Islands', flag: '🇸🇧' },
+  so: { name: 'Somalia', flag: '🇸🇴' },
+  za: { name: 'South Africa', flag: '🇿🇦' },
+  kr: { name: 'South Korea', flag: '🇰🇷' },
+  ss: { name: 'South Sudan', flag: '🇸🇸' },
+  es: { name: 'Spain', flag: '🇪🇸' },
+  lk: { name: 'Sri Lanka', flag: '🇱🇰' },
+  sd: { name: 'Sudan', flag: '🇸🇩' },
+  sr: { name: 'Suriname', flag: '🇸🇷' },
+  se: { name: 'Sweden', flag: '🇸🇪' },
+  ch: { name: 'Switzerland', flag: '🇨🇭' },
+  sy: { name: 'Syria', flag: '🇸🇾' },
+  tj: { name: 'Tajikistan', flag: '🇹🇯' },
+  tz: { name: 'Tanzania', flag: '🇹🇿' },
+  th: { name: 'Thailand', flag: '🇹🇭' },
+  tl: { name: 'Timor-Leste', flag: '🇹🇱' },
+  tg: { name: 'Togo', flag: '🇹🇬' },
+  to: { name: 'Tonga', flag: '🇹🇴' },
+  tt: { name: 'Trinidad and Tobago', flag: '🇹🇹' },
+  tn: { name: 'Tunisia', flag: '🇹🇳' },
+  tr: { name: 'Turkey', flag: '🇹🇷' },
+  tm: { name: 'Turkmenistan', flag: '🇹🇲' },
+  tv: { name: 'Tuvalu', flag: '🇹🇻' },
+  ug: { name: 'Uganda', flag: '🇺🇬' },
+  ua: { name: 'Ukraine', flag: '🇺🇦' },
+  ae: { name: 'United Arab Emirates', flag: '🇦🇪' },
+  gb: { name: 'United Kingdom', flag: '🇬🇧' },
+  us: { name: 'United States', flag: '🇺🇸' },
+  uy: { name: 'Uruguay', flag: '🇺🇾' },
+  uz: { name: 'Uzbekistan', flag: '🇺🇿' },
+  vu: { name: 'Vanuatu', flag: '🇻🇺' },
+  va: { name: 'Vatican City', flag: '🇻🇦' },
+  ve: { name: 'Venezuela', flag: '🇻🇪' },
+  vn: { name: 'Vietnam', flag: '🇻🇳' },
+  ye: { name: 'Yemen', flag: '🇾🇪' },
+  zm: { name: 'Zambia', flag: '🇿🇲' },
+  zw: { name: 'Zimbabwe', flag: '🇿🇼' },
 }

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

@@ -3,7 +3,10 @@ export function inviteInstructions(req: any, res: any): Promise<void>;
 export function resetConfirm(req: any, res: any): Promise<void>;
 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 userSigninGetStore(user: any, isDesktop: any): Promise<{
+    jwt: string;
+    user: any;
+}>;
 export function getStore(user: any): Promise<{
     user: any;
 }>;
@@ -24,9 +27,18 @@ export function userCreate({ password, password2, company, ...userDataProp }: {
 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>;
+export function tokenConfirmForReset(req: any): Promise<{
+    jwt: string;
+    user: any;
+}>;
+export function tokenConfirmForSingleTenant(req: any, isReset: any): Promise<{
+    jwt: string;
+    user: any;
+}>;
+export function tokenConfirmForMultiTenant(req: any): Promise<{
+    jwt: string;
+    user: any;
+}>;
 /**
  * Creates and sends a reset or invite token to a user or company
  * @param {object} options
@@ -49,6 +61,19 @@ export function tokenSend({ type, _id, email, firstName, beforeUpdate, beforeSen
     token: string;
     mailgunPromise: Promise<unknown>;
 }>;
+export namespace auth {
+    export { userFindFromProvider };
+    export { userSigninGetStore };
+    export { getStore };
+    export { userCreate };
+    export { passwordValidate };
+    export { tokenCreate };
+    export { tokenParse };
+    export { tokenSend };
+    export { tokenConfirmForReset };
+    export { tokenConfirmForSingleTenant };
+    export { tokenConfirmForMultiTenant };
+}
 export const routes: {
     'get     /api/store': (typeof store)[];
     'get     /api/signout': (typeof signout)[];

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":"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"}
+{"version":3,"file":"auth.api.d.ts","sourceRoot":"","sources":["../../../components/auth/auth.api.js"],"names":[],"mappings":"AAsKA,qEAeC;AAED,sEAsCC;AAED,gEAMC;AAED,iEAgBC;AAID,qGAkDC;AAED;;;GAOC;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;;;GAEC;AAED;;;GAuBC;AAED;;;GAgCC;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;;;;;;;;;;;;;;AAxgBD;;;;;;;;;;;EAaC;AAwED,0DAEC;AA6BD,mDAEC;AAnBD,iDAeC;AAzBD,2DAQC;AAuBD,2DAwBC;AAjID,0EAoEC"}

package/types/server/constants.d.ts

@@ -17,9 +17,10 @@ export const currencies: { [key in Currency]: {
     symbol: string;
     digits: number;
 }; };
-/** @type {{ [key in Country]: { name: string } }} */
+/** @type {{ [key in Country]: { name: string, flag: string } }} */
 export const countries: { [key in Country]: {
     name: string;
+    flag: string;
 }; };
 export type Country = "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";
 export type Currency = "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";

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../server/constants.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AAEH,sFAAsF;AACtF,yBADW,GAAG,GAAG,IAAI,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAE,CAsDjF;AAED,qDAAqD;AACrD,wBADW,GAAG,GAAG,IAAI,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAE,CAmMhD;sBAxQY,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GACnI,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GACpI,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI;uBAChF,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAC7H,KAAQ,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAC1H,KAAQ,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../server/constants.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AAEH,sFAAsF;AACtF,yBADW,GAAG,GAAG,IAAI,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAE,CAsDjF;AAED,mEAAmE;AACnE,wBADW,GAAG,GAAG,IAAI,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAE,CAmM9D;sBAxQY,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GACnI,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GACpI,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAC/H,IAAO,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI,GAAC,IAAI;uBAChF,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAC7H,KAAQ,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAC1H,KAAQ,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK,GAAC,KAAK"}