nitro-web 0.0.28 → 0.0.30

package/components/auth/signin.tsx

@@ -7,6 +7,7 @@ export function Signin() {
   const isSignout = location.pathname == '/signout'
   const isLoading = useState(isSignout)
   const [, setStore] = useTracked()
+  
   const [state, setState] = useState({
     email: injectedConfig.env == 'development' ? (injectedConfig.placeholderEmail || '') : '',
     password: injectedConfig.env == 'development' ? '1234' : '',
@@ -21,7 +22,7 @@ export function Signin() {
 
   useEffect(() => {
     if (isSignout) {
-      setStore(() => ({ user: null }))
+      setStore((s) => ({ ...s, user: undefined }))
       // util.axios().get('/api/signout')
       Promise.resolve()
         .then(() => isLoading[1](false))
@@ -35,7 +36,7 @@ export function Signin() {
     try {
       const data = await util.request('post /api/signin', state, e, isLoading)
       isLoading[1](true)
-      setStore(() => data)
+      setStore((s) => ({ ...s, ...data }))
       setTimeout(() => { // wait for setStore
         if (location.search.includes('redirect')) navigate(location.search.replace('?redirect=', ''))
         else navigate('/')

package/components/auth/signup.tsx

@@ -17,7 +17,7 @@ export function Signup() {
     try {
       const data = await util.request('post /api/signup', state, e, isLoading)
       isLoading[1](true)
-      setStore(() => data)
+      setStore((s) => ({ ...s, ...data }))
       setTimeout(() => navigate('/'), 0) // wait for setStore
     } catch (e) {
       return setState({ ...state, errors: e as Errors })
@@ -35,8 +35,8 @@ export function Signup() {
             <Field name="name" placeholder="E.g. Bruce Wayne" state={state} onChange={onChange.bind(setState)} />
           </div>
           <div>
-            <label for="business.name">Company Name</label>
-            <Field name="business.name" placeholder="E.g. Wayne Enterprises" state={state} onChange={onChange.bind(setState)} />
+            <label for="businessName">Company Name</label>
+            <Field name="businessName" placeholder="E.g. Wayne Enterprises" state={state} onChange={onChange.bind(setState)} />
           </div>
         </div>
         <div>

package/components/billing/stripe.api.js

@@ -13,256 +13,258 @@ export default {
     'post   /api/stripe/create-billing-portal-session': ['isUser', 'billingPortalSessionCreate'],
     'get    /api/stripe/upcoming-invoices': ['isUser', 'upcomingInvoicesFind'],
   },
+  setup: setup,
+  stripeWebhook: stripeWebhook,
+  billingPortalSessionCreate: billingPortalSessionCreate,
+  upcomingInvoicesFind: upcomingInvoicesFind,
+}
 
-  setup: function (middleware, _config) {
-    // Set config values
-    config = {
-      env: _config.env,
-      clientUrl: _config.clientUrl,
-      stripeSecretKey: _config.stripeSecretKey,
-      stripeWebhookSecret: _config.stripeWebhookSecret,
-    }
-    for (let key in config) {
-      if (!config[key]) {
-        throw new Error(`Missing config value for stripe.api.js: ${key}`)
-      }
-    }
-    stripe = new Stripe(config.stripeSecretKey)
-  },
-
-  stripeWebhook: async function (req, res) {
-    try {
-      var event = config.env == 'development' ? req.body : stripe.webhooks.constructEvent(
-        req.rawBody,
-        req.rawHeaders['stripe-signature'],
-        config.stripeWebhookSecret
-      )
-    } catch (err) {
-      if (err && err.message) console.log(err.message)
-      else console.log(err)
-      return res.error(err)
+function setup(middleware, _config) {
+  // Set config values
+  config = {
+    env: _config.env,
+    clientUrl: _config.clientUrl,
+    stripeSecretKey: _config.stripeSecretKey,
+    stripeWebhookSecret: _config.stripeWebhookSecret,
+  }
+  for (let key in config) {
+    if (!config[key]) {
+      throw new Error(`Missing config value for stripe.api.js: ${key}`)
     }
+  }
+  stripe = new Stripe(config.stripeSecretKey)
+}
 
-    if (!event.data || !event.data.object) {
-      return res.status(400).send(`Missing webhook data: ${event}.`)
-    }
+async function stripeWebhook(req, res) {
+  try {
+    var event = config.env == 'development' ? req.body : stripe.webhooks.constructEvent(
+      req.rawBody,
+      req.rawHeaders['stripe-signature'],
+      config.stripeWebhookSecret
+    )
+  } catch (err) {
+    if (err && err.message) console.log(err.message)
+    else console.log(err)
+    return res.error(err)
+  }
 
-    // useful for cleaning failed webhooks
-    if (req.query.success) return true
-    // console.log('event.type: ', event.type)
+  if (!event.data || !event.data.object) {
+    return res.status(400).send(`Missing webhook data: ${event}.`)
+  }
 
-    // Stripe cannot guarantee event order
-    switch (event.type) {
-      case 'customer.subscription.created':
-      case 'customer.subscription.updated':
-      case 'customer.subscription.deleted':
-        // Subscriptions can be renewed which resurrects cancelled subscriptions.. ignore this
-        console.log('Event: ' + event.type)
-        this._webhookSubUpdated(req, res, event)
-        break
-      case 'customer.created': // customer created by subscribing
-      case 'customer.updated': // payment method changes
-        console.log('Event: ' + event.type)
-        this._webhookCustomerCreatedUpdated(req, res, event)
-        break
-      default:
-        res.status(400).send(`Unsupported type: ${event}.`)
-        break
-    }
-  },
+  // useful for cleaning failed webhooks
+  if (req.query.success) return true
+  // console.log('event.type: ', event.type)
 
-  billingPortalSessionCreate: async function (req, res) {
-    try {
-      if (!req.user.stripeCustomer?.id) {
-        throw new Error('No stripe customer found for the user')
-      }
-      const session = await stripe.billingPortal.sessions.create({
-        customer: req.user.stripeCustomer.id,
-        return_url: config.clientUrl + '/subscriptions',
-      })
-      res.json(session.url)
-    } catch (err) {
-      this._error(req, res, err)
-    }
-  },
+  // Stripe cannot guarantee event order
+  switch (event.type) {
+    case 'customer.subscription.created':
+    case 'customer.subscription.updated':
+    case 'customer.subscription.deleted':
+      // Subscriptions can be renewed which resurrects cancelled subscriptions.. ignore this
+      console.log('Event: ' + event.type)
+      webhookSubUpdated(req, res, event)
+      break
+    case 'customer.created': // customer created by subscribing
+    case 'customer.updated': // payment method changes
+      console.log('Event: ' + event.type)
+      webhookCustomerCreatedUpdated(req, res, event)
+      break
+    default:
+      res.status(400).send(`Unsupported type: ${event}.`)
+      break
+  }
+}
 
-  upcomingInvoicesFind: async function (req, res) {
-    try {
-      if (!req.user.stripeCustomer?.id) return res.json({})
-      const nextInvoice = await stripe.invoices.retrieveUpcoming({
-        customer: req.user.stripeCustomer.id,
-      })
-      res.json(nextInvoice)
-    } catch (err) {
-      if (err.code == 'invoice_upcoming_none') return res.json({})
-      this._error(req, res, err)
+async function billingPortalSessionCreate(req, res) {
+  try {
+    if (!req.user.stripeCustomer?.id) {
+      throw new Error('No stripe customer found for the user')
     }
-  },
-
-  /* Private webhook actions */
+    const session = await stripe.billingPortal.sessions.create({
+      customer: req.user.stripeCustomer.id,
+      return_url: config.clientUrl + '/subscriptions',
+    })
+    res.json(session.url)
+  } catch (err) {
+    error(req, res, err)
+  }
+}
 
-  _webhookCustomerCreatedUpdated: async function (req, res, event) {
-    try {
-      const customer = event.data.object
-      const user = await this._getUserFromEvent(event)
-      const customerExpanded = await stripe.customers.retrieve(
-        customer.id,
-        { expand: ['invoice_settings.default_payment_method'] }
-      )
-      await db.user.update({
-        query: user._id,
-        data: { stripeCustomer: customerExpanded },
-        blacklist: ['-stripeCustomer'],
-      })
-      res.json({})
-    } catch (err) {
-      console.log(err)
-      this._error(req, res, err)
-    }
-  },
+async function upcomingInvoicesFind(req, res) {
+  try {
+    if (!req.user.stripeCustomer?.id) return res.json({})
+    const nextInvoice = await stripe.invoices.retrieveUpcoming({
+      customer: req.user.stripeCustomer.id,
+    })
+    res.json(nextInvoice)
+  } catch (err) {
+    if (err.code == 'invoice_upcoming_none') return res.json({})
+    error(req, res, err)
+  }
+}
 
-  _webhookSubUpdated: async function (req, res, event) {
-    // Update the subscription on the company
-    try {
-      const subData = event.data.object
-       // webhook from deleting a company?
-      if (subData.cancellation_details.comment == 'company deleted') {
-        return res.json({})
-      }
+/* Private webhook actions */
 
-      const user = await this._getUserFromEvent(event)
-      if (!user.company) {
-        throw new Error(`Subscription user has no company to update the subscription (${subData.id}) onto`)
-      }
+async function webhookCustomerCreatedUpdated(req, res, event) {
+  try {
+    const customer = event.data.object
+    const user = await getUserFromEvent(event)
+    const customerExpanded = await stripe.customers.retrieve(
+      customer.id,
+      { expand: ['invoice_settings.default_payment_method'] }
+    )
+    await db.user.update({
+      query: user._id,
+      data: { stripeCustomer: customerExpanded },
+      blacklist: ['-stripeCustomer'],
+    })
+    res.json({})
+  } catch (err) {
+    console.log(err)
+    error(req, res, err)
+  }
+}
 
-      // Ignoring incomplete subscriptions
-      if (subData.status.match(/incomplete/)) {
-        return res.json({})
-      // Ignoring subscriptions without companyId (e.g. manual subscriptions)
-      } else if (!subData.metadata.companyId) {
-        return res.json({ ignoringManualSubscriptions: true })
-      // Ignoring old subscriptions
-      } else if (subData.created < (user.company.stripeSubscription?.created || 0)) {
-        return res.json({ ignoringOldSubscriptions: true })
-      }
-      
-      // Update company with the updated subscription and users
-      const sub = await stripe.subscriptions.retrieve(
-        subData.id,
-        { expand: ['latest_invoice.payment_intent'] }
-      )
-      await db.company.update({
-        query: user.company._id,
-        data: { stripeSubscription: sub, users: user.company.users },
-        blacklist: ['-stripeSubscription', '-users'],
-      })
-      
-      res.json({})
-    } catch (err) {
-      console.error(err)
-      this._error(req, res, err)
+async function webhookSubUpdated(req, res, event) {
+  // Update the subscription on the company
+  try {
+    const subData = event.data.object
+      // webhook from deleting a company?
+    if (subData.cancellation_details.comment == 'company deleted') {
+      return res.json({})
     }
-  },
-
-  /* Private */
 
-  _getUserFromEvent: async function (event) {
-    // User retreived from the event's customer. 
-    // The customer is created before the paymentIntent and subscriptionIntent is set up
-    let object = event.data.object
-    let customerId = object.object == 'customer'? object.id : object.customer
-    if (customerId) {
-      var user = await db.user.findOne({
-        query: { 'stripeCustomer.id': customerId },
-        populate: db.user.populate({}),
-        blacklist: false, // ['-company.users.inviteToken'],
-      })
+    const user = await getUserFromEvent(event)
+    if (!user.company) {
+      throw new Error(`Subscription user has no company to update the subscription (${subData.id}) onto`)
     }
-    if (!user) {
-      await db.log.insert({ data: {
-        date: Date.now(),
-        event: event.type,
-        message: `Cannot find user with id: ${customerId}.`,
-      }})
-      throw new Error(`Cannot find user with id: ${customerId}.`)
-    }
-    // populate company owner with user data (handy for _addSubscriptionBillingChange)
-    if (user.company?.users) {
-      user.company.users = user.company.users.map(o => {
-        if (o.role == 'owner' && o._id.toString() == user._id.toString()) {
-          o.firstName = user.firstName
-          o.name = user.name
-          o.email = user.email
-        }
-        return o
-      })
+
+    // Ignoring incomplete subscriptions
+    if (subData.status.match(/incomplete/)) {
+      return res.json({})
+    // Ignoring subscriptions without companyId (e.g. manual subscriptions)
+    } else if (!subData.metadata.companyId) {
+      return res.json({ ignoringManualSubscriptions: true })
+    // Ignoring old subscriptions
+    } else if (subData.created < (user.company.stripeSubscription?.created || 0)) {
+      return res.json({ ignoringOldSubscriptions: true })
     }
-    return user
-  },
+    
+    // Update company with the updated subscription and users
+    const sub = await stripe.subscriptions.retrieve(
+      subData.id,
+      { expand: ['latest_invoice.payment_intent'] }
+    )
+    await db.company.update({
+      query: user.company._id,
+      data: { stripeSubscription: sub, users: user.company.users },
+      blacklist: ['-stripeSubscription', '-users'],
+    })
+    
+    res.json({})
+  } catch (err) {
+    console.error(err)
+    error(req, res, err)
+  }
+}
 
-  _getProducts: async function () {
-    /**
-     * Returns all products and caches it on the app
-     * @returns {Array} products
-     */
-    try {
-      if (stripeProducts) return stripeProducts
-      if (!config.stripeSecretKey) {
-        stripeProducts = []
-        throw new Error('Missing process.env.stripeSecretKey for retrieving products')
+async function getUserFromEvent(event) {
+  // User retreived from the event's customer. 
+  // The customer is created before the paymentIntent and subscriptionIntent is set up
+  let object = event.data.object
+  let customerId = object.object == 'customer'? object.id : object.customer
+  if (customerId) {
+    var user = await db.user.findOne({
+      query: { 'stripeCustomer.id': customerId },
+      populate: db.user.populate({}),
+      blacklist: false, // ['-company.users.inviteToken'],
+    })
+  }
+  if (!user) {
+    await db.log.insert({ data: {
+      date: Date.now(),
+      event: event.type,
+      message: `Cannot find user with id: ${customerId}.`,
+    }})
+    throw new Error(`Cannot find user with id: ${customerId}.`)
+  }
+  // populate company owner with user data (handy for _addSubscriptionBillingChange)
+  if (user.company?.users) {
+    user.company.users = user.company.users.map(o => {
+      if (o.role == 'owner' && o._id.toString() == user._id.toString()) {
+        o.firstName = user.firstName
+        o.name = user.name
+        o.email = user.email
       }
+      return o
+    })
+  }
+  return user
+}
 
-      let products = (await stripe.products.list({ limit: 100, active: true })).data
-      let prices = (await stripe.prices.list({ limit: 100, active: true, expand: ['data.tiers'] })).data
-
-      return (stripeProducts = products.map((product) => ({
-        // remove default_price when new pricing is ready
-        ...util.pick(product, ['id', 'created', 'default_price', 'description', 'name', 'metadata']),
-        type: product.name.match(/housing/i) ? 'project' : 'subscription', // overwriting, was 'service'
-        prices: prices
-          .filter((price) => price.product == product.id)
-          .map((price) => ({
-            ...util.pick(price, ['id', 'product', 'nickname', 'recurring', 'unit_amount', 'tiers', 'tiers_mode']),
-            interval: price.recurring?.interval, // 'year', 'month', undefined
-          })),
-      })))
-    } catch (err) {
-      console.error(new Error(err)) // when stripe throws errors, the callstack is missing.
-      return []
+export async function getProducts() {
+  /**
+   * Returns all products and caches it on the app
+   * @returns {Array} products
+   */
+  try {
+    if (stripeProducts) return stripeProducts
+    if (!config.stripeSecretKey) {
+      stripeProducts = []
+      throw new Error('Missing process.env.stripeSecretKey for retrieving products')
     }
-  },
 
-  _createOrUpdateCustomer: async function (user, paymentMethod=null) {
-    /**
-     * Creates or updates a stripe customer and saves it to the user
-     * @param {Object} user - user
-     * @param {String} paymentMethod - stripe payment method id to save to the customer
-     * @called before paymentIntent and subscriptionIntent, and after completion with paymentMethod
-     * @returns mutates user
-     */
-    const data = {
-      email: user.email,
-      name: user.name,
-      address: { country: 'NZ' },
-      ...(!paymentMethod ? {} : { invoice_settings: { default_payment_method: paymentMethod }}),
-      expand: ['invoice_settings.default_payment_method', 'tax'], // expands card object
-    }
-    
-    if (user.stripeCustomer) var customer = await stripe.customers.update(user.stripeCustomer.id, data)
-    else customer = await stripe.customers.create({ ...data })
+    let products = (await stripe.products.list({ limit: 100, active: true })).data
+    let prices = (await stripe.prices.list({ limit: 100, active: true, expand: ['data.tiers'] })).data
 
-    user.stripeCustomer = customer
-    await db.user.update({
-      query: user._id,
-      data: { stripeCustomer: customer },
-      blacklist: ['-stripeCustomer'],
-    })
-  },
+    return (stripeProducts = products.map((product) => ({
+      // remove default_price when new pricing is ready
+      ...util.pick(product, ['id', 'created', 'default_price', 'description', 'name', 'metadata']),
+      type: product.name.match(/housing/i) ? 'project' : 'subscription', // overwriting, was 'service'
+      prices: prices
+        .filter((price) => price.product == product.id)
+        .map((price) => ({
+          ...util.pick(price, ['id', 'product', 'nickname', 'recurring', 'unit_amount', 'tiers', 'tiers_mode']),
+          interval: price.recurring?.interval, // 'year', 'month', undefined
+        })),
+    })))
+  } catch (err) {
+    console.error(new Error(err)) // when stripe throws errors, the callstack is missing.
+    return []
+  }
+}
 
-  _error: async function (req, res, err) {
-    if (err && err.response && err.response.body) console.log(err.response.body)
-    if (util.isString(err) && err.match(/Cannot find company with id/)) {
-      res.json({ user: 'no company found' })
-    } else res.error(err)
-  },
+// async function createOrUpdateCustomer(user, paymentMethod=null) {
+//   /**
+//    * Creates or updates a stripe customer and saves it to the user
+//    * @param {Object} user - user
+//    * @param {String} paymentMethod - stripe payment method id to save to the customer
+//    * @called before paymentIntent and subscriptionIntent, and after completion with paymentMethod
+//    * @returns mutates user
+//    */
+//   const data = {
+//     email: user.email,
+//     name: user.name,
+//     address: { country: 'NZ' },
+//     ...(!paymentMethod ? {} : { invoice_settings: { default_payment_method: paymentMethod }}),
+//     expand: ['invoice_settings.default_payment_method', 'tax'], // expands card object
+//   }
+  
+//   if (user.stripeCustomer) var customer = await stripe.customers.update(user.stripeCustomer.id, data)
+//   else customer = await stripe.customers.create({ ...data })
+
+//   user.stripeCustomer = customer
+//   await db.user.update({
+//     query: user._id,
+//     data: { stripeCustomer: customer },
+//     blacklist: ['-stripeCustomer'],
+//   })
+// }
+
+async function error(req, res, err) {
+  if (err && err.response && err.response.body) console.log(err.response.body)
+  if (util.isString(err) && err.match(/Cannot find company with id/)) {
+    res.json({ user: 'no company found' })
+  } else res.error(err)
 }

package/components/partials/element/message.tsx

@@ -74,7 +74,7 @@ export function Message() {
 
   function hide() {
     setVisible(false)
-    setTimeout(() => setStore(s => ({ ...s, message: null })), 250)
+    setTimeout(() => setStore(s => ({ ...s, message: undefined })), 250)
   }
 
   return (

package/components/settings/settings.api.js

@@ -2,54 +2,54 @@
 import db from 'monastery'
 
 export default {
-
   routes: {
     'put  /api/company/:cid': ['isCompanyUser', 'update'],
     'put  /api/user/:uid': ['isUser', 'updateUser'],
   },
+  update: update,
+  updateUser: updateUser,
+}
 
-  update: async function(req, res) {
-    try {
-      const update = await db.company.update({
-        query: req.params.cid,
-        data: req.body,
-        files: req.query.files ? req.files : undefined,
-      })
-      if (!update) {
-        throw new Error('Coudln\'t find the company to update')
-      }
-      const company = await db.company.findOne({
-        query: req.params.cid,
-        populate: db.company.loginPopulate(),
-        _privateData: true,
-      })
-      res.json(company)
-
-    } catch (errs) {
-      res.error(errs)
+async function update(req, res) {
+  try {
+    const update = await db.company.update({
+      query: req.params.cid,
+      data: req.body,
+      files: req.query.files ? req.files : undefined,
+    })
+    if (!update) {
+      throw new Error('Coudln\'t find the company to update')
     }
-  },
+    const company = await db.company.findOne({
+      query: req.params.cid,
+      populate: db.company.loginPopulate(),
+      _privateData: true,
+    })
+    res.json(company)
 
-  updateUser: async function(req, res) {
-    try {
-      const update = await db.user.update({
-        query: req.params.uid,
-        data: req.body,
-        files: req.query.files ? req.files : undefined,
-      })
-      if (!update) {
-        throw new Error('Coudln\'t find the user to update')
-      }
-      const user = await db.user.findOne({
-        query: req.params.uid,
-        _privateData: true,
-        blacklist: ['company'], // don't return the company id
-      })
-      res.json(user)
+  } catch (errs) {
+    res.error(errs)
+  }
+}
 
-    } catch (errs) {
-      res.error(errs)
+async function updateUser(req, res) {
+  try {
+    const update = await db.user.update({
+      query: req.params.uid,
+      data: req.body,
+      files: req.query.files ? req.files : undefined,
+    })
+    if (!update) {
+      throw new Error('Coudln\'t find the user to update')
     }
-  },
+    const user = await db.user.findOne({
+      query: req.params.uid,
+      _privateData: true,
+      blacklist: ['company'], // don't return the company id
+    })
+    res.json(user)
 
+  } catch (errs) {
+    res.error(errs)
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",

package/server/index.js

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