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

Merge branch 'component-sdk' of github.com:Budibase/budibase into component-sdk

This commit is contained in:
Andrew Kingston 2020-11-20 09:50:25 +00:00
parent 1b0fa94dff 342b310cd1
commit bb46d1e139
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/server/src/middleware/authenticated.js
View File

@ -1,7 +1,9 @@
const jwt = require("jsonwebtoken") const jwt = require("jsonwebtoken")
const STATUS_CODES = require("../utilities/statusCodes") const STATUS_CODES = require("../utilities/statusCodes")
const { getAccessLevel, BUILTIN_LEVELS } = require("../utilities/security/accessLevels") const {
const env = require("../environment") getAccessLevel,
BUILTIN_LEVELS,
} = require("../utilities/security/accessLevels")
const { AuthTypes } = require("../constants") const { AuthTypes } = require("../constants")
const { getAppId, getCookieName, setCookie, isClient } = require("../utilities") const { getAppId, getCookieName, setCookie, isClient } = require("../utilities")
@ -21,12 +23,10 @@ module.exports = async (ctx, next) => {
appId = cookieAppId appId = cookieAppId
} }
let token let token = ctx.cookies.get(getCookieName(appId))
if (isClient(ctx)) { let authType = AuthTypes.APP
ctx.auth.authenticated = AuthTypes.APP if (!token && !isClient(ctx)) {
token = ctx.cookies.get(getCookieName(appId)) authType = AuthTypes.BUILDER
} else {
ctx.auth.authenticated = AuthTypes.BUILDER
token = ctx.cookies.get(getCookieName()) token = ctx.cookies.get(getCookieName())
} }
@ -42,6 +42,7 @@ module.exports = async (ctx, next) => {
} }
try { try {
ctx.auth.authenticated = authType
const jwtPayload = jwt.verify(token, ctx.config.jwtSecret) const jwtPayload = jwt.verify(token, ctx.config.jwtSecret)
ctx.appId = appId ctx.appId = appId
ctx.auth.apiKey = jwtPayload.apiKey ctx.auth.apiKey = jwtPayload.apiKey