Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management

packages/auth/src/index.js

@@ -5,7 +5,6 @@ const JwtStrategy = require("passport-jwt").Strategy
 const CouchDB = require("./db")
 const { StaticDatabases } = require("./db/utils")
 const { jwt, local, google } = require("./middleware")
-const hashing = require("./hashing")
 
 // Strategies
 passport.use(new LocalStrategy(local.options, local.authenticate))
@@ -26,6 +25,6 @@ passport.deserializeUser(async (user, done) => {
   }
 })
 
-// exports.hashing = hashing
+// exports.Cookies = Cookies
 
 module.exports = passport

packages/auth/src/middleware/authenticated.js

@@ -22,7 +22,7 @@ module.exports = async (ctx, next) => {
   const cookieAppId = ctx.cookies.get(Cookies.CurrentApp)
   // const builtinRoles = getBuiltinRoles()
   if (appId && cookieAppId !== appId) {
-    setCookie(ctx, appId, "currentapp")
+    setCookie(ctx, appId, Cookies.CurrentApp)
   } else if (cookieAppId) {
     appId = cookieAppId
   }

packages/auth/src/middleware/index.js

@@ -1,6 +1,6 @@
-const jwt = require("./jwt")
+const jwt = require("./passport/jwt")
-const local = require("./local")
+const local = require("./passport/local")
-const google = require("./google")
+const google = require("./passport/google")
 
 module.exports = {
   google,

packages/auth/src/middleware/google.js → packages/auth/src/middleware/passport/google.js

@@ -1,4 +1,4 @@
-const CouchDB = require("../db")
+// const CouchDB = require("../db")
 
 exports.options = {
   clientId: process.env.GOOGLE_CLIENT_ID,

packages/auth/src/middleware/jwt.js → packages/auth/src/middleware/passport/jwt.js

@@ -1,7 +1,4 @@
-// const jwt = require("passport-jwt")
+const { Cookies } = require("../../constants")
-const { Cookies } = require("../constants")
-
-// const ExtractJWT = jwt.ExtractJwt
 
 exports.options = {
   jwtFromRequest: function(ctx) {

packages/auth/src/middleware/local.js → packages/auth/src/middleware/passport/local.js

@@ -1,8 +1,8 @@
 const jwt = require("jsonwebtoken")
-const { UserStatus } = require("../constants")
+const { UserStatus } = require("../../constants")
-const CouchDB = require("../db")
+const CouchDB = require("../../db")
-const { StaticDatabases, generateUserID } = require("../db/utils")
+const { StaticDatabases, generateUserID } = require("../../db/utils")
-const { compare } = require("../hashing")
+const { compare } = require("../../hashing")
 
 const INVALID_ERR = "Invalid Credentials"
 

packages/worker/src/api/controllers/admin/auth.js

@@ -1,20 +1,21 @@
-const jwt = require("jsonwebtoken")
-const CouchDB = require("../../../db")
 const passport = require("@budibase/auth")
 
 exports.authenticate = async (ctx, next) => {
-  return passport.authenticate("local", async (err, user, info, status) => {
+  return passport.authenticate("local", async (err, user) => {
-    // TODO: better
     if (err) {
-      ctx.throw(err)
+      return ctx.throw(err)
     }
 
-    // await ctx.login(user)
+    const expires = new Date()
-    ctx.body = {
+    expires.setDate(expires.getDate() + 1)
-      err,
+
-      user,
+    ctx.cookies.set("budibase:auth", user.token, {
-      info,
+      expires,
-      status,
+      path: "/",
-    }
+      httpOnly: false,
+      overwrite: true,
+    })
+
+    ctx.body = { success: true }
   })(ctx, next)
 }

packages/worker/src/api/routes/admin/index.js

@@ -2,15 +2,22 @@ const Router = require("@koa/router")
 const passport = require("@budibase/auth")
 const controller = require("../../controllers/admin")
 const authController = require("../../controllers/admin/auth")
-const authenticated = require("../../../middleware/authenticated")
 
 const router = Router()
 
 router
-  .post("/api/admin/users", authenticated, controller.userSave)
+  .post("/api/admin/users", passport.authenticate("jwt"), controller.userSave)
   .post("/api/admin/authenticate", authController.authenticate)
-  .delete("/api/admin/users/:email", authenticated, controller.userDelete)
+  .delete(
+    "/api/admin/users/:email",
+    passport.authenticate("jwt"),
+    controller.userDelete
+  )
   .get("/api/admin/users", passport.authenticate("jwt"), controller.userFetch)
-  .get("/api/admin/users/:email", authenticated, controller.userFind)
+  .get(
+    "/api/admin/users/:email",
+    passport.authenticate("jwt"),
+    controller.userFind
+  )
 
 module.exports = router