@budibase/backend-core 2.30.2 → 2.30.3

package/src/security/tests/auth.spec.ts

@@ -4,7 +4,7 @@ import { PASSWORD_MAX_LENGTH, validatePassword } from "../auth"
 describe("auth", () => {
   describe("validatePassword", () => {
     it("a valid password returns successful", () => {
-      expect(validatePassword("password")).toEqual({ valid: true })
+      expect(validatePassword("password123!")).toEqual({ valid: true })
     })
 
     it.each([
@@ -14,7 +14,7 @@ describe("auth", () => {
     ])("%s returns unsuccessful", (_, password) => {
       expect(validatePassword(password as string)).toEqual({
         valid: false,
-        error: "Password invalid. Minimum 8 characters.",
+        error: "Password invalid. Minimum 12 characters.",
       })
     })
 

package/src/sql/sqlTable.ts

@@ -28,16 +28,25 @@ function generateSchema(
   oldTable: null | Table = null,
   renamed?: RenameColumn
 ) {
-  let primaryKey = table && table.primary ? table.primary[0] : null
+  let primaryKeys = table && table.primary ? table.primary : []
   const columns = Object.values(table.schema)
   // all columns in a junction table will be meta
   let metaCols = columns.filter(col => (col as NumberFieldMetadata).meta)
   let isJunction = metaCols.length === columns.length
+  let columnTypeSet: string[] = []
+
   // can't change primary once its set for now
-  if (primaryKey && !oldTable && !isJunction) {
-    schema.increments(primaryKey).primary()
-  } else if (!oldTable && isJunction) {
-    schema.primary(metaCols.map(col => col.name))
+  if (!oldTable) {
+    // junction tables are special - we have an expected format
+    if (isJunction) {
+      schema.primary(metaCols.map(col => col.name))
+    } else if (primaryKeys.length === 1) {
+      schema.increments(primaryKeys[0]).primary()
+      // note that we've set its type
+      columnTypeSet.push(primaryKeys[0])
+    } else {
+      schema.primary(primaryKeys)
+    }
   }
 
   // check if any columns need added
@@ -49,7 +58,7 @@ function generateSchema(
     const oldColumn = oldTable ? oldTable.schema[key] : null
     if (
       (oldColumn && oldColumn.type) ||
-      (primaryKey === key && !isJunction) ||
+      columnTypeSet.includes(key) ||
       renamed?.updated === key
     ) {
       continue
@@ -61,7 +70,12 @@ function generateSchema(
       case FieldType.LONGFORM:
       case FieldType.BARCODEQR:
       case FieldType.BB_REFERENCE_SINGLE:
-        schema.text(key)
+        // primary key strings have to have a length in some DBs
+        if (primaryKeys.includes(key)) {
+          schema.string(key, 255)
+        } else {
+          schema.text(key)
+        }
         break
       case FieldType.NUMBER:
         // if meta is specified then this is a junction table entry

package/tests/core/utilities/mocks/index.ts

@@ -5,7 +5,5 @@ export const accounts = jest.mocked(_accounts)
 
 export * as date from "./date"
 export * as licenses from "./licenses"
-export { default as fetch } from "./fetch"
 export * from "./alerts"
 import "./events"
-import "./posthog"

package/tests/core/utilities/structures/users.ts

@@ -21,7 +21,7 @@ export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
     _id: userId,
     userId,
     email: newEmail(),
-    password: "password",
+    password: "password123!",
     roles: { app_test: "admin" },
     firstName: generator.first(),
     lastName: generator.last(),

package/tests/jestSetup.ts

@@ -2,14 +2,21 @@ import "./core/logging"
 import env from "../src/environment"
 import { cleanup } from "../src/timers"
 import { mocks, testContainerUtils } from "./core/utilities"
-
-// must explicitly enable fetch mock
-mocks.fetch.enable()
+import nock from "nock"
 
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 import tk from "timekeeper"
 
+nock.disableNetConnect()
+nock.enableNetConnect(host => {
+  return (
+    host.includes("localhost") ||
+    host.includes("127.0.0.1") ||
+    host.includes("::1")
+  )
+})
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.DEBUG) {

package/dist/tests/core/utilities/mocks/fetch.d.ts

@@ -1,32 +0,0 @@
-declare const _default: {
-    enable: () => void;
-    apply(this: Function, thisArg: any, argArray?: any): any;
-    call(this: Function, thisArg: any, ...argArray: any[]): any;
-    bind(this: Function, thisArg: any, ...argArray: any[]): any;
-    toString(): string;
-    prototype: any;
-    length: number;
-    arguments: any;
-    caller: Function;
-    name: string;
-    [Symbol.hasInstance](value: any): boolean;
-    getMockName(): string;
-    mock: jest.MockContext<any, [url: any, opts: any], any>;
-    mockClear(): jest.Mock<any, [url: any, opts: any], any>;
-    mockReset(): jest.Mock<any, [url: any, opts: any], any>;
-    mockRestore(): void;
-    getMockImplementation(): ((...args: [url: any, opts: any]) => any) | undefined;
-    mockImplementation(fn?: ((url: any, opts: any) => any) | undefined): jest.Mock<any, [url: any, opts: any], any>;
-    mockImplementationOnce(fn: (url: any, opts: any) => any): jest.Mock<any, [url: any, opts: any], any>;
-    withImplementation(fn: (url: any, opts: any) => any, callback: () => Promise<unknown>): Promise<void>;
-    withImplementation(fn: (url: any, opts: any) => any, callback: () => void): void;
-    mockName(name: string): jest.Mock<any, [url: any, opts: any], any>;
-    mockReturnThis(): jest.Mock<any, [url: any, opts: any], any>;
-    mockReturnValue(value: any): jest.Mock<any, [url: any, opts: any], any>;
-    mockReturnValueOnce(value: any): jest.Mock<any, [url: any, opts: any], any>;
-    mockResolvedValue(value: any): jest.Mock<any, [url: any, opts: any], any>;
-    mockResolvedValueOnce(value: any): jest.Mock<any, [url: any, opts: any], any>;
-    mockRejectedValue(value: any): jest.Mock<any, [url: any, opts: any], any>;
-    mockRejectedValueOnce(value: any): jest.Mock<any, [url: any, opts: any], any>;
-};
-export default _default;

package/dist/tests/core/utilities/mocks/fetch.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mockFetch = jest.fn((url, opts) => {
-    const fetch = jest.requireActual("node-fetch");
-    const env = jest.requireActual("../../../../src/environment").default;
-    if (url.includes(env.COUCH_DB_URL) || url.includes("raw.github")) {
-        return fetch(url, opts);
-    }
-    return undefined;
-});
-const enable = () => {
-    jest.mock("node-fetch", () => mockFetch);
-};
-exports.default = Object.assign(Object.assign({}, mockFetch), { enable });
-//# sourceMappingURL=fetch.js.map

package/dist/tests/core/utilities/mocks/fetch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/fetch.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,6BAA6B,CAAC,CAAC,OAAO,CAAA;IACrE,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACjE,OAAO,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAC,CAAA;AAEF,MAAM,MAAM,GAAG,GAAG,EAAE;IAClB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,kDACK,SAAS,KACZ,MAAM,IACP"}

package/dist/tests/core/utilities/mocks/posthog.js

@@ -1,9 +0,0 @@
-"use strict";
-jest.mock("posthog-node", () => {
-    return jest.fn().mockImplementation(() => {
-        return {
-            capture: jest.fn(),
-        };
-    });
-});
-//# sourceMappingURL=posthog.js.map

package/dist/tests/core/utilities/mocks/posthog.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"posthog.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/mocks/posthog.ts"],"names":[],"mappings":";AAAA,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;QACvC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;SACnB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/tests/core/utilities/mocks/fetch.ts

@@ -1,17 +0,0 @@
-const mockFetch = jest.fn((url: any, opts: any) => {
-  const fetch = jest.requireActual("node-fetch")
-  const env = jest.requireActual("../../../../src/environment").default
-  if (url.includes(env.COUCH_DB_URL) || url.includes("raw.github")) {
-    return fetch(url, opts)
-  }
-  return undefined
-})
-
-const enable = () => {
-  jest.mock("node-fetch", () => mockFetch)
-}
-
-export default {
-  ...mockFetch,
-  enable,
-}

package/tests/core/utilities/mocks/posthog.ts

@@ -1,7 +0,0 @@
-jest.mock("posthog-node", () => {
-  return jest.fn().mockImplementation(() => {
-    return {
-      capture: jest.fn(),
-    }
-  })
-})