@budibase/worker 1.0.167-alpha.2 → 1.0.167-alpha.5

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 +1 -2
  3. package/src/api/controllers/global/self.js +2 -2
  4. package/src/environment.js +18 -12
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.167-alpha.2",
4
+ "version": "1.0.167-alpha.5",
5
5
  "description": "Budibase background service",
6
6
  "main": "src/index.ts",
7
7
  "repository": {
@@ -31,9 +31,9 @@
31
31
  "author": "Budibase",
32
32
  "license": "GPL-3.0",
33
33
  "dependencies": {
34
- "@budibase/backend-core": "^1.0.167-alpha.2",
35
- "@budibase/pro": "1.0.167-alpha.1",
36
- "@budibase/string-templates": "^1.0.167-alpha.2",
34
+ "@budibase/backend-core": "^1.0.167-alpha.5",
35
+ "@budibase/pro": "1.0.167-alpha.4",
36
+ "@budibase/string-templates": "^1.0.167-alpha.5",
37
37
  "@koa/router": "^8.0.0",
38
38
  "@sentry/node": "6.17.7",
39
39
  "@techpass/passport-openidconnect": "^0.3.0",
@@ -89,5 +89,5 @@
89
89
  "./scripts/jestSetup.js"
90
90
  ]
91
91
  },
92
- "gitHead": "d794d55539903e712fd5e8db01d85e94049aad72"
92
+ "gitHead": "e6e0d0e268fb8fd7b5db5700a977ea892fe8be3b"
93
93
  }
package/src/api/controllers/global/license.ts CHANGED
@@ -25,6 +25,5 @@ export const getInfo = async (ctx: any) => {
25
25
  }
26
26
 
27
27
  export const getQuotaUsage = async (ctx: any) => {
28
- const usage = await quotas.getQuotaUsage()
29
- ctx.body = usage
28
+ ctx.body = await quotas.getQuotaUsage()
30
29
  }
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
@@ -17,32 +17,38 @@ if (!LOADED && isDev() && !isTest()) {
17
17
  }
18
18
 
19
19
  module.exports = {
20
- NODE_ENV: process.env.NODE_ENV,
21
- SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
22
- PORT: process.env.PORT || process.env.WORKER_PORT,
23
- CLUSTER_PORT: process.env.CLUSTER_PORT,
20
+ // auth
24
21
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
25
22
  MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
26
- MINIO_URL: process.env.MINIO_URL,
27
- COUCH_DB_URL: process.env.COUCH_DB_URL,
28
- LOG_LEVEL: process.env.LOG_LEVEL,
29
23
  JWT_SECRET: process.env.JWT_SECRET,
30
24
  SALT_ROUNDS: process.env.SALT_ROUNDS,
31
- REDIS_URL: process.env.REDIS_URL,
32
25
  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
33
26
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
27
+ COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
28
+ // urls
29
+ MINIO_URL: process.env.MINIO_URL,
30
+ COUCH_DB_URL: process.env.COUCH_DB_URL,
31
+ REDIS_URL: process.env.REDIS_URL,
32
+ ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
33
+ PLATFORM_URL: process.env.PLATFORM_URL,
34
+ APPS_URL: process.env.APPS_URL,
35
+ // ports
36
+ PORT: process.env.PORT || process.env.WORKER_PORT,
37
+ CLUSTER_PORT: process.env.CLUSTER_PORT,
38
+ // flags
39
+ NODE_ENV: process.env.NODE_ENV,
40
+ SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
41
+ LOG_LEVEL: process.env.LOG_LEVEL,
34
42
  MULTI_TENANCY: process.env.MULTI_TENANCY,
35
43
  DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
36
- ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
37
44
  SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
45
+ DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
46
+ // smtp
38
47
  SMTP_USER: process.env.SMTP_USER,
39
48
  SMTP_PASSWORD: process.env.SMTP_PASSWORD,
40
49
  SMTP_HOST: process.env.SMTP_HOST,
41
50
  SMTP_PORT: process.env.SMTP_PORT,
42
51
  SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
43
- PLATFORM_URL: process.env.PLATFORM_URL,
44
- COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
45
- APPS_URL: process.env.APPS_URL,
46
52
  _set(key, value) {
47
53
  process.env[key] = value
48
54
  module.exports[key] = value