From cfbd75b36d1da1d574154032ae129a38e1c31396 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 15 Apr 2021 15:57:55 +0100
Subject: [PATCH] Some changes to initial login form, improvements based on
 testing and attempts to fix cypress test failures.

---
 .../src/components/login/LoginForm.svelte     | 15 ++++----
 .../builder/src/pages/builder/_layout.svelte  |  2 +-
 packages/builder/src/stores/backend/auth.js   |  6 +++-
 packages/server/src/api/controllers/dev.js    | 34 +++++++++++++++++++
 packages/server/src/api/routes/dev.js         | 13 +++++++
 packages/server/src/api/routes/index.js       |  2 ++
 packages/server/src/utilities/users.js        |  3 +-
 .../server/src/utilities/workerRequests.js    | 19 +++++++----
 packages/worker/src/api/controllers/auth.js   |  9 +++--
 9 files changed, 79 insertions(+), 24 deletions(-)
 create mode 100644 packages/server/src/api/controllers/dev.js
 create mode 100644 packages/server/src/api/routes/dev.js

diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte
index 5f29ce126e..7e32efb7c5 100644
--- a/packages/builder/src/components/login/LoginForm.svelte
+++ b/packages/builder/src/components/login/LoginForm.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Button, Label, Input, TextArea, Spacer } from "@budibase/bbui"
+  import { Button, Label, Input, Spacer } from "@budibase/bbui"
   import { notifier } from "builderStore/store/notifications"
   import { auth } from "stores/backend"
 
@@ -8,24 +8,20 @@
 
   async function login() {
     try {
-      const json = await auth.login({
+      await auth.login({
         username,
         password,
       })
-      if (json.success) {
-        notifier.success("Logged in successfully.")
-      } else {
-        notifier.danger("Invalid credentials")
-      }
+      notifier.success("Logged in successfully.")
     } catch (err) {
       console.error(err)
-      notifier.danger(`Error logging in: ${err}`)
+      notifier.danger("Invalid credentials")
     }
   }
 
   async function createTestUser() {
     try {
-      const json = await auth.createUser({
+      await auth.createUser({
         email: "test@test.com",
         password: "test",
         roles: {},
@@ -36,6 +32,7 @@
       notifier.success("Test user created")
     } catch (err) {
       console.error(err)
+      notifier.danger("Could not create test user")
     }
   }
 </script>
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 981dc457a4..b92b187aa2 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Home as Link, Button } from "@budibase/bbui"
+  import { Home as Link } from "@budibase/bbui"
   import {
     AppsIcon,
     HostingIcon,
diff --git a/packages/builder/src/stores/backend/auth.js b/packages/builder/src/stores/backend/auth.js
index a3bc20676b..0d59451417 100644
--- a/packages/builder/src/stores/backend/auth.js
+++ b/packages/builder/src/stores/backend/auth.js
@@ -21,7 +21,11 @@ export function createAuthStore() {
     login: async creds => {
       const response = await api.post(`/api/admin/auth`, creds)
       const json = await response.json()
-      set({ user: json })
+      if (response.status === 200) {
+        set({ user: json.user })
+      } else {
+        throw "Invalid credentials"
+      }
       return json
     },
     logout: async () => {
diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
new file mode 100644
index 0000000000..b08f730c48
--- /dev/null
+++ b/packages/server/src/api/controllers/dev.js
@@ -0,0 +1,34 @@
+const fetch = require("node-fetch")
+const env = require("../../environment")
+const { checkSlashesInUrl } = require("../../utilities")
+const { request } = require("../../utilities/workerRequests")
+
+async function redirect(ctx, method) {
+  const { path } = ctx.params
+  const response = await fetch(
+    checkSlashesInUrl(`${env.WORKER_URL}/api/admin/${path}`),
+    request(ctx, {
+      method,
+      body: ctx.request.body,
+    })
+  )
+  ctx.body = await response.json()
+  const cookie = response.headers.get("set-cookie")
+  if (cookie) {
+    ctx.set("set-cookie", cookie)
+  }
+  ctx.status = response.status
+  ctx.cookies
+}
+
+exports.redirectGet = async ctx => {
+  await redirect(ctx, "GET")
+}
+
+exports.redirectPost = async ctx => {
+  await redirect(ctx, "POST")
+}
+
+exports.redirectDelete = async ctx => {
+  await redirect(ctx, "DELETE")
+}
diff --git a/packages/server/src/api/routes/dev.js b/packages/server/src/api/routes/dev.js
new file mode 100644
index 0000000000..de9453ba5a
--- /dev/null
+++ b/packages/server/src/api/routes/dev.js
@@ -0,0 +1,13 @@
+const Router = require("@koa/router")
+const controller = require("../controllers/dev")
+const env = require("../../environment")
+
+const router = Router()
+
+if (env.isDev()) {
+  router.get("/api/admin/:path", controller.redirectGet)
+  router.post("/api/admin/:path", controller.redirectPost)
+  router.delete("/api/admin/:path", controller.redirectDelete)
+}
+
+module.exports = router
diff --git a/packages/server/src/api/routes/index.js b/packages/server/src/api/routes/index.js
index 002d2ec805..19de709ca9 100644
--- a/packages/server/src/api/routes/index.js
+++ b/packages/server/src/api/routes/index.js
@@ -22,6 +22,7 @@ const datasourceRoutes = require("./datasource")
 const queryRoutes = require("./query")
 const hostingRoutes = require("./hosting")
 const backupRoutes = require("./backup")
+const devRoutes = require("./dev")
 
 exports.mainRoutes = [
   deployRoutes,
@@ -44,6 +45,7 @@ exports.mainRoutes = [
   queryRoutes,
   hostingRoutes,
   backupRoutes,
+  devRoutes,
   // these need to be handled last as they still use /api/:tableId
   // this could be breaking as koa may recognise other routes as this
   tableRoutes,
diff --git a/packages/server/src/utilities/users.js b/packages/server/src/utilities/users.js
index fbed0ed5a9..319a0cfa41 100644
--- a/packages/server/src/utilities/users.js
+++ b/packages/server/src/utilities/users.js
@@ -9,10 +9,11 @@ exports.getFullUser = async ({ ctx, email, userId }) => {
   if (!email) {
     email = getEmailFromUserMetadataID(userId)
   }
-  const db = new CouchDB(ctx.appId)
   const global = await getGlobalUsers(ctx, ctx.appId, email)
   let metadata
   try {
+    // this will throw an error if the db doesn't exist, or there is no appId
+    const db = new CouchDB(ctx.appId)
     metadata = await db.get(generateUserMetadataID(email))
   } catch (err) {
     // it is fine if there is no user metadata, just remove global db info
diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index 16be0daa0b..93a7c26753 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -11,11 +11,11 @@ function getAppRole(appId, user) {
   if (!user.roleId) {
     user.roleId = BUILTIN_ROLE_IDS.PUBLIC
   }
-  // delete user.roles
+  delete user.roles
   return user
 }
 
-function prepRequest(ctx, request) {
+function request(ctx, request) {
   if (!request.headers) {
     request.headers = {}
   }
@@ -32,6 +32,8 @@ function prepRequest(ctx, request) {
   return request
 }
 
+exports.request = request
+
 exports.getDeployedApps = async ctx => {
   if (!env.SELF_HOSTED) {
     throw "Can only check apps for self hosted environments"
@@ -39,7 +41,7 @@ exports.getDeployedApps = async ctx => {
   try {
     const response = await fetch(
       checkSlashesInUrl(env.WORKER_URL + `/api/apps`),
-      prepRequest(ctx, {
+      request(ctx, {
         method: "GET",
       })
     )
@@ -63,19 +65,22 @@ exports.deleteGlobalUser = async (ctx, email) => {
   const reqCfg = { method: "DELETE" }
   const response = await fetch(
     checkSlashesInUrl(env.WORKER_URL + endpoint),
-    prepRequest(ctx, reqCfg)
+    request(ctx, reqCfg)
   )
   return response.json()
 }
 
-exports.getGlobalUsers = async (ctx, appId, email = null) => {
+exports.getGlobalUsers = async (ctx, appId = null, email = null) => {
   const endpoint = email ? `/api/admin/users/${email}` : `/api/admin/users`
   const reqCfg = { method: "GET" }
   const response = await fetch(
     checkSlashesInUrl(env.WORKER_URL + endpoint),
-    prepRequest(ctx, reqCfg)
+    request(ctx, reqCfg)
   )
   let users = await response.json()
+  if (!appId) {
+    return users
+  }
   if (Array.isArray(users)) {
     users = users.map(user => getAppRole(appId, user))
   } else {
@@ -107,7 +112,7 @@ exports.saveGlobalUser = async (ctx, appId, email, body) => {
 
   const response = await fetch(
     checkSlashesInUrl(env.WORKER_URL + endpoint),
-    prepRequest(ctx, reqCfg)
+    request(ctx, reqCfg)
   )
   const json = await response.json()
   if (json.status !== 200 && response.status !== 200) {
diff --git a/packages/worker/src/api/controllers/auth.js b/packages/worker/src/api/controllers/auth.js
index aca1d13e97..0814a5c940 100644
--- a/packages/worker/src/api/controllers/auth.js
+++ b/packages/worker/src/api/controllers/auth.js
@@ -3,15 +3,14 @@ const { passport, Cookies, clearCookie } = require("@budibase/auth")
 exports.authenticate = async (ctx, next) => {
   return passport.authenticate("local", async (err, user) => {
     if (err) {
-      return ctx.throw(err)
+      return ctx.throw(403, "Unauthorized")
     }
 
     const expires = new Date()
     expires.setDate(expires.getDate() + 1)
 
     if (!user) {
-      ctx.body = { success: false }
-      return next()
+      return ctx.throw(403, "Unauthorized")
     }
 
     ctx.cookies.set(Cookies.Auth, user.token, {
@@ -23,13 +22,13 @@ exports.authenticate = async (ctx, next) => {
 
     delete user.token
 
-    ctx.body = { success: true, user }
+    ctx.body = { user }
   })(ctx, next)
 }
 
 exports.logout = async ctx => {
   clearCookie(ctx, Cookies.Auth)
-  ctx.body = { success: true }
+  ctx.body = { messaged: "User logged out" }
 }
 
 exports.googleAuth = async () => {