@budibase/worker 1.0.178-alpha.0 → 1.0.180

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +5 -5
  2. package/src/api/controllers/global/license.ts +2 -1
  3. package/src/api/controllers/global/self.js +2 -2
  4. package/src/environment.js +12 -19
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@budibase/worker",
3
3
  "email": "hi@budibase.com",
4
- "version": "1.0.178-alpha.0",
4
+ "version": "1.0.180",
5
5
  "description": "Budibase background service",
6
6
  "main": "src/index.ts",
7
7
  "repository": {
@@ -32,9 +32,9 @@
32
32
  "author": "Budibase",
33
33
  "license": "GPL-3.0",
34
34
  "dependencies": {
35
- "@budibase/backend-core": "^1.0.178-alpha.0",
36
- "@budibase/pro": "^1.0.175",
37
- "@budibase/string-templates": "^1.0.178-alpha.0",
35
+ "@budibase/backend-core": "^1.0.180",
36
+ "@budibase/pro": "^1.0.178",
37
+ "@budibase/string-templates": "^1.0.180",
38
38
  "@koa/router": "^8.0.0",
39
39
  "@sentry/node": "6.17.7",
40
40
  "@techpass/passport-openidconnect": "^0.3.0",
@@ -90,5 +90,5 @@
90
90
  "./scripts/jestSetup.js"
91
91
  ]
92
92
  },
93
- "gitHead": "c1da01986fb22dcdf29a10d441f0a2f0e35dbc2c"
93
+ "gitHead": "74ba842b764d17086a6060a7c683947f6f6bdb62"
94
94
  }
package/src/api/controllers/global/license.ts CHANGED
@@ -25,5 +25,6 @@ export const getInfo = async (ctx: any) => {
25
25
  }
26
26
 
27
27
  export const getQuotaUsage = async (ctx: any) => {
28
- ctx.body = await quotas.getQuotaUsage()
28
+ const usage = await quotas.getQuotaUsage()
29
+ ctx.body = usage
29
30
  }
package/src/api/controllers/global/self.js CHANGED
@@ -75,8 +75,8 @@ const checkCurrentApp = ctx => {
75
75
  const addSessionAttributesToUser = ctx => {
76
76
  ctx.body.account = ctx.user.account
77
77
  ctx.body.license = ctx.user.license
78
- ctx.body.budibaseAccess = !!ctx.user.budibaseAccess
79
- ctx.body.accountPortalAccess = !!ctx.user.accountPortalAccess
78
+ ctx.body.budibaseAccess = ctx.user.budibaseAccess
79
+ ctx.body.accountPortalAccess = ctx.user.accountPortalAccess
80
80
  ctx.body.csrfToken = ctx.user.csrfToken
81
81
  }
82
82
 
package/src/environment.js CHANGED
@@ -27,40 +27,33 @@ function parseIntSafe(number) {
27
27
  }
28
28
 
29
29
  module.exports = {
30
- // auth
30
+ NODE_ENV: process.env.NODE_ENV,
31
+ SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
32
+ PORT: process.env.PORT || process.env.WORKER_PORT,
33
+ CLUSTER_PORT: process.env.CLUSTER_PORT,
31
34
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
32
35
  MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
36
+ MINIO_URL: process.env.MINIO_URL,
37
+ COUCH_DB_URL: process.env.COUCH_DB_URL,
38
+ LOG_LEVEL: process.env.LOG_LEVEL,
33
39
  JWT_SECRET: process.env.JWT_SECRET,
34
40
  SALT_ROUNDS: process.env.SALT_ROUNDS,
41
+ REDIS_URL: process.env.REDIS_URL,
35
42
  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
36
43
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
37
- COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
38
- // urls
39
- MINIO_URL: process.env.MINIO_URL,
40
- COUCH_DB_URL: process.env.COUCH_DB_URL,
41
- REDIS_URL: process.env.REDIS_URL,
42
- ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
43
- PLATFORM_URL: process.env.PLATFORM_URL,
44
- APPS_URL: process.env.APPS_URL,
45
- // ports
46
- PORT: process.env.PORT || process.env.WORKER_PORT,
47
- CLUSTER_PORT: process.env.CLUSTER_PORT,
48
- // flags
49
- NODE_ENV: process.env.NODE_ENV,
50
- SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
51
- LOG_LEVEL: process.env.LOG_LEVEL,
52
44
  MULTI_TENANCY: process.env.MULTI_TENANCY,
53
45
  DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
46
+ ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
54
47
  SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
55
- DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
56
- // smtp
57
48
  SMTP_USER: process.env.SMTP_USER,
58
49
  SMTP_PASSWORD: process.env.SMTP_PASSWORD,
59
50
  SMTP_HOST: process.env.SMTP_HOST,
60
51
  SMTP_PORT: process.env.SMTP_PORT,
61
52
  SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
62
- // other
53
+ PLATFORM_URL: process.env.PLATFORM_URL,
54
+ COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
63
55
  CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
56
+ APPS_URL: process.env.APPS_URL,
64
57
  _set(key, value) {
65
58
  process.env[key] = value
66
59
  module.exports[key] = value