From e321a8b3fa2ff2d52e67289dcab620a3207894e5 Mon Sep 17 00:00:00 2001
From: michael shanks <mike@budibase.com>
Date: Wed, 26 Jun 2019 22:29:28 +0100
Subject: [PATCH] temporary access - passing

---
 packages/server/middleware/routers.js          | 2 +-
 packages/server/tests/authenticate.js          | 2 +-
 packages/server/tests/testApp.js               | 2 +-
 packages/server/utilities/masterAppInternal.js | 6 +-----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/server/middleware/routers.js b/packages/server/middleware/routers.js
index 61d77f188..d06b89f4d 100644
--- a/packages/server/middleware/routers.js
+++ b/packages/server/middleware/routers.js
@@ -42,7 +42,7 @@ module.exports = (config, app) => {
 
         await instanceApi.authApi.setPasswordFromTemporaryCode(
             ctx.request.body.tempCode,
-            ctx.request.body.newpassword); 
+            ctx.request.body.newPassword); 
 
         ctx.response.status = StatusCodes.OK;
     })
diff --git a/packages/server/tests/authenticate.js b/packages/server/tests/authenticate.js
index 350937308..385c07c62 100644
--- a/packages/server/tests/authenticate.js
+++ b/packages/server/tests/authenticate.js
@@ -133,7 +133,7 @@ module.exports = (app) => {
 
         testPassword = "test_user_new_password";
 
-        const tempCode = await readFile(`tempaccess${testUserName}`, "utf8");
+        const tempCode = await readFile(`./tests/.data/tempaccess${testUserName}`, "utf8");
 
         await app.post("/_master/api/setPasswordFromTemporaryCode", {
             username: testUserName,
diff --git a/packages/server/tests/testApp.js b/packages/server/tests/testApp.js
index 5a4b5febf..f4a284a28 100644
--- a/packages/server/tests/testApp.js
+++ b/packages/server/tests/testApp.js
@@ -13,7 +13,7 @@ const masterOwnerPassword = "test_master_pass";
 const masterPlugins = {
     main: {
         outputToFile : ({filename, content}) => {
-            fs.writeFile(`./tests/${filename}`, content, {encoding:"utf8"});
+            fs.writeFile(`./tests/.data/${filename}`, content, {encoding:"utf8"});
         }
     }
 }
diff --git a/packages/server/utilities/masterAppInternal.js b/packages/server/utilities/masterAppInternal.js
index 78ff15d1d..dfdb9ace7 100644
--- a/packages/server/utilities/masterAppInternal.js
+++ b/packages/server/utilities/masterAppInternal.js
@@ -154,11 +154,7 @@ module.exports = async (config) => {
     const getFullAccessInstanceApiForUsername = async (appname, username) => {
 
         if(isMaster(appname)) {
-            const user = bb.authApi.getUsers()
-                                   .find(u => u.name === username);
-            if(!user) return;
-            if(!user.enabled) return;
-            return user;
+            return bb;
         }
         else {
             const app = await getApplication(appname);