@budibase/server 1.0.219-alpha.1 → 1.0.219-alpha.4

package/coverage/lcov-report/threads/index.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">66.06% </span>
+                <span class="strong">66.36% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>220/333</span>
+                <span class='fraction'>221/333</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">45.03% </span>
+                <span class="strong">46.25% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>68/151</span>
+                <span class='fraction'>68/147</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">66.05% </span>
+                <span class="strong">66.36% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>216/327</span>
+                <span class='fraction'>217/327</span>
             </div>
         
             
@@ -95,17 +95,17 @@
 
 <tr>
 	<td class="file high" data-value="query.js"><a href="query.js.html">query.js</a></td>
-	<td data-value="80.76" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 80%"></div><div class="cover-empty" style="width: 20%"></div></div>
+	<td data-value="81.53" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 81%"></div><div class="cover-empty" style="width: 19%"></div></div>
 	</td>
-	<td data-value="80.76" class="pct high">80.76%</td>
-	<td data-value="130" class="abs high">105/130</td>
-	<td data-value="62.29" class="pct medium">62.29%</td>
-	<td data-value="61" class="abs medium">38/61</td>
+	<td data-value="81.53" class="pct high">81.53%</td>
+	<td data-value="130" class="abs high">106/130</td>
+	<td data-value="66.66" class="pct medium">66.66%</td>
+	<td data-value="57" class="abs medium">38/57</td>
 	<td data-value="76.92" class="pct medium">76.92%</td>
 	<td data-value="13" class="abs medium">10/13</td>
-	<td data-value="80.95" class="pct high">80.95%</td>
-	<td data-value="126" class="abs high">102/126</td>
+	<td data-value="81.74" class="pct high">81.74%</td>
+	<td data-value="126" class="abs high">103/126</td>
 	</tr>
 
 <tr>
@@ -131,7 +131,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80.76% </span>
+                <span class="strong">81.53% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>105/130</span>
+                <span class='fraction'>106/130</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">62.29% </span>
+                <span class="strong">66.66% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>38/61</span>
+                <span class='fraction'>38/57</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80.95% </span>
+                <span class="strong">81.74% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>102/126</span>
+                <span class='fraction'>103/126</span>
             </div>
         
             
@@ -334,7 +334,8 @@
 <a name='L269'></a><a href='#L269'>269</a>
 <a name='L270'></a><a href='#L270'>270</a>
 <a name='L271'></a><a href='#L271'>271</a>
-<a name='L272'></a><a href='#L272'>272</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
+<a name='L272'></a><a href='#L272'>272</a>
+<a name='L273'></a><a href='#L273'>273</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -345,6 +346,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -448,17 +450,11 @@
 <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-no">&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-neutral">&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-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</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>
@@ -511,7 +507,6 @@
 <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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -525,6 +520,13 @@
 <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-neutral">&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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -615,6 +617,7 @@ const {
   refreshOAuthToken,
   updateUserOAuth,
 } = require("@budibase/backend-core/auth")
+const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalIDFromUserMetadataID } = require("../db/utils")
 &nbsp;
 const { isSQL } = require("../integrations/utils")
@@ -719,15 +722,9 @@ class QueryRunner {
 <span class="branch-1 cbranch-no" title="branch not covered" >        info.code === 401 </span>&amp;&amp;
 <span class="branch-2 cbranch-no" title="branch not covered" >        !this.hasRefreshedOAuth</span>
       ) {
+<span class="cstat-no" title="statement not covered" >        await this.refreshOAuth2(this.ctx)</span>
         // Attempt to refresh the access token from the provider
 <span class="cstat-no" title="statement not covered" >        this.hasRefreshedOAuth = true</span>
-        const authResponse = <span class="cstat-no" title="statement not covered" >await this.refreshOAuth2(this.ctx)</span>
-&nbsp;
-<span class="cstat-no" title="statement not covered" >        if (!authResponse || authResponse.err) {</span>
-          // In this event the user may have oAuth issues that
-          // could require re-authenticating with their provider.
-<span class="cstat-no" title="statement not covered" >          throw new Error("OAuth2 access token could not be refreshed")</span>
-        }
       }
 &nbsp;
       this.hasRerun = true
@@ -781,8 +778,7 @@ class QueryRunner {
     const { configId } = <span class="cstat-no" title="statement not covered" >ctx.auth</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    if (!providerType || !oauth2?.refreshToken) {</span>
-<span class="cstat-no" title="statement not covered" >      console.error("No refresh token found for authenticated user")</span>
-<span class="cstat-no" title="statement not covered" >      return</span>
+<span class="cstat-no" title="statement not covered" >      throw new Error("No refresh token found for authenticated user")</span>
     }
 &nbsp;
     const resp = <span class="cstat-no" title="statement not covered" >await refreshOAuthToken(</span>
@@ -793,9 +789,16 @@ class QueryRunner {
 &nbsp;
     // Refresh session flow. Should be in same location as refreshOAuthToken
     // There are several other properties available in 'resp'
-<span class="cstat-no" title="statement not covered" >    if (!resp.error) {</span>
+<span class="cstat-no" title="statement not covered" >    if (!resp.err) {</span>
       const globalUserId = <span class="cstat-no" title="statement not covered" >getGlobalIDFromUserMetadataID(_id)</span>
 <span class="cstat-no" title="statement not covered" >      await updateUserOAuth(globalUserId, resp)</span>
+<span class="cstat-no" title="statement not covered" >      this.ctx.user = await userCache.getUser(globalUserId)</span>
+    } else {
+      // In this event the user may have oAuth issues that
+      // could require re-authenticating with their provider.
+<span class="cstat-no" title="statement not covered" >      throw new Error(</span>
+        "OAuth2 access token could not be refreshed: " + resp.err.toString()
+      )
     }
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    return resp</span>
@@ -883,7 +886,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" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -304,7 +304,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" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/budibaseDir.js.html

@@ -79,7 +79,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" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/centralPath.js.html

@@ -136,7 +136,7 @@ exports.resolve = function (...args) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/csvParser.js.html

@@ -502,7 +502,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/global.js.html

@@ -391,7 +391,7 @@ exports.getGlobalUsersFromMetadata = async users => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/index.html

@@ -236,7 +236,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/index.js.html

@@ -577,7 +577,7 @@ exports.convertBookmark = bookmark => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -412,7 +412,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -145,7 +145,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1096,7 +1096,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -346,7 +346,7 @@ exports.processDates = <span class="fstat-no" title="function not covered" >(t</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/scriptRunner.js.html

@@ -142,7 +142,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/security.js.html

@@ -280,7 +280,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jul 06 2022 12:15:49 GMT+0000 (Coordinated Universal Time)
+                at Wed Jul 06 2022 13:13:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>