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

.eslintignore

@@ -0,0 +1 @@
+packages/server/builder/**/*.js

packages/auth/src/index.js

@@ -4,7 +4,7 @@ const JwtStrategy = require("passport-jwt").Strategy
 // const GoogleStrategy = require("passport-google-oauth").Strategy
 const CouchDB = require("./db")
 const { StaticDatabases } = require("./db/utils")
-const { jwt, local, google, authenticated } = require("./middleware")
+const { jwt, local, authenticated } = require("./middleware")
 const { Cookies, UserStatus } = require("./constants")
 const { hash, compare } = require("./hashing")
 const {

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

@@ -6,7 +6,7 @@ exports.options = {
   callbackURL: env.GOOGLE_AUTH_CALLBACK_URL,
 }
 
-exports.authenticate = async function(token, tokenSecret, profile, done) {
-  // retrieve user ...
-  // fetchUser().then(user => done(null, user))
-}
+// exports.authenticate = async function(token, tokenSecret, profile, done) {
+//   // retrieve user ...
+//   fetchUser().then(user => done(null, user))
+// }

packages/server/src/utilities/builder/hosting.js

@@ -1,7 +1,5 @@
 const CouchDB = require("../../db")
 const { StaticDatabases } = require("../../db/utils")
-const fetch = require("node-fetch")
-const env = require("../../environment")
 const { getDeployedApps } = require("../../utilities/workerRequests")
 
 const PROD_HOSTING_URL = "app.budi.live"

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

@@ -32,10 +32,10 @@ exports.logout = async ctx => {
   ctx.body = { success: true }
 }
 
-exports.googleAuth = async (ctx, next) => {
+exports.googleAuth = async () => {
   // return passport.authenticate("google")
 }
 
-exports.googleAuth = async (ctx, next) => {
+exports.googleAuth = async () => {
   // return passport.authenticate("google")
 }