@budibase/worker 2.2.12-alpha.2 → 2.2.12

package/src/constants/index.ts

@@ -27,14 +27,6 @@ export enum EmailTemplatePurpose {
   CUSTOM = "custom",
 }
 
-export enum TemplateMetadataNames {
-  BASE = "Base format",
-  PASSWORD_RECOVERY = "Password recovery",
-  WELCOME = "User welcome",
-  INVITATION = "User invitation",
-  CUSTOM = "Custom",
-}
-
 export enum InternalTemplateBinding {
   PLATFORM_URL = "platformUrl",
   COMPANY = "company",
@@ -101,7 +93,7 @@ export const TemplateBindings = {
 export const TemplateMetadata = {
   [TemplateType.EMAIL]: [
     {
-      name: TemplateMetadataNames.BASE,
+      name: "Base format",
       description:
         "This is the base template, all others are based on it. The {{ body }} will be replaced with another email template.",
       category: "miscellaneous",
@@ -118,7 +110,7 @@ export const TemplateMetadata = {
       ],
     },
     {
-      name: TemplateMetadataNames.PASSWORD_RECOVERY,
+      name: "Password recovery",
       description:
         "When a user requests a password reset they will receive an email built with this template.",
       category: "user management",
@@ -137,7 +129,7 @@ export const TemplateMetadata = {
       ],
     },
     {
-      name: TemplateMetadataNames.WELCOME,
+      name: "User welcome",
       description:
         "When a new user is added they will be sent a welcome email using this template.",
       category: "user management",
@@ -145,7 +137,7 @@ export const TemplateMetadata = {
       bindings: [],
     },
     {
-      name: TemplateMetadataNames.INVITATION,
+      name: "User invitation",
       description:
         "When inviting a user via the email on-boarding this template will be used.",
       category: "user management",
@@ -164,7 +156,7 @@ export const TemplateMetadata = {
       ],
     },
     {
-      name: TemplateMetadataNames.CUSTOM,
+      name: "Custom",
       description:
         "A custom template, this is currently used for SMTP email actions in automations.",
       category: "automations",

package/src/environment.ts

@@ -91,11 +91,6 @@ for (let [key, value] of Object.entries(environment)) {
     // @ts-ignore
     environment[key] = 0
   }
-  // handle the edge case of "false" to disable an environment variable
-  if (value === "false") {
-    // @ts-ignore
-    environment[key] = 0
-  }
 }
 
 export = environment

package/src/index.ts

@@ -24,7 +24,7 @@ import * as redis from "./utilities/redis"
 const Sentry = require("@sentry/node")
 const koaSession = require("koa-session")
 const logger = require("koa-pino-logger")
-import destroyable from "server-destroy"
+const destroyable = require("server-destroy")
 
 // this will setup http and https proxies form env variables
 bootstrap()
@@ -79,6 +79,7 @@ server.on("close", async () => {
 
 const shutdown = () => {
   server.close()
+  // @ts-ignore
   server.destroy()
 }
 

package/src/sdk/users/users.ts

@@ -25,7 +25,6 @@ import {
   InviteUsersRequest,
   InviteUsersResponse,
   MigrationType,
-  PlatformUser,
   PlatformUserByEmail,
   RowResponse,
   SearchUsersRequest,
@@ -154,26 +153,10 @@ const buildUser = async (
   return fullUser
 }
 
-// lookup, could be email or userId, either will return a doc
-export const getPlatformUser = async (
-  identifier: string
-): Promise<PlatformUser | null> => {
-  // use the view here and allow to find anyone regardless of casing
-  // Use lowercase to ensure email login is case insensitive
-  const response = dbUtils.queryPlatformView(
-    ViewName.PLATFORM_USERS_LOWERCASE,
-    {
-      keys: [identifier.toLowerCase()],
-      include_docs: true,
-    }
-  ) as Promise<PlatformUser>
-  return response
-}
-
 const validateUniqueUser = async (email: string, tenantId: string) => {
   // check budibase users in other tenants
   if (env.MULTI_TENANCY) {
-    const tenantUser = await getPlatformUser(email)
+    const tenantUser = await tenancy.getTenantUser(email)
     if (tenantUser != null && tenantUser.tenantId !== tenantId) {
       throw `Unavailable`
     }

package/src/tests/TestConfiguration.ts

@@ -1,12 +1,4 @@
-import mocks from "./mocks"
-
-// init the licensing mock
-import * as pro from "@budibase/pro"
-mocks.licenses.init(pro)
-
-// use unlimited license by default
-mocks.licenses.useUnlimited()
-
+import "./mocks"
 import * as dbConfig from "../db"
 dbConfig.init()
 import env from "../environment"

package/src/tests/api/index.ts

@@ -10,10 +10,7 @@ import { MigrationAPI } from "./migrations"
 import { StatusAPI } from "./status"
 import { RestoreAPI } from "./restore"
 import { TenantAPI } from "./tenants"
-import { GroupsAPI } from "./groups"
-import { RolesAPI } from "./roles"
-import { TemplatesAPI } from "./templates"
-import { LicenseAPI } from "./license"
+
 export default class API {
   accounts: AccountAPI
   auth: AuthAPI
@@ -26,10 +23,6 @@ export default class API {
   status: StatusAPI
   restore: RestoreAPI
   tenants: TenantAPI
-  groups: GroupsAPI
-  roles: RolesAPI
-  templates: TemplatesAPI
-  license: LicenseAPI
 
   constructor(config: TestConfiguration) {
     this.accounts = new AccountAPI(config)
@@ -43,9 +36,5 @@ export default class API {
     this.status = new StatusAPI(config)
     this.restore = new RestoreAPI(config)
     this.tenants = new TenantAPI(config)
-    this.groups = new GroupsAPI(config)
-    this.roles = new RolesAPI(config)
-    this.templates = new TemplatesAPI(config)
-    this.license = new LicenseAPI(config)
   }
 }

package/src/tests/jestSetup.ts

@@ -22,9 +22,7 @@ mocks.fetch.enable()
 const tk = require("timekeeper")
 tk.freeze(mocks.date.MOCK_DATE)
 
-if (!process.env.DEBUG) {
-  global.console.log = jest.fn() // console.log are ignored in tests
-}
+global.console.log = jest.fn() // console.log are ignored in tests
 
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging

package/src/tests/mocks/{email.ts → email.js}

@@ -1,4 +1,4 @@
-export function mock() {
+exports.mock = () => {
   // mock the email system
   const sendMailMock = jest.fn()
   const nodemailer = require("nodemailer")

package/src/tests/mocks/index.ts

@@ -1,7 +1,7 @@
-import * as email from "./email"
-import { mocks } from "@budibase/backend-core/tests"
+const email = require("./email")
+import { mocks as coreMocks } from "@budibase/backend-core/tests"
 
 export = {
   email,
-  ...mocks,
+  ...coreMocks,
 }

package/src/tests/structures/configs.ts

@@ -1,5 +1,5 @@
-import { Config } from "../../constants"
-import { utils } from "@budibase/backend-core"
+const { Config } = require("../../constants")
+const { utils } = require("@budibase/backend-core")
 
 export function oidc(conf?: any) {
   return {

package/src/tests/structures/groups.ts

@@ -4,7 +4,7 @@ export const UserGroup = () => {
     color: "var(--spectrum-global-color-blue-600)",
     icon: "UserGroup",
     name: "New group",
-    roles: { app_uuid1: "ADMIN", app_uuid2: "POWER" },
+    roles: {},
     users: [],
   }
   return group

package/src/tests/structures/users.ts

@@ -10,7 +10,7 @@ export const user = (userProps?: any): User => {
   return {
     email: newEmail(),
     password: "test",
-    roles: { app_test: "admin" },
+    roles: {},
     ...userProps,
   }
 }

package/tsconfig.json

@@ -25,6 +25,7 @@
     "package.json"
   ],
   "exclude": [
+    "node_modules",
     "dist"
   ]
 }

package/coverage/lcov-report/src/tests/api/groups.ts.html

@@ -1,163 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for src/tests/api/groups.ts</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../../prettify.css" />
-    <link rel="stylesheet" href="../../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(../../../sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/tests/api</a> groups.ts</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>7/7</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>0/0</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>3/3</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>7/7</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
-        </p>
-        <template id="filterTemplate">
-            <div class="quiet">
-                Filter:
-                <input oninput="onInput()" type="search" id="fileSearch">
-            </div>
-        </template>
-    </div>
-    <div class='status-line high'></div>
-    <pre><table class="coverage">
-<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
-<a name='L2'></a><a href='#L2'>2</a>
-<a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a>
-<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a>
-<a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a>
-<a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a>
-<a name='L15'></a><a href='#L15'>15</a>
-<a name='L16'></a><a href='#L16'>16</a>
-<a name='L17'></a><a href='#L17'>17</a>
-<a name='L18'></a><a href='#L18'>18</a>
-<a name='L19'></a><a href='#L19'>19</a>
-<a name='L20'></a><a href='#L20'>20</a>
-<a name='L21'></a><a href='#L21'>21</a>
-<a name='L22'></a><a href='#L22'>22</a>
-<a name='L23'></a><a href='#L23'>23</a>
-<a name='L24'></a><a href='#L24'>24</a>
-<a name='L25'></a><a href='#L25'>25</a>
-<a name='L26'></a><a href='#L26'>26</a>
-<a name='L27'></a><a href='#L27'>27</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { UserGroup } from "@budibase/types"
-import TestConfiguration from "../TestConfiguration"
-import { TestAPI } from "./base"
-&nbsp;
-export class GroupsAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-&nbsp;
-  saveGroup = (group: UserGroup) =&gt; {
-    return this.request
-      .post(`/api/global/groups`)
-      .send(group)
-      .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
-      .expect(200)
-  }
-&nbsp;
-  deleteGroup = (id: string, rev: string) =&gt; {
-    return this.request
-      .delete(`/api/global/groups/${id}/${rev}`)
-      .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
-      .expect(200)
-  }
-}
-&nbsp;</pre></td></tr></table></pre>
-
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jan 09 2023 12:34:35 GMT+0000 (Coordinated Universal Time)
-            </div>
-        <script src="../../../prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="../../../sorter.js"></script>
-        <script src="../../../block-navigation.js"></script>
-    </body>
-</html>
-    

package/coverage/lcov-report/src/tests/api/license.ts.html

@@ -1,136 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for src/tests/api/license.ts</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../../prettify.css" />
-    <link rel="stylesheet" href="../../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(../../../sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/tests/api</a> license.ts</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">66.66% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>4/6</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>0/0</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">33.33% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>1/3</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>4/5</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
-        </p>
-        <template id="filterTemplate">
-            <div class="quiet">
-                Filter:
-                <input oninput="onInput()" type="search" id="fileSearch">
-            </div>
-        </template>
-    </div>
-    <div class='status-line medium'></div>
-    <pre><table class="coverage">
-<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
-<a name='L2'></a><a href='#L2'>2</a>
-<a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a>
-<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a>
-<a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a>
-<a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a>
-<a name='L15'></a><a href='#L15'>15</a>
-<a name='L16'></a><a href='#L16'>16</a>
-<a name='L17'></a><a href='#L17'>17</a>
-<a name='L18'></a><a href='#L18'>18</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import TestConfiguration from "../TestConfiguration"
-import { TestAPI } from "./base"
-&nbsp;
-export class LicenseAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-&nbsp;
-  activate = <span class="fstat-no" title="function not covered" >async (l</span>icenseKey: string) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
-<span class="cstat-no" title="statement not covered" >    return this.request</span>
-      .post("/api/global/license/activate")
-      .send({ licenseKey: licenseKey })
-      .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
-      .expect(200)
-  }
-}
-&nbsp;</pre></td></tr></table></pre>
-
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jan 09 2023 12:34:35 GMT+0000 (Coordinated Universal Time)
-            </div>
-        <script src="../../../prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="../../../sorter.js"></script>
-        <script src="../../../block-navigation.js"></script>
-    </body>
-</html>
-