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 github.com:Budibase/budibase into feature/global-user-management

This commit is contained in:
mike12345567 2021-04-13 17:12:09 +01:00
parent d0bdd113e1 06f3b1fbad
commit a8f7977510
5 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/api/auth.js
View File

@ -13,8 +13,8 @@ export const logIn = async ({ email, password }) => {
return API.error("Please enter your password")
}
return await API.post({
url: "/api/authenticate",
body: { email, password },
url: "/api/admin/auth",
body: { username: email, password },
})
}

11
packages/client/src/store/auth.js
View File

@ -19,8 +19,8 @@ const createAuthStore = () => {
// Logs a user in
const logIn = async ({ email, password }) => {
const user = await API.logIn({ email, password })
if (!user.error) {
const auth = await API.logIn({ email, password })
if (auth.success) {
await fetchUser()
await initialise()
goToDefaultRoute()
@ -30,12 +30,7 @@ const createAuthStore = () => {
// Logs a user out
const logOut = async () => {
store.set(null)
const appId = get(builderStore).appId
if (appId) {
for (let environment of ["local", "cloud"]) {
window.document.cookie = `budibase:${appId}:${environment}=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
}
}
window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
await initialise()
goToDefaultRoute()
}

5
packages/server/src/middleware/currentapp.js
View File

@ -23,8 +23,11 @@ module.exports = async (ctx, next) => {
roleId = BUILTIN_ROLE_IDS.PUBLIC
} else if (
requestAppId != null &&
(appCookie == null || requestAppId !== appCookie.appId)
(appCookie == null ||
requestAppId !== appCookie.appId ||
appCookie.roleId === BUILTIN_ROLE_IDS.PUBLIC)
) {
// Different App ID means cookie needs reset, or if the same public user has logged in
const globalUser = await getGlobalUsers(ctx, requestAppId, ctx.user.email)
updateCookie = true
appId = requestAppId

33
packages/server/src/utilities/builder/setBuilderToken.js
View File

@ -1,33 +0,0 @@
const { BUILTIN_ROLE_IDS } = require("../security/roles")
const env = require("../../environment")
const CouchDB = require("../../db")
const jwt = require("jsonwebtoken")
const { DocumentTypes, SEPARATOR } = require("../../db/utils")
const { setCookie } = require("@budibase/auth")
// const { setCookie, clearCookie } = require("../index")
// const APP_PREFIX = DocumentTypes.APP + SEPARATOR
module.exports = async (ctx, appId, version) => {
// const builderUser = {
// userId: "BUILDER",
// roleId: BUILTIN_ROLE_IDS.BUILDER,
// version,
// }
// if (env.BUDIBASE_API_KEY) {
// builderUser.apiKey = env.BUDIBASE_API_KEY
// }
// const token = jwt.sign(builderUser, ctx.config.jwtSecret, {
// expiresIn: "30 days",
// })
// set the builder token
// setCookie(ctx, token, "builder")
// setCookie(ctx, appId, "currentapp")
// need to clear all app tokens or else unable to use the app in the builder
// let allDbNames = await CouchDB.allDbs()
// allDbNames.map(dbName => {
// if (dbName.startsWith(APP_PREFIX)) {
// clearCookie(ctx, dbName)
// }
// })
}

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

@ -28,7 +28,7 @@ exports.authenticate = async (ctx, next) => {
}
exports.logout = async ctx => {
clearCookie(Cookies.Auth)
clearCookie(ctx, Cookies.Auth)
ctx.body = { success: true }
}