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

Fixing some bugs with JWT creation not getting an API key.

This commit is contained in:
mike12345567 2020-10-09 20:44:35 +01:00
parent 89d02357b8
commit c3380d8ab4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ exports.authenticate = async ctx => {
} }
// if in cloud add the user api key // if in cloud add the user api key
if (environment.CLOUD) { if (environment.CLOUD) {
payload.apiKey = getAPIKey(ctx.user.appId) payload.apiKey = await getAPIKey(ctx.user.appId)
} }
const token = jwt.sign(payload, ctx.config.jwtSecret, { const token = jwt.sign(payload, ctx.config.jwtSecret, {

7
packages/server/src/utilities/usageQuota.js
View File

@ -69,13 +69,16 @@ exports.update = async (apiKey, property, usage) => {
try { try {
await apiKeyTable.update(buildUpdateParams(apiKey, property, usage)) await apiKeyTable.update(buildUpdateParams(apiKey, property, usage))
} catch (err) { } catch (err) {
// conditional check means the condition failed, need to check why
if (err.code === "ConditionalCheckFailedException") { if (err.code === "ConditionalCheckFailedException") {
// get the API key so we can check it // get the API key so we can check it
const keyObj = await apiKeyTable.get({ primary: apiKey }) const keyObj = await apiKeyTable.get({ primary: apiKey })
// the usage quota or usage limits didn't exist // the usage quota or usage limits didn't exist
if (keyObj && (keyObj.usageQuota == null || keyObj.usageLimits == null)) { if (keyObj && (keyObj.usageQuota == null || keyObj.usageLimits == null)) {
keyObj.usageQuota = DEFAULT_USAGE keyObj.usageQuota =
keyObj.usageLimits = DEFAULT_PLAN keyObj.usageQuota == null ? DEFAULT_USAGE : keyObj.usageQuota
keyObj.usageLimits =
keyObj.usageLimits == null ? DEFAULT_PLAN : keyObj.usageLimits
keyObj.quotaReset = getNewQuotaReset() keyObj.quotaReset = getNewQuotaReset()
await apiKeyTable.put({ item: keyObj }) await apiKeyTable.put({ item: keyObj })
return return