@budibase/worker 2.8.22 → 2.8.23-alpha.0

package/__mocks__/@budibase/pro.ts

@@ -1,6 +1,10 @@
 const actual = jest.requireActual("@budibase/pro")
 const pro = {
   ...actual,
+  features: {
+    ...actual.features,
+    isSSOEnforced: jest.fn(),
+  },
   licensing: {
     keys: {
       activateLicenseKey: jest.fn(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.8.22",
+  "version": "2.8.23-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -38,10 +38,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.8.22",
-    "@budibase/pro": "2.8.22",
-    "@budibase/string-templates": "2.8.22",
-    "@budibase/types": "2.8.22",
+    "@budibase/backend-core": "2.8.23-alpha.0",
+    "@budibase/pro": "2.8.23-alpha.0",
+    "@budibase/string-templates": "2.8.23-alpha.0",
+    "@budibase/types": "2.8.23-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -104,5 +104,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "b0975991ddc123785883f3f871c527290a3ca538"
+  "gitHead": "1b460cd886d859d2bd8446291ea1d3bda2864396"
 }

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

@@ -507,17 +507,17 @@ export async function configChecklist(ctx: Ctx) {
           smtp: {
             checked: !!smtpConfig,
             label: "Set up email",
-            link: "/builder/portal/manage/email",
+            link: "/builder/portal/settings/email",
           },
           adminUser: {
             checked: userExists,
             label: "Create your first user",
-            link: "/builder/portal/manage/users",
+            link: "/builder/portal/users/users",
           },
           sso: {
             checked: !!googleConfig || !!oidcConfig,
             label: "Set up single sign-on",
-            link: "/builder/portal/manage/auth",
+            link: "/builder/portal/settings/auth",
           },
         }
       }

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

@@ -1,6 +1,6 @@
 import { sendEmail as sendEmailFn } from "../../../utilities/email"
 import { tenancy } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import { BBContext, User } from "@budibase/types"
 
 export async function sendEmail(ctx: BBContext) {
   let {
@@ -16,10 +16,10 @@ export async function sendEmail(ctx: BBContext) {
     automation,
     invite,
   } = ctx.request.body
-  let user
+  let user: any
   if (userId) {
     const db = tenancy.getGlobalDB()
-    user = await db.get(userId)
+    user = await db.get<User>(userId)
   }
   const response = await sendEmailFn(email, purpose, {
     workspaceId,

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

@@ -35,7 +35,7 @@ export async function find(ctx: BBContext) {
   const appId = ctx.params.appId
   await context.doInAppContext(dbCore.getDevAppID(appId), async () => {
     const db = context.getAppDB()
-    const app = await db.get(dbCore.DocumentType.APP_METADATA)
+    const app = await db.get<App>(dbCore.DocumentType.APP_METADATA)
     ctx.body = {
       roles: await roles.getAllRoles(),
       name: app.name,

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

@@ -44,7 +44,7 @@ export async function generateAPIKey(ctx: any) {
   const id = dbCore.generateDevInfoID(userId)
   let devInfo
   try {
-    devInfo = await db.get(id)
+    devInfo = await db.get<any>(id)
   } catch (err) {
     devInfo = { _id: id, userId }
   }

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

@@ -412,7 +412,7 @@ export const inviteAccept = async (
 
       const saved = await userSdk.save(request)
       const db = tenancy.getGlobalDB()
-      const user = await db.get(saved._id)
+      const user = await db.get<User>(saved._id)
       await events.user.inviteAccepted(user)
       return saved
     })

package/src/api/controllers/system/logs.ts

@@ -0,0 +1,13 @@
+import { UserCtx } from "@budibase/types"
+import { installation, logging } from "@budibase/backend-core"
+
+export async function getLogs(ctx: UserCtx) {
+  const logReadStream = logging.system.getLogReadStream()
+
+  const { installId } = await installation.getInstall()
+
+  const fileName = `${installId}-${Date.now()}.log`
+
+  ctx.set("content-disposition", `attachment; filename=${fileName}`)
+  ctx.body = logReadStream
+}

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

@@ -277,6 +277,7 @@ describe("configs", () => {
   describe("GET /api/global/configs/public", () => {
     it("should return the expected public settings", async () => {
       await saveSettingsConfig()
+      mocks.pro.features.isSSOEnforced.mockResolvedValue(false)
 
       const res = await config.api.configs.getPublicSettings()
       const body = res.body as GetPublicSettingsResponse

package/src/api/routes/index.ts

@@ -16,6 +16,9 @@ import licenseRoutes from "./global/license"
 import migrationRoutes from "./system/migrations"
 import accountRoutes from "./system/accounts"
 import restoreRoutes from "./system/restore"
+import systemLogRoutes from "./system/logs"
+
+import env from "../../environment"
 
 export const routes: Router[] = [
   configRoutes,
@@ -38,3 +41,7 @@ export const routes: Router[] = [
   eventRoutes,
   pro.scim,
 ]
+
+if (env.SELF_HOSTED) {
+  routes.push(systemLogRoutes)
+}

package/src/api/routes/system/logs.ts

@@ -0,0 +1,9 @@
+import Router from "@koa/router"
+import { middleware } from "@budibase/backend-core"
+import * as controller from "../../controllers/system/logs"
+
+const router: Router = new Router()
+
+router.get("/api/system/logs", middleware.adminOnly, controller.getLogs)
+
+export default router

package/src/sdk/users/tests/users.spec.ts

@@ -1,14 +1,9 @@
-import { structures } from "../../../tests"
-import { mocks } from "@budibase/backend-core/tests"
+import { structures, mocks } from "../../../tests"
 import { env, context } from "@budibase/backend-core"
 import * as users from "../users"
 import { CloudAccount } from "@budibase/types"
 import { isPreventPasswordActions } from "../users"
 
-jest.mock("@budibase/pro")
-import * as _pro from "@budibase/pro"
-const pro = jest.mocked(_pro, true)
-
 describe("users", () => {
   beforeEach(() => {
     jest.clearAllMocks()
@@ -56,7 +51,7 @@ describe("users", () => {
       it("returns true for all users when sso is enforced", async () => {
         await context.doInTenant(structures.tenant.id(), async () => {
           const user = structures.users.user()
-          pro.features.isSSOEnforced.mockResolvedValueOnce(true)
+          mocks.pro.features.isSSOEnforced.mockResolvedValueOnce(true)
           const result = await users.isPreventPasswordActions(user)
           expect(result).toBe(true)
         })