@budibase/worker 2.4.12-alpha.0 → 2.4.12
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.12
|
|
4
|
+
"version": "2.4.12",
|
|
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.12
|
|
39
|
+
"@budibase/backend-core": "^2.4.12",
|
|
40
40
|
"@budibase/pro": "2.4.11",
|
|
41
|
-
"@budibase/string-templates": "2.4.12
|
|
42
|
-
"@budibase/types": "2.4.12
|
|
41
|
+
"@budibase/string-templates": "^2.4.12",
|
|
42
|
+
"@budibase/types": "^2.4.12",
|
|
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": "ac4c0b3dd60c901691c7644c2f9aa6a5458b03f4"
|
|
105
105
|
}
|
|
@@ -204,16 +204,13 @@ export const googleCallback = async (ctx: any, next: any) => {
|
|
|
204
204
|
|
|
205
205
|
return passport.authenticate(
|
|
206
206
|
strategy,
|
|
207
|
-
{
|
|
208
|
-
successRedirect: env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT,
|
|
209
|
-
failureRedirect: env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT,
|
|
210
|
-
},
|
|
207
|
+
{ successRedirect: "/", failureRedirect: "/error" },
|
|
211
208
|
async (err: any, user: SSOUser, info: any) => {
|
|
212
209
|
await passportCallback(ctx, user, err, info)
|
|
213
210
|
await context.identity.doInUserContext(user, ctx, async () => {
|
|
214
211
|
await events.auth.login("google-internal", user.email)
|
|
215
212
|
})
|
|
216
|
-
ctx.redirect(
|
|
213
|
+
ctx.redirect("/")
|
|
217
214
|
}
|
|
218
215
|
)(ctx, next)
|
|
219
216
|
}
|
|
@@ -272,16 +269,13 @@ export const oidcCallback = async (ctx: any, next: any) => {
|
|
|
272
269
|
|
|
273
270
|
return passport.authenticate(
|
|
274
271
|
strategy,
|
|
275
|
-
{
|
|
276
|
-
successRedirect: env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT,
|
|
277
|
-
failureRedirect: env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT,
|
|
278
|
-
},
|
|
272
|
+
{ successRedirect: "/", failureRedirect: "/error" },
|
|
279
273
|
async (err: any, user: SSOUser, info: any) => {
|
|
280
274
|
await passportCallback(ctx, user, err, info)
|
|
281
275
|
await context.identity.doInUserContext(user, ctx, async () => {
|
|
282
276
|
await events.auth.login("oidc", user.email)
|
|
283
277
|
})
|
|
284
|
-
ctx.redirect(
|
|
278
|
+
ctx.redirect("/")
|
|
285
279
|
}
|
|
286
280
|
)(ctx, next)
|
|
287
281
|
}
|
package/src/environment.ts
CHANGED
|
@@ -69,15 +69,6 @@ const environment = {
|
|
|
69
69
|
* Mock the email service in use - links to ethereal hosted emails are logged instead.
|
|
70
70
|
*/
|
|
71
71
|
ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
|
|
72
|
-
PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT:
|
|
73
|
-
process.env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT || "/",
|
|
74
|
-
PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT:
|
|
75
|
-
process.env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT || "/error",
|
|
76
|
-
PASSPORT_OIDCAUTH_SUCCESS_REDIRECT:
|
|
77
|
-
process.env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT || "/",
|
|
78
|
-
PASSPORT_OIDCAUTH_FAILURE_REDIRECT:
|
|
79
|
-
process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error",
|
|
80
|
-
|
|
81
72
|
_set(key: any, value: any) {
|
|
82
73
|
process.env[key] = value
|
|
83
74
|
// @ts-ignore
|