re-adding env var controls for cloud limit functionality

packages/server/src/middleware/usageQuota.js

@@ -1,6 +1,6 @@
 const CouchDB = require("../db")
 const usageQuota = require("../utilities/usageQuota")
-// const env = require("../environment")
+const env = require("../environment")
 
 // currently only counting new writes and deletes
 const METHOD_MAP = {
@@ -29,9 +29,9 @@ function getProperty(url) {
 
 module.exports = async (ctx, next) => {
   // if in development or a self hosted cloud usage quotas should not be executed
-  // if (env.isDev() || env.SELF_HOSTED) {
+  if (env.isDev() || env.SELF_HOSTED) {
-  //   return next()
+    return next()
-  // }
+  }
 
   const db = new CouchDB(ctx.appId)
   let usage = METHOD_MAP[ctx.req.method]

packages/server/src/utilities/usageQuota.js

@@ -1,4 +1,4 @@
-// const env = require("../environment")
+const env = require("../environment")
 const { getGlobalDB } = require("@budibase/auth/tenancy")
 
 function getNewQuotaReset() {
@@ -23,9 +23,10 @@ exports.Properties = {
  * also been reset after this call.
  */
 exports.update = async (property, usage) => {
-  // if (!env.USE_QUOTAS) {
+  if (!env.USE_QUOTAS) {
-  //   return
+    return
-  // }
+  }
+
   try {
     const db = getGlobalDB()
     const quota = await db.get("usage_quota")

packages/worker/src/api/controllers/global/users.js

@@ -17,7 +17,7 @@ const {
   tryAddTenant,
   updateTenantId,
 } = require("@budibase/auth/tenancy")
-// const env = require("../../../environment")
+const env = require("../../../environment")
 
 const PLATFORM_INFO_DB = StaticDatabases.PLATFORM_INFO.name
 
@@ -140,29 +140,29 @@ exports.adminUser = async ctx => {
   )
 
   // write usage quotas for cloud
-  // if (!env.SELF_HOSTED) {
+  if (!env.SELF_HOSTED) {
-  await db.post({
+    await db.post({
-    _id: "usage_quota",
+      _id: "usage_quota",
-    quotaReset: Date.now() + 2592000000,
+      quotaReset: Date.now() + 2592000000,
-    usageQuota: {
+      usageQuota: {
-      automationRuns: 0,
+        automationRuns: 0,
-      rows: 0,
+        rows: 0,
-      storage: 0,
+        storage: 0,
-      apps: 0,
+        apps: 0,
-      users: 0,
+        users: 0,
-      views: 0,
+        views: 0,
-      emails: 0,
+        emails: 0,
-    },
+      },
-    usageLimits: {
+      usageLimits: {
-      automationRuns: 1000,
+        automationRuns: 1000,
-      rows: 4000,
+        rows: 4000,
-      apps: 4,
+        apps: 4,
-      storage: 1000,
+        storage: 1000,
-      users: 10,
+        users: 10,
-      emails: 50,
+        emails: 50,
-    },
+      },
-  })
+    })
-  // }
+  }
 
   if (response.rows.some(row => row.doc.admin)) {
     ctx.throw(

packages/worker/src/utilities/email.js

@@ -112,8 +112,10 @@ async function getSmtpConfiguration(db, workspaceId = null) {
     params.workspace = workspaceId
   }
 
-  if (!env.SMTP_FALLBACK_ENABLED) {
+  const customConfig = getScopedConfig(db, params)
-    return getScopedConfig(db, params)
+
+  if (customConfig && !env.SMTP_FALLBACK_ENABLED) {
+    return customConfig
   } else {
     // Use an SMTP fallback configuration from env variables
     return {