@budibase/worker 2.4.5-alpha.1 → 2.4.5

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.5-alpha.1",
+  "version": "2.4.5",
+  "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
     "type": "git",
@@ -35,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.5-alpha.1",
-    "@budibase/pro": "2.4.5-alpha.0",
-    "@budibase/string-templates": "2.4.5-alpha.1",
-    "@budibase/types": "2.4.5-alpha.1",
+    "@budibase/backend-core": "^2.4.5",
+    "@budibase/pro": "2.4.4",
+    "@budibase/string-templates": "^2.4.5",
+    "@budibase/types": "^2.4.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -100,5 +101,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "85f8b761dd827719c26b5e8f73561d3a1ae617be"
+  "gitHead": "bbf52a9c30022f275eaf6f1a4591bbc268678354"
 }

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

@@ -204,16 +204,13 @@ export const googleCallback = async (ctx: any, next: any) => {
 
   return passport.authenticate(
     strategy,
-    {
-      successRedirect: env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT,
-      failureRedirect: env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT,
-    },
+    { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, user: SSOUser, info: any) => {
       await passportCallback(ctx, user, err, info)
       await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("google-internal", user.email)
       })
-      ctx.redirect(env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT)
+      ctx.redirect("/")
     }
   )(ctx, next)
 }
@@ -272,16 +269,13 @@ export const oidcCallback = async (ctx: any, next: any) => {
 
   return passport.authenticate(
     strategy,
-    {
-      successRedirect: env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT,
-      failureRedirect: env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT,
-    },
+    { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, user: SSOUser, info: any) => {
       await passportCallback(ctx, user, err, info)
       await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("oidc", user.email)
       })
-      ctx.redirect(env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT)
+      ctx.redirect("/")
     }
   )(ctx, next)
 }

package/src/api/routes/global/tests/users.spec.ts

@@ -4,6 +4,7 @@ jest.mock("nodemailer")
 import { TestConfiguration, mocks, structures } from "../../../../tests"
 const sendMailMock = mocks.email.mock()
 import { events, tenancy, accounts as _accounts } from "@budibase/backend-core"
+import * as userSdk from "../../../../sdk/users"
 
 const accounts = jest.mocked(_accounts)
 
@@ -468,6 +469,20 @@ describe("/api/global/users", () => {
         config.authHeaders(nonAdmin)
       )
     })
+
+    describe("sso users", () => {
+      function createSSOUser() {
+        return config.doInTenant(() => {
+          const user = structures.users.ssoUser()
+          return userSdk.save(user, { requirePassword: false })
+        })
+      }
+
+      it("should be able to update an sso user that has no password", async () => {
+        const user = await createSSOUser()
+        await config.api.users.saveUser(user)
+      })
+    })
   })
 
   describe("POST /api/global/users/bulk (delete)", () => {

package/src/environment.ts

@@ -69,15 +69,6 @@ const environment = {
    * Mock the email service in use - links to ethereal hosted emails are logged instead.
    */
   ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
-  PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT:
-    process.env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT || "/",
-  PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT:
-    process.env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT || "/error",
-  PASSPORT_OIDCAUTH_SUCCESS_REDIRECT:
-    process.env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT || "/",
-  PASSPORT_OIDCAUTH_FAILURE_REDIRECT:
-    process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error",
-
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore

package/src/sdk/users/users.ts

@@ -131,6 +131,11 @@ const buildUser = async (
 ): Promise<User> => {
   let { password, _id } = user
 
+  // don't require a password if the db user doesn't already have one
+  if (dbUser && !dbUser.password) {
+    opts.requirePassword = false
+  }
+
   let hashedPassword
   if (password) {
     if (await isPreventPasswordActions(user)) {