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

Merge pull request #1386 from Budibase/global-db 

Updating user database to be the global database
This commit is contained in:
Michael Drury 2021-04-19 11:24:33 +01:00 committed by GitHub
parent 7d3eb2f234 9cc640ac0e
commit ae792a9593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/auth/src/db/utils.js
View File

@ -1,6 +1,6 @@
exports.StaticDatabases = { exports.StaticDatabases = {
USER: { GLOBAL: {
name: "user-db", name: "global-db",
}, },
} }

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

@ -28,7 +28,7 @@ passport.use(new JwtStrategy(jwt.options, jwt.authenticate))
passport.serializeUser((user, done) => done(null, user)) passport.serializeUser((user, done) => done(null, user))
passport.deserializeUser(async (user, done) => { passport.deserializeUser(async (user, done) => {
const db = new database.CouchDB(StaticDatabases.USER.name) const db = new database.CouchDB(StaticDatabases.GLOBAL.name)
try { try {
const user = await db.get(user._id) const user = await db.get(user._id)

2
packages/auth/src/middleware/passport/local.js
View File

@ -21,7 +21,7 @@ exports.authenticate = async function(username, password, done) {
if (!password) return done(null, false, "Password Required.") if (!password) return done(null, false, "Password Required.")
// Check the user exists in the instance DB by email // Check the user exists in the instance DB by email
const db = new database.CouchDB(StaticDatabases.USER.name) const db = new database.CouchDB(StaticDatabases.GLOBAL.name)
let dbUser let dbUser
try { try {

10
packages/worker/src/api/controllers/admin/index.js
View File

@ -7,10 +7,10 @@ const {
} = require("@budibase/auth") } = require("@budibase/auth")
const { UserStatus } = require("../../../constants") const { UserStatus } = require("../../../constants")
const USER_DB = StaticDatabases.USER.name const GLOBAL_DB = StaticDatabases.GLOBAL.name
exports.userSave = async ctx => { exports.userSave = async ctx => {
const db = new CouchDB(USER_DB) const db = new CouchDB(GLOBAL_DB)
const { email, password, _id } = ctx.request.body const { email, password, _id } = ctx.request.body
const hashedPassword = password ? await hash(password) : null const hashedPassword = password ? await hash(password) : null
let user = { let user = {
@ -47,7 +47,7 @@ exports.userSave = async ctx => {
} }
exports.userDelete = async ctx => { exports.userDelete = async ctx => {
const db = new CouchDB(USER_DB) const db = new CouchDB(GLOBAL_DB)
const dbUser = await db.get(generateUserID(ctx.params.email)) const dbUser = await db.get(generateUserID(ctx.params.email))
await db.remove(dbUser._id, dbUser._rev) await db.remove(dbUser._id, dbUser._rev)
ctx.body = { ctx.body = {
@ -57,7 +57,7 @@ exports.userDelete = async ctx => {
// called internally by app server user fetch // called internally by app server user fetch
exports.userFetch = async ctx => { exports.userFetch = async ctx => {
const db = new CouchDB(USER_DB) const db = new CouchDB(GLOBAL_DB)
const response = await db.allDocs( const response = await db.allDocs(
getUserParams(null, { getUserParams(null, {
include_docs: true, include_docs: true,
@ -75,7 +75,7 @@ exports.userFetch = async ctx => {
// called internally by app server user find // called internally by app server user find
exports.userFind = async ctx => { exports.userFind = async ctx => {
const db = new CouchDB(USER_DB) const db = new CouchDB(GLOBAL_DB)
let user let user
try { try {
user = await db.get(generateUserID(ctx.params.email)) user = await db.get(generateUserID(ctx.params.email))