@budibase/server 1.0.49-alpha.2 → 1.0.49-alpha.6

package/coverage/lcov-report/api/controllers/analytics.js.html

@@ -181,7 +181,7 @@ exports.endUserPing = <span class="fstat-no" title="function not covered" >as</s
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/apikeys.js.html

@@ -226,7 +226,7 @@ exports.update = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/application.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.51% </span>
+                <span class="strong">79.71% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>163/205</span>
+                <span class='fraction'>165/207</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.89% </span>
+                <span class="strong">80.09% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>159/199</span>
+                <span class='fraction'>161/201</span>
             </div>
         
             
@@ -499,8 +499,14 @@
 <a name='L440'></a><a href='#L440'>440</a>
 <a name='L441'></a><a href='#L441'>441</a>
 <a name='L442'></a><a href='#L442'>442</a>
-<a name='L443'></a><a href='#L443'>443</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">38x</span>
+<a name='L443'></a><a href='#L443'>443</a>
+<a name='L444'></a><a href='#L444'>444</a>
+<a name='L445'></a><a href='#L445'>445</a>
+<a name='L446'></a><a href='#L446'>446</a>
+<a name='L447'></a><a href='#L447'>447</a>
+<a name='L448'></a><a href='#L448'>448</a>
+<a name='L449'></a><a href='#L449'>449</a>
+<a name='L450'></a><a href='#L450'>450</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -547,11 +553,17 @@
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">205x</span>
+<span class="cline-any cline-yes">205x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -562,6 +574,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">205x</span>
+<span class="cline-any cline-yes">205x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -618,6 +631,7 @@
 <span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-yes">195x</span>
@@ -684,7 +698,6 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -872,6 +885,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -941,8 +955,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../db")
-const env = require("../../environment")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const env = require("../../environment")
 const packageJson = require("../../../package.json")
 const {
   createLinkView,
@@ -972,7 +985,7 @@ const { processObject } = require("@budibase/string-templates")
 const {
   getAllApps,
   isDevAppID,
-  getDeployedAppID,
+  getProdAppID,
   Replication,
 } = require("@budibase/backend-core/db")
 const { USERS_TABLE_SCHEMA } = require("../../constants")
@@ -988,11 +1001,17 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const { syncGlobalUsers } = require("./user")
 const { app: appCache } = require("@budibase/backend-core/cache")
 const { cleanupAutomations } = require("../../automations/utils")
+const {
+  getAppDB,
+  getProdAppDB,
+  updateAppId,
+} = require("@budibase/backend-core/context")
 &nbsp;
 const URL_REGEX_SLASH = /\/|\\/g
 &nbsp;
 // utility function, need to do away with this
-async function getLayouts(db) {
+async function getLayouts() {
+  const db = getAppDB()
   return (
     await db.allDocs(
       getLayoutParams(null, {
@@ -1002,7 +1021,8 @@ async function getLayouts(db) {
   ).rows.map(row =&gt; row.doc)
 }
 &nbsp;
-async function getScreens(db) {
+async function getScreens() {
+  const db = getAppDB()
   return (
     await db.allDocs(
       getScreenParams(null, {
@@ -1060,8 +1080,9 @@ async function createInstance(template) {
   const tenantId = isMultiTenant() ? <span class="branch-0 cbranch-no" title="branch not covered" >getTenantId() </span>: null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
+  updateAppId(appId)
 &nbsp;
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   await db.put({
     _id: "_design/database",
     // view collation information, read before writing any complex views:
@@ -1071,9 +1092,9 @@ async function createInstance(template) {
 &nbsp;
   // NOTE: indexes need to be created before any tables/templates
   // add view for linked rows
-  await createLinkView(appId)
-  await createRoutingView(appId)
-  await createAllSearchIndex(appId)
+  await createLinkView()
+  await createRoutingView()
+  await createAllSearchIndex()
 &nbsp;
   // replicate the template data to the instance DB
   // this is currently very hard to test, downloading and importing template files
@@ -1099,7 +1120,7 @@ async function createInstance(template) {
 exports.fetch = async ctx =&gt; {
   const dev = ctx.query &amp;&amp; ctx.query.status === AppStatus.DEV
   const all = ctx.query &amp;&amp; ctx.query.status === AppStatus.ALL
-  const apps = await getAllApps(CouchDB, { dev, all })
+  const apps = await getAllApps({ dev, all })
 &nbsp;
   // get the locks for all the dev apps
   if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
@@ -1122,12 +1143,11 @@ exports.fetch = async ctx =&gt; {
 }
 &nbsp;
 exports.fetchAppDefinition = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
-  const layouts = await getLayouts(db)
+  const layouts = await getLayouts()
   const userRoleId = getUserRoleId(ctx)
-  const accessController = new AccessController(ctx.params.appId)
+  const accessController = new AccessController()
   const screens = await accessController.checkScreensAccess(
-    await getScreens(db),
+    await getScreens(),
     userRoleId
   )
   ctx.body = {
@@ -1138,15 +1158,15 @@ exports.fetchAppDefinition = async ctx =&gt; {
 }
 &nbsp;
 exports.fetchAppPackage = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
-  const layouts = await getLayouts(db)
-  let screens = await getScreens(db)
+  const layouts = await getLayouts()
+  let screens = await getScreens()
 &nbsp;
   // Only filter screens if the user is not a builder
   if (!(ctx.user.builder &amp;&amp; ctx.user.builder.global)) {
     const userRoleId = getUserRoleId(ctx)
-    const accessController = new AccessController(ctx.params.appId)
+    const accessController = new AccessController()
     screens = await accessController.checkScreensAccess(screens, userRoleId)
   }
 &nbsp;
@@ -1159,7 +1179,7 @@ exports.fetchAppPackage = async ctx =&gt; {
 }
 &nbsp;
 exports.create = async ctx =&gt; {
-  const apps = await getAllApps(CouchDB, { dev: true })
+  const apps = await getAllApps({ dev: true })
   const name = ctx.request.body.name
   checkAppName(ctx, apps, name)
   const url = exports.getAppUrl(ctx)
@@ -1177,7 +1197,7 @@ exports.create = async ctx =&gt; {
   const instance = await createInstance(instanceConfig)
   const appId = instance._id
 &nbsp;
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   let _rev
   try {
     // if template there will be an existing doc
@@ -1223,7 +1243,7 @@ exports.create = async ctx =&gt; {
 // This endpoint currently operates as a PATCH rather than a PUT
 // Thus name and url fields are handled only if present
 exports.update = async ctx =&gt; {
-  const apps = await getAllApps(CouchDB, { dev: true })
+  const apps = await getAllApps({ dev: true })
   // validation
   const name = ctx.request.body.name
   if (name) {
@@ -1242,7 +1262,7 @@ exports.update = async ctx =&gt; {
 &nbsp;
 exports.updateClient = async ctx =&gt; {
   // Get current app version
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
   const currentVersion = application.version
 &nbsp;
@@ -1264,7 +1284,7 @@ exports.updateClient = async ctx =&gt; {
 &nbsp;
 exports.revertClient = async ctx =&gt; {
   // Check app can be reverted
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
   <span class="missing-if-branch" title="if path not taken" >I</span>if (!application.revertableVersion) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "There is no version to revert to")</span>
@@ -1286,7 +1306,7 @@ exports.revertClient = async ctx =&gt; {
 }
 &nbsp;
 exports.delete = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
 &nbsp;
   const result = await db.destroy()
   /* istanbul ignore next */
@@ -1311,10 +1331,11 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   }
 &nbsp;
   // replicate prod to dev
-  const prodAppId = <span class="cstat-no" title="statement not covered" >getDeployedAppID(appId)</span>
+  const prodAppId = <span class="cstat-no" title="statement not covered" >getProdAppID(appId)</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  try {</span>
-    const prodDb = <span class="cstat-no" title="statement not covered" >new CouchDB(prodAppId, { skip_setup: true })</span>
+    // specific case, want to make sure setup is skipped
+    const prodDb = <span class="cstat-no" title="statement not covered" >getProdAppDB({ skip_setup: true })</span>
     const info = <span class="cstat-no" title="statement not covered" >await prodDb.info()</span>
 <span class="cstat-no" title="statement not covered" >    if (info.error) <span class="cstat-no" title="statement not covered" >throw info.error</span></span>
   } catch (err) {
@@ -1342,7 +1363,7 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   }
 &nbsp;
   // sync the users
-<span class="cstat-no" title="statement not covered" >  await syncGlobalUsers(appId)</span>
+<span class="cstat-no" title="statement not covered" >  await syncGlobalUsers()</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  if (error) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, error)</span>
@@ -1354,7 +1375,7 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
 }
 &nbsp;
 const updateAppPackage = async (appPackage, appId) =&gt; {
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
 &nbsp;
   const newAppPackage = { ...application, ...appPackage }
@@ -1373,7 +1394,7 @@ const updateAppPackage = async (appPackage, appId) =&gt; {
 }
 &nbsp;
 const createEmptyAppPackage = async (ctx, app) =&gt; {
-  const db = new CouchDB(app.appId)
+  const db = getAppDB()
 &nbsp;
   let screensAndLayouts = []
   for (let layout of BASE_LAYOUTS) {
@@ -1390,7 +1411,7 @@ const createEmptyAppPackage = async (ctx, app) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/auth.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.75% </span>
+                <span class="strong">82.14% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>24/29</span>
+                <span class='fraction'>23/28</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.75% </span>
+                <span class="strong">82.14% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>24/29</span>
+                <span class='fraction'>23/28</span>
             </div>
         
             
@@ -115,8 +115,7 @@
 <a name='L56'></a><a href='#L56'>56</a>
 <a name='L57'></a><a href='#L57'>57</a>
 <a name='L58'></a><a href='#L58'>58</a>
-<a name='L59'></a><a href='#L59'>59</a>
-<a name='L60'></a><a href='#L60'>60</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
+<a name='L59'></a><a href='#L59'>59</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
@@ -124,7 +123,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -175,14 +173,13 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../db")
-const { outputProcessing } = require("../../utilities/rowProcessor")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { outputProcessing } = require("../../utilities/rowProcessor")
 const { InternalTables } = require("../../db/utils")
 const { getFullUser } = require("../../utilities/users")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
+const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 &nbsp;
 exports.fetchSelf = async ctx =&gt; {
-  const appId = ctx.appId
   let userId = ctx.user.userId || <span class="branch-1 cbranch-no" title="branch not covered" >ctx.user._id</span>
   /* istanbul ignore next */
   if (!userId) {
@@ -196,8 +193,8 @@ exports.fetchSelf = async ctx =&gt; {
   // forward the csrf token from the session
   user.csrfToken = ctx.user.csrfToken
 &nbsp;
-  if (appId) {
-    const db = new CouchDB(appId)
+  if (getAppId()) {
+    const db = getAppDB()
     // remove the full roles structure
     delete user.roles
     try {
@@ -206,7 +203,7 @@ exports.fetchSelf = async ctx =&gt; {
       // make sure there is never a stale csrf token
 <span class="cstat-no" title="statement not covered" >      delete metadata.csrfToken</span>
       // specifically needs to make sure is enriched
-<span class="cstat-no" title="statement not covered" >      ctx.body = await outputProcessing(ctx, userTable, {</span>
+<span class="cstat-no" title="statement not covered" >      ctx.body = await outputProcessing(userTable, {</span>
         ...user,
         ...metadata,
       })
@@ -241,7 +238,7 @@ exports.fetchSelf = async ctx =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>