MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin McKeaveney 2021-04-14 17:02:18 +01:00
parent 0f6bfb53fc c7171d0303
commit 6cd43f545a
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore Normal file
View File

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

2
packages/auth/src/index.js
View File

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

8
packages/auth/src/middleware/passport/google.js
View File

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

2
packages/server/src/utilities/builder/hosting.js
View File

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

4
packages/worker/src/api/controllers/auth.js
View File

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