@budibase/worker 1.2.57 → 1.2.58-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.57",
+  "version": "1.2.58-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.2.57",
-    "@budibase/pro": "1.2.56",
-    "@budibase/string-templates": "^1.2.57",
-    "@budibase/types": "^1.2.57",
+    "@budibase/backend-core": "1.2.58-alpha.0",
+    "@budibase/pro": "1.2.57",
+    "@budibase/string-templates": "1.2.58-alpha.0",
+    "@budibase/types": "1.2.58-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -102,5 +102,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "605b91baf8bed0f1ffbb2d3304d4525c866bdd77"
+  "gitHead": "8b6f73f3988363bc2dca66bf1eff240b663a61c4"
 }

package/src/api/controllers/global/auth.ts

@@ -227,9 +227,22 @@ export const oidcPreAuth = async (ctx: any, next: any) => {
 
   setCookie(ctx, configId, Cookies.OIDC_CONFIG)
 
+  const db = getGlobalDB()
+  const config = await core.db.getScopedConfig(db, {
+    type: Configs.OIDC,
+    group: ctx.query.group,
+  })
+
+  const chosenConfig = config.configs.filter((c: any) => c.uuid === configId)[0]
+
+  let authScopes =
+    chosenConfig.scopes?.length > 0
+      ? chosenConfig.scopes
+      : ["profile", "email", "offline_access"]
+
   return passport.authenticate(strategy, {
     // required 'openid' scope is added by oidc strategy factory
-    scope: ["profile", "email", "offline_access"], //auth0 offline_access scope required for the refresh token behaviour.
+    scope: authScopes,
   })(ctx, next)
 }
 

package/src/api/routes/global/configs.js

@@ -53,6 +53,7 @@ function oidcValidation() {
         name: Joi.string().allow("", null),
         uuid: Joi.string().required(),
         activated: Joi.boolean().required(),
+        scopes: Joi.array().optional()
       })
     ).required(true)
   }).unknown(true)