@budibase/worker 2.4.34 → 2.4.36
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.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/worker",
|
|
3
3
|
"email": "hi@budibase.com",
|
|
4
|
-
"version": "2.4.
|
|
4
|
+
"version": "2.4.36",
|
|
5
5
|
"description": "Budibase background service",
|
|
6
6
|
"main": "src/index.ts",
|
|
7
7
|
"repository": {
|
|
@@ -36,10 +36,10 @@
|
|
|
36
36
|
"author": "Budibase",
|
|
37
37
|
"license": "GPL-3.0",
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@budibase/backend-core": "^2.4.
|
|
40
|
-
"@budibase/pro": "2.4.
|
|
41
|
-
"@budibase/string-templates": "^2.4.
|
|
42
|
-
"@budibase/types": "^2.4.
|
|
39
|
+
"@budibase/backend-core": "^2.4.36",
|
|
40
|
+
"@budibase/pro": "2.4.35",
|
|
41
|
+
"@budibase/string-templates": "^2.4.36",
|
|
42
|
+
"@budibase/types": "^2.4.36",
|
|
43
43
|
"@koa/router": "8.0.8",
|
|
44
44
|
"@sentry/node": "6.17.7",
|
|
45
45
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"typescript": "4.7.3",
|
|
102
102
|
"update-dotenv": "1.1.1"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "6631e3faba10fcec90e316ac76a4a1d7dfd72112"
|
|
105
105
|
}
|
|
@@ -204,13 +204,16 @@ export const googleCallback = async (ctx: any, next: any) => {
|
|
|
204
204
|
|
|
205
205
|
return passport.authenticate(
|
|
206
206
|
strategy,
|
|
207
|
-
{
|
|
207
|
+
{
|
|
208
|
+
successRedirect: env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT,
|
|
209
|
+
failureRedirect: env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT,
|
|
210
|
+
},
|
|
208
211
|
async (err: any, user: SSOUser, info: any) => {
|
|
209
212
|
await passportCallback(ctx, user, err, info)
|
|
210
213
|
await context.identity.doInUserContext(user, ctx, async () => {
|
|
211
214
|
await events.auth.login("google-internal", user.email)
|
|
212
215
|
})
|
|
213
|
-
ctx.redirect(
|
|
216
|
+
ctx.redirect(env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT)
|
|
214
217
|
}
|
|
215
218
|
)(ctx, next)
|
|
216
219
|
}
|
|
@@ -269,13 +272,16 @@ export const oidcCallback = async (ctx: any, next: any) => {
|
|
|
269
272
|
|
|
270
273
|
return passport.authenticate(
|
|
271
274
|
strategy,
|
|
272
|
-
{
|
|
275
|
+
{
|
|
276
|
+
successRedirect: env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT,
|
|
277
|
+
failureRedirect: env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT,
|
|
278
|
+
},
|
|
273
279
|
async (err: any, user: SSOUser, info: any) => {
|
|
274
280
|
await passportCallback(ctx, user, err, info)
|
|
275
281
|
await context.identity.doInUserContext(user, ctx, async () => {
|
|
276
282
|
await events.auth.login("oidc", user.email)
|
|
277
283
|
})
|
|
278
|
-
ctx.redirect(
|
|
284
|
+
ctx.redirect(env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT)
|
|
279
285
|
}
|
|
280
286
|
)(ctx, next)
|
|
281
287
|
}
|
package/src/environment.ts
CHANGED
|
@@ -66,6 +66,15 @@ const environment = {
|
|
|
66
66
|
* Mock the email service in use - links to ethereal hosted emails are logged instead.
|
|
67
67
|
*/
|
|
68
68
|
ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
|
|
69
|
+
PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT:
|
|
70
|
+
process.env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT || "/",
|
|
71
|
+
PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT:
|
|
72
|
+
process.env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT || "/error",
|
|
73
|
+
PASSPORT_OIDCAUTH_SUCCESS_REDIRECT:
|
|
74
|
+
process.env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT || "/",
|
|
75
|
+
PASSPORT_OIDCAUTH_FAILURE_REDIRECT:
|
|
76
|
+
process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error",
|
|
77
|
+
|
|
69
78
|
_set(key: any, value: any) {
|
|
70
79
|
process.env[key] = value
|
|
71
80
|
// @ts-ignore
|