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

package/coverage/lcov-report/threads/automation.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.21% </span>
+                <span class="strong">84.41% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>64/76</span>
+                <span class='fraction'>65/77</span>
             </div>
         
             
@@ -37,16 +37,16 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">90% </span>
+                <span class="strong">90.9% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>9/10</span>
+                <span class='fraction'>10/11</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.21% </span>
+                <span class="strong">84.41% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>64/76</span>
+                <span class='fraction'>65/77</span>
             </div>
         
             
@@ -203,7 +203,9 @@
 <a name='L144'></a><a href='#L144'>144</a>
 <a name='L145'></a><a href='#L145'>145</a>
 <a name='L146'></a><a href='#L146'>146</a>
-<a name='L147'></a><a href='#L147'>147</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
@@ -265,7 +267,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
@@ -337,6 +338,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</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>
@@ -349,6 +352,7 @@
 <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>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">require("./utils").threadSetup()
 const env = require("../environment")
 const actions = require("../automations/actions")
@@ -356,11 +360,11 @@ const automationUtils = require("../automations/automationUtils")
 const AutomationEmitter = require("../events/AutomationEmitter")
 const { processObject } = require("@budibase/string-templates")
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants")
-const CouchDB = require("../db")
 const { DocumentTypes, isDevAppID } = require("../db/utils")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
 const usage = require("../utilities/usageQuota")
 const { definitions: triggerDefs } = require("../automations/triggerInfo")
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId
 const CRON_STEP_ID = triggerDefs.CRON.stepId
@@ -410,11 +414,10 @@ class Orchestrator {
   }
 &nbsp;
   async getApp() {
-    const appId = this._appId
     <span class="missing-if-branch" title="if path not taken" >I</span>if (this._app) {
 <span class="cstat-no" title="statement not covered" >      return this._app</span>
     }
-    const db = new CouchDB(appId)
+    const db = getAppDB()
     this._app = await db.get(DocumentTypes.APP_METADATA)
     return this._app
   }
@@ -482,18 +485,21 @@ class Orchestrator {
 }
 &nbsp;
 module.exports = (input, callback) =&gt; {
-  const automationOrchestrator = new Orchestrator(
-    input.data.automation,
-    input.data.event
-  )
-  automationOrchestrator
-    .execute()
-    .then(response =&gt; {
-      callback(null, response)
-    })
-    .catch(<span class="fstat-no" title="function not covered" >er</span>r =&gt; {
-<span class="cstat-no" title="statement not covered" >      callback(err)</span>
-    })
+  const appId = input.data.event.appId
+  doInAppContext(appId, () =&gt; {
+    const automationOrchestrator = new Orchestrator(
+      input.data.automation,
+      input.data.event
+    )
+    automationOrchestrator
+      .execute()
+      .then(response =&gt; {
+        callback(null, response)
+      })
+      .catch(<span class="fstat-no" title="function not covered" >er</span>r =&gt; {
+<span class="cstat-no" title="statement not covered" >        callback(err)</span>
+      })
+  })
 }
 &nbsp;</pre></td></tr></table></pre>
 
@@ -502,7 +508,7 @@ module.exports = (input, callback) =&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/threads/index.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.29% </span>
+                <span class="strong">84.35% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>220/261</span>
+                <span class='fraction'>221/262</span>
             </div>
         
             
@@ -37,16 +37,16 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.89% </span>
+                <span class="strong">92.3% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>34/37</span>
+                <span class='fraction'>36/39</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.76% </span>
+                <span class="strong">84.82% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>217/256</span>
+                <span class='fraction'>218/257</span>
             </div>
         
             
@@ -74,17 +74,17 @@
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="automation.js"><a href="automation.js.html">automation.js</a></td>
-	<td data-value="84.21" class="pic high">
+	<td data-value="84.41" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 84%"></div><div class="cover-empty" style="width: 16%"></div></div>
 	</td>
-	<td data-value="84.21" class="pct high">84.21%</td>
-	<td data-value="76" class="abs high">64/76</td>
+	<td data-value="84.41" class="pct high">84.41%</td>
+	<td data-value="77" class="abs high">65/77</td>
 	<td data-value="56.52" class="pct medium">56.52%</td>
 	<td data-value="23" class="abs medium">13/23</td>
-	<td data-value="90" class="pct high">90%</td>
-	<td data-value="10" class="abs high">9/10</td>
-	<td data-value="84.21" class="pct high">84.21%</td>
-	<td data-value="76" class="abs high">64/76</td>
+	<td data-value="90.9" class="pct high">90.9%</td>
+	<td data-value="11" class="abs high">10/11</td>
+	<td data-value="84.41" class="pct high">84.41%</td>
+	<td data-value="77" class="abs high">65/77</td>
 	</tr>
 
 <tr>
@@ -111,8 +111,8 @@
 	<td data-value="118" class="abs high">102/118</td>
 	<td data-value="68.33" class="pct medium">68.33%</td>
 	<td data-value="60" class="abs medium">41/60</td>
-	<td data-value="92.3" class="pct high">92.3%</td>
-	<td data-value="13" class="abs high">12/13</td>
+	<td data-value="92.85" class="pct high">92.85%</td>
+	<td data-value="14" class="abs high">13/14</td>
 	<td data-value="86.84" class="pct high">86.84%</td>
 	<td data-value="114" class="abs high">99/114</td>
 	</tr>
@@ -140,7 +140,7 @@
             <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/threads/index.js.html

@@ -262,7 +262,7 @@ module.exports.ThreadType = ThreadType
             <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/threads/query.js.html

@@ -37,9 +37,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.3% </span>
+                <span class="strong">92.85% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>12/13</span>
+                <span class='fraction'>13/14</span>
             </div>
         
             
@@ -312,7 +312,6 @@
 <span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">15x</span>
-<span class="cline-any cline-yes">15x</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>
@@ -413,7 +412,6 @@
 <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">6x</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
@@ -518,6 +516,7 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -525,19 +524,19 @@
 <span class="cline-any cline-yes">2x</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></td><td class="text"><pre class="prettyprint lang-js">const threadUtils = require("./utils")
 threadUtils.threadSetup()
 const ScriptRunner = require("../utilities/scriptRunner")
 const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
-const CouchDB = require("../db")
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/)
 const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/)
 &nbsp;
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
-    this.appId = input.appId
     this.datasource = input.datasource
     this.queryVerb = input.queryVerb
     this.fields = input.fields
@@ -631,12 +630,11 @@ class QueryRunner {
   }
 &nbsp;
   async runAnotherQuery(queryId, parameters) {
-    const db = new CouchDB(this.appId)
+    const db = getAppDB()
     const query = await db.get(queryId)
     const datasource = await db.get(query.datasourceId)
     return new QueryRunner(
       {
-        appId: this.appId,
         datasource,
         queryVerb: query.queryVerb,
         fields: query.fields,
@@ -750,14 +748,16 @@ class QueryRunner {
 }
 &nbsp;
 module.exports = (input, callback) =&gt; {
-  const Runner = new QueryRunner(input)
-  Runner.execute()
-    .then(response =&gt; {
-      callback(null, response)
-    })
-    .catch(err =&gt; {
-      callback(err)
-    })
+  doInAppContext(input.appId, () =&gt; {
+    const Runner = new QueryRunner(input)
+    Runner.execute()
+      .then(response =&gt; {
+        callback(null, response)
+      })
+      .catch(err =&gt; {
+        callback(err)
+      })
+  })
 }
 &nbsp;</pre></td></tr></table></pre>
 
@@ -766,7 +766,7 @@ module.exports = (input, callback) =&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/threads/utils.js.html

@@ -298,7 +298,7 @@ exports.hasExtraData = response => {
             <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/utilities/bcrypt.js.html

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <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/utilities/budibaseDir.js.html

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <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/utilities/centralPath.js.html

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <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/utilities/csvParser.js.html

@@ -496,7 +496,7 @@ module.exports = {
             <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/utilities/global.js.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">81.03% </span>
+                <span class="strong">83.6% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>47/58</span>
+                <span class='fraction'>51/61</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">68% </span>
+                <span class="strong">78.57% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>17/25</span>
+                <span class='fraction'>22/28</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.14% </span>
+                <span class="strong">84.74% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>46/56</span>
+                <span class='fraction'>50/59</span>
             </div>
         
             
@@ -161,7 +161,10 @@
 <a name='L102'></a><a href='#L102'>102</a>
 <a name='L103'></a><a href='#L103'>103</a>
 <a name='L104'></a><a href='#L104'>104</a>
-<a name='L105'></a><a href='#L105'>105</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L105'></a><a href='#L105'>105</a>
+<a name='L106'></a><a href='#L106'>106</a>
+<a name='L107'></a><a href='#L107'>107</a>
+<a name='L108'></a><a href='#L108'>108</a></td><td class="line-coverage quiet"><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">44x</span>
@@ -174,42 +177,44 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-yes">146x</span>
+<span class="cline-any cline-yes">173x</span>
+<span class="cline-any cline-yes">173x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
+<span class="cline-any cline-yes">170x</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>
 <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-yes">143x</span>
+<span class="cline-any cline-yes">170x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
+<span class="cline-any cline-yes">170x</span>
 <span class="cline-any cline-yes">138x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">32x</span>
+<span class="cline-any cline-yes">27x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
-<span class="cline-any cline-yes">143x</span>
+<span class="cline-any cline-yes">170x</span>
+<span class="cline-any cline-yes">170x</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">139x</span>
-<span class="cline-any cline-yes">139x</span>
+<span class="cline-any cline-yes">166x</span>
+<span class="cline-any cline-yes">166x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">139x</span>
+<span class="cline-any cline-yes">166x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">137x</span>
-<span class="cline-any cline-yes">137x</span>
+<span class="cline-any cline-yes">164x</span>
+<span class="cline-any cline-yes">164x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
@@ -224,6 +229,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-yes">32x</span>
+<span class="cline-any cline-yes">32x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">32x</span>
 <span class="cline-any cline-yes">30x</span>
@@ -270,7 +276,7 @@
   getGlobalIDFromUserMetadataID,
 } = require("../db/utils")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { getDeployedAppID } = require("@budibase/backend-core/db")
+const { getProdAppID } = require("@budibase/backend-core/db")
 const { getGlobalUserParams } = require("@budibase/backend-core/db")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const {
@@ -278,8 +284,10 @@ const {
   isUserInAppTenant,
 } = require("@budibase/backend-core/tenancy")
 const env = require("../environment")
+const { getAppId } = require("@budibase/backend-core/context")
 &nbsp;
-exports.updateAppRole = (appId, user) =&gt; {
+exports.updateAppRole = (user, { appId } = {}) =&gt; {
+  appId = appId || getAppId()
   if (!user || !user.roles) {
     return user
   }
@@ -291,29 +299,29 @@ exports.updateAppRole = (appId, user) =&gt; {
 <span class="cstat-no" title="statement not covered" >    return user</span>
   }
   // always use the deployed app
-  user.roleId = user.roles[getDeployedAppID(appId)]
+  user.roleId = user.roles[getProdAppID(appId)]
   // if a role wasn't found then either set as admin (builder) or public (everyone else)
   if (!user.roleId &amp;&amp; user.builder &amp;&amp; user.builder.global) {
     user.roleId = BUILTIN_ROLE_IDS.ADMIN
-  } else <span class="missing-if-branch" title="if path not taken" >I</span>if (!user.roleId) {
-<span class="cstat-no" title="statement not covered" >    user.roleId = BUILTIN_ROLE_IDS.PUBLIC</span>
+  } else if (!user.roleId) {
+    user.roleId = BUILTIN_ROLE_IDS.PUBLIC
   }
   delete user.roles
   return user
 }
 &nbsp;
-function processUser(appId, user) {
+function processUser(user, { appId } = {}) {
   if (user) {
     delete user.password
   }
-  return exports.updateAppRole(appId, user)
+  return exports.updateAppRole(user, { appId })
 }
 &nbsp;
 exports.getCachedSelf = async (ctx, appId) =&gt; {
   // this has to be tenant aware, can't depend on the context to find it out
   // running some middlewares before the tenancy causes context to break
   const user = await userCache.getUser(ctx.user._id)
-  return processUser(appId, user)
+  return processUser(user, { appId })
 }
 &nbsp;
 exports.getRawGlobalUser = async userId =&gt; {
@@ -321,12 +329,13 @@ exports.getRawGlobalUser = async userId =&gt; {
   return db.get(getGlobalIDFromUserMetadataID(userId))
 }
 &nbsp;
-exports.getGlobalUser = async (appId, userId) =&gt; {
+exports.getGlobalUser = async userId =&gt; {
   let user = await exports.getRawGlobalUser(userId)
-  return processUser(appId, user)
+  return processUser(user)
 }
 &nbsp;
-exports.getGlobalUsers = async (appId = <span class="branch-0 cbranch-no" title="branch not covered" >null,</span> users = null) =&gt; {
+exports.getGlobalUsers = async (users = null) =&gt; {
+  const appId = getAppId()
   const db = getGlobalDB()
   let globalUsers
   if (users) {
@@ -353,11 +362,11 @@ exports.getGlobalUsers = async (appId = <span class="branch-0 cbranch-no" title=
   <span class="missing-if-branch" title="if path not taken" >I</span>if (!appId) {
 <span class="cstat-no" title="statement not covered" >    return globalUsers</span>
   }
-  return globalUsers.map(user =&gt; exports.updateAppRole(appId, user))
+  return globalUsers.map(user =&gt; exports.updateAppRole(user))
 }
 &nbsp;
-exports.getGlobalUsersFromMetadata = async (appId, users) =&gt; {
-  const globalUsers = await exports.getGlobalUsers(appId, users)
+exports.getGlobalUsersFromMetadata = async users =&gt; {
+  const globalUsers = await exports.getGlobalUsers(users)
   return users.map(<span class="fstat-no" title="function not covered" >us</span>er =&gt; {
     const globalUser = <span class="cstat-no" title="statement not covered" >globalUsers.find(</span>
 <span class="fstat-no" title="function not covered" >      gl</span>obalUser =&gt; <span class="cstat-no" title="statement not covered" >globalUser &amp;&amp; user._id.includes(globalUser._id)</span>
@@ -376,7 +385,7 @@ exports.getGlobalUsersFromMetadata = async (appId, users) =&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>