@budibase/backend-core 2.31.2 → 2.31.7
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/dist/index.js +259 -237
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/db/couch/DatabaseImpl.js +3 -2
- package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
- package/dist/src/db/utils.d.ts +0 -1
- package/dist/src/db/utils.js +0 -23
- package/dist/src/db/utils.js.map +1 -1
- package/dist/src/docIds/params.d.ts +1 -1
- package/dist/src/docIds/params.js +1 -1
- package/dist/src/docIds/params.js.map +1 -1
- package/dist/src/environment.d.ts +0 -3
- package/dist/src/environment.js +1 -2
- package/dist/src/environment.js.map +1 -1
- package/dist/src/features/index.d.ts +2 -0
- package/dist/src/features/index.js +4 -2
- package/dist/src/features/index.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/tenancy/db.d.ts +1 -1
- package/dist/src/tenancy/db.js +9 -2
- package/dist/src/tenancy/db.js.map +1 -1
- package/package.json +4 -4
- package/src/db/couch/DatabaseImpl.ts +5 -2
- package/src/db/tests/index.spec.ts +32 -0
- package/src/db/utils.ts +1 -32
- package/src/docIds/params.ts +1 -1
- package/src/environment.ts +0 -4
- package/src/features/index.ts +5 -3
- package/src/features/tests/features.spec.ts +1 -1
- package/src/tenancy/db.ts +11 -3
- package/src/db/tests/index.spec.js +0 -24
package/dist/src/environment.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a;
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
exports.SECRETS = void 0;
|
|
5
4
|
exports.setEnv = setEnv;
|
|
@@ -87,7 +86,7 @@ const environment = Object.assign(Object.assign({ isTest,
|
|
|
87
86
|
isApps,
|
|
88
87
|
isQA, isProd: () => {
|
|
89
88
|
return !isDev();
|
|
90
|
-
}, BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT, JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL,
|
|
89
|
+
}, BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT, JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK, ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL, COUCH_DB_USERNAME: process.env.COUCH_DB_USER, COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL || "localhost:6379", REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN, AWS_REGION: process.env.AWS_REGION, MINIO_URL: process.env.MINIO_URL, MINIO_ENABLED: process.env.MINIO_ENABLED || 1, INTERNAL_API_KEY: process.env.INTERNAL_API_KEY, INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK, MULTI_TENANCY: process.env.MULTI_TENANCY, ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app", ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "", DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL, SELF_HOSTED: selfHosted, COOKIE_DOMAIN: process.env.COOKIE_DOMAIN, PLATFORM_URL: process.env.PLATFORM_URL || "", POSTHOG_TOKEN: process.env.POSTHOG_TOKEN, POSTHOG_PERSONAL_TOKEN: process.env.POSTHOG_PERSONAL_TOKEN, POSTHOG_API_HOST: process.env.POSTHOG_API_HOST || "https://us.i.posthog.com", ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS, TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS, CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN, CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64, CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID, BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS, APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS, TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES, GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL, PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS, TEMP_BUCKET_NAME: process.env.TEMP_BUCKET_NAME || DefaultBucketName.TEMP, USE_COUCH: process.env.USE_COUCH || true, MOCK_REDIS: process.env.MOCK_REDIS, DEFAULT_LICENSE: process.env.DEFAULT_LICENSE, SERVICE: process.env.SERVICE || "budibase", LOG_LEVEL: process.env.LOG_LEVEL || "info", SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD, DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose", HTTP_LOGGING: httpLogging(), ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
|
|
91
90
|
// Couch/search
|
|
92
91
|
SQL_LOGGING_ENABLE: process.env.SQL_LOGGING_ENABLE, SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
|
|
93
92
|
// smtp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ const types_1 = require("@budibase/types");
|
|
|
45
45
|
const dd_trace_1 = __importDefault(require("dd-trace"));
|
|
46
46
|
let posthog;
|
|
47
47
|
function init(opts) {
|
|
48
|
-
if (environment_1.default.POSTHOG_TOKEN && environment_1.default.POSTHOG_API_HOST) {
|
|
48
|
+
if (environment_1.default.POSTHOG_TOKEN && environment_1.default.POSTHOG_API_HOST && !environment_1.default.SELF_HOSTED) {
|
|
49
49
|
console.log("initializing posthog client...");
|
|
50
50
|
posthog = new posthog_node_1.PostHog(environment_1.default.POSTHOG_TOKEN, Object.assign({ host: environment_1.default.POSTHOG_API_HOST, personalApiKey: environment_1.default.POSTHOG_PERSONAL_TOKEN }, opts));
|
|
51
51
|
}
|
|
@@ -248,6 +248,8 @@ exports.FlagSet = FlagSet;
|
|
|
248
248
|
// All of the machinery in this file is to make sure that flags have their
|
|
249
249
|
// default values set correctly and their types flow through the system.
|
|
250
250
|
exports.flags = new FlagSet({
|
|
251
|
-
DEFAULT_VALUES: Flag.boolean(
|
|
251
|
+
DEFAULT_VALUES: Flag.boolean(environment_1.default.isDev()),
|
|
252
|
+
SQS: Flag.boolean(environment_1.default.isDev()),
|
|
253
|
+
[types_1.FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(false),
|
|
252
254
|
});
|
|
253
255
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,oBAWC;AAED,4BAEC;AAtBD,iEAAgC;AAChC,oDAAqC;AACrC,+CAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -77,7 +77,7 @@ export declare const tenancy: {
|
|
|
77
77
|
getProdAppId: () => string;
|
|
78
78
|
getTenantDB(tenantId: string): import("@budibase/types").Database;
|
|
79
79
|
saveTenantInfo(tenantInfo: import("@budibase/types").TenantInfo): Promise<import("@budibase/nano").DocumentInsertResponse>;
|
|
80
|
-
getTenantInfo(tenantId: string): Promise<import("@budibase/types").TenantInfo>;
|
|
80
|
+
getTenantInfo(tenantId: string): Promise<import("@budibase/types").TenantInfo | undefined>;
|
|
81
81
|
addTenantToUrl(url: string): string;
|
|
82
82
|
isUserInAppTenant: (appId: string, user?: any) => boolean;
|
|
83
83
|
getTenantIDFromCtx: (ctx: import("@budibase/types").BBContext, opts: import("@budibase/types").GetTenantIdOptions) => string | undefined;
|
package/dist/src/tenancy/db.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { TenantInfo } from "@budibase/types";
|
|
2
2
|
export declare function getTenantDB(tenantId: string): import("@budibase/types").Database;
|
|
3
3
|
export declare function saveTenantInfo(tenantInfo: TenantInfo): Promise<import("@budibase/nano").DocumentInsertResponse>;
|
|
4
|
-
export declare function getTenantInfo(tenantId: string): Promise<TenantInfo>;
|
|
4
|
+
export declare function getTenantInfo(tenantId: string): Promise<TenantInfo | undefined>;
|
package/dist/src/tenancy/db.js
CHANGED
|
@@ -26,8 +26,15 @@ function saveTenantInfo(tenantInfo) {
|
|
|
26
26
|
}
|
|
27
27
|
function getTenantInfo(tenantId) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
try {
|
|
30
|
+
const db = getTenantDB(tenantId);
|
|
31
|
+
const tenantInfo = (yield db.get("tenant_info"));
|
|
32
|
+
delete tenantInfo.owner.password;
|
|
33
|
+
return tenantInfo;
|
|
34
|
+
}
|
|
35
|
+
catch (_a) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
31
38
|
});
|
|
32
39
|
}
|
|
33
40
|
//# sourceMappingURL=db.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/tenancy/db.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,kCAEC;AAED,wCAOC;AAED,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/tenancy/db.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,kCAEC;AAED,wCAOC;AAED,sCAWC;AA5BD,iCAAgC;AAChC,wCAA4C;AAG5C,SAAgB,WAAW,CAAC,QAAgB;IAC1C,OAAO,IAAA,UAAK,EAAC,IAAA,yBAAe,EAAC,QAAQ,CAAC,CAAC,CAAA;AACzC,CAAC;AAED,SAAsB,cAAc,CAAC,UAAsB;;QACzD,MAAM,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAC3C,6BAA6B;QAC7B,OAAO,EAAE,CAAC,GAAG,iBACX,GAAG,EAAE,aAAa,IACf,UAAU,EACb,CAAA;IACJ,CAAC;CAAA;AAED,SAAsB,aAAa,CACjC,QAAgB;;QAEhB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;YAChC,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAe,CAAA;YAC9D,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAA;YAChC,OAAO,UAAU,CAAA;QACnB,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.31.
|
|
3
|
+
"version": "2.31.7",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.11",
|
|
26
|
-
"@budibase/shared-core": "2.31.
|
|
27
|
-
"@budibase/types": "2.31.
|
|
26
|
+
"@budibase/shared-core": "2.31.7",
|
|
27
|
+
"@budibase/types": "2.31.7",
|
|
28
28
|
"aws-cloudfront-sign": "3.0.2",
|
|
29
29
|
"aws-sdk": "2.1030.0",
|
|
30
30
|
"bcrypt": "5.1.0",
|
|
@@ -95,5 +95,5 @@
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "a98ce68410543e6721e2670081aaaa43b1f7d80a"
|
|
99
99
|
}
|
|
@@ -25,8 +25,8 @@ import { newid } from "../../docIds/newid"
|
|
|
25
25
|
import { SQLITE_DESIGN_DOC_ID } from "../../constants"
|
|
26
26
|
import { DDInstrumentedDatabase } from "../instrumentation"
|
|
27
27
|
import { checkSlashesInUrl } from "../../helpers"
|
|
28
|
-
import env from "../../environment"
|
|
29
28
|
import { sqlLog } from "../../sql/utils"
|
|
29
|
+
import { flags } from "../../features"
|
|
30
30
|
|
|
31
31
|
const DATABASE_NOT_FOUND = "Database does not exist."
|
|
32
32
|
|
|
@@ -401,7 +401,10 @@ export class DatabaseImpl implements Database {
|
|
|
401
401
|
}
|
|
402
402
|
|
|
403
403
|
async destroy() {
|
|
404
|
-
if (
|
|
404
|
+
if (
|
|
405
|
+
(await flags.isEnabled("SQS")) &&
|
|
406
|
+
(await this.exists(SQLITE_DESIGN_DOC_ID))
|
|
407
|
+
) {
|
|
405
408
|
// delete the design document, then run the cleanup operation
|
|
406
409
|
const definition = await this.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
|
|
407
410
|
// remove all tables - save the definition then trigger a cleanup
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { doInTenant } from "../../context"
|
|
2
|
+
import { structures } from "../../../tests"
|
|
3
|
+
import { getDB } from "../db"
|
|
4
|
+
|
|
5
|
+
interface Doc {
|
|
6
|
+
_id: string
|
|
7
|
+
createdAt?: string
|
|
8
|
+
updatedAt?: string
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
describe("db", () => {
|
|
12
|
+
describe("getDB", () => {
|
|
13
|
+
it("returns a db", async () => {
|
|
14
|
+
const dbName = structures.db.id()
|
|
15
|
+
const db = getDB(dbName)
|
|
16
|
+
expect(db).toBeDefined()
|
|
17
|
+
expect(db.name).toBe(dbName)
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
it("uses the custom put function", async () => {
|
|
21
|
+
await doInTenant("foo", async () => {
|
|
22
|
+
const db = getDB(structures.db.id())
|
|
23
|
+
let doc: Doc = { _id: "test" }
|
|
24
|
+
await db.put(doc)
|
|
25
|
+
doc = await db.get(doc._id)
|
|
26
|
+
expect(doc.createdAt).toBe(new Date().toISOString())
|
|
27
|
+
expect(doc.updatedAt).toBe(new Date().toISOString())
|
|
28
|
+
await db.destroy()
|
|
29
|
+
})
|
|
30
|
+
})
|
|
31
|
+
})
|
|
32
|
+
})
|
package/src/db/utils.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import env from "../environment"
|
|
2
2
|
import { DEFAULT_TENANT_ID, SEPARATOR, DocumentType } from "../constants"
|
|
3
|
-
import { getTenantId, getGlobalDBName
|
|
3
|
+
import { getTenantId, getGlobalDBName } from "../context"
|
|
4
4
|
import { doWithDB, directCouchAllDbs } from "./db"
|
|
5
5
|
import { AppState, DeletedApp, getAppMetadata } from "../cache/appMetadata"
|
|
6
6
|
import { isDevApp, isDevAppID, getProdAppID } from "../docIds/conversions"
|
|
@@ -206,34 +206,3 @@ export function pagination<T>(
|
|
|
206
206
|
nextPage,
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
|
-
|
|
210
|
-
export function isSqsEnabledForTenant(): boolean {
|
|
211
|
-
const tenantId = getTenantId()
|
|
212
|
-
if (!env.SQS_SEARCH_ENABLE) {
|
|
213
|
-
return false
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
// single tenant (self host and dev) always enabled if flag set
|
|
217
|
-
if (!isMultiTenant()) {
|
|
218
|
-
return true
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
// This is to guard against the situation in tests where tests pass because
|
|
222
|
-
// we're not actually using SQS, we're using Lucene and the tests pass due to
|
|
223
|
-
// parity.
|
|
224
|
-
if (env.isTest() && env.SQS_SEARCH_ENABLE_TENANTS.length === 0) {
|
|
225
|
-
throw new Error(
|
|
226
|
-
"to enable SQS you must specify a list of tenants in the SQS_SEARCH_ENABLE_TENANTS env var"
|
|
227
|
-
)
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
// Special case to enable all tenants, for testing in QA.
|
|
231
|
-
if (
|
|
232
|
-
env.SQS_SEARCH_ENABLE_TENANTS.length === 1 &&
|
|
233
|
-
env.SQS_SEARCH_ENABLE_TENANTS[0] === "*"
|
|
234
|
-
) {
|
|
235
|
-
return true
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
return env.SQS_SEARCH_ENABLE_TENANTS.includes(tenantId)
|
|
239
|
-
}
|
package/src/docIds/params.ts
CHANGED
|
@@ -71,7 +71,7 @@ export function getQueryIndex(viewName: ViewName) {
|
|
|
71
71
|
export const isTableId = (id: string) => {
|
|
72
72
|
// this includes datasource plus tables
|
|
73
73
|
return (
|
|
74
|
-
id &&
|
|
74
|
+
!!id &&
|
|
75
75
|
(id.startsWith(`${DocumentType.TABLE}${SEPARATOR}`) ||
|
|
76
76
|
id.startsWith(`${DocumentType.DATASOURCE_PLUS}${SEPARATOR}`))
|
|
77
77
|
)
|
package/src/environment.ts
CHANGED
|
@@ -116,10 +116,6 @@ const environment = {
|
|
|
116
116
|
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
|
|
117
117
|
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
|
|
118
118
|
COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL,
|
|
119
|
-
SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE,
|
|
120
|
-
SQS_SEARCH_ENABLE_TENANTS:
|
|
121
|
-
process.env.SQS_SEARCH_ENABLE_TENANTS?.split(",") || [],
|
|
122
|
-
SQS_MIGRATION_ENABLE: process.env.SQS_MIGRATION_ENABLE,
|
|
123
119
|
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
|
|
124
120
|
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
|
|
125
121
|
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
|
package/src/features/index.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import env from "../environment"
|
|
2
2
|
import * as context from "../context"
|
|
3
3
|
import { PostHog, PostHogOptions } from "posthog-node"
|
|
4
|
-
import { IdentityType, UserCtx } from "@budibase/types"
|
|
4
|
+
import { FeatureFlag, IdentityType, UserCtx } from "@budibase/types"
|
|
5
5
|
import tracer from "dd-trace"
|
|
6
6
|
|
|
7
7
|
let posthog: PostHog | undefined
|
|
8
8
|
export function init(opts?: PostHogOptions) {
|
|
9
|
-
if (env.POSTHOG_TOKEN && env.POSTHOG_API_HOST) {
|
|
9
|
+
if (env.POSTHOG_TOKEN && env.POSTHOG_API_HOST && !env.SELF_HOSTED) {
|
|
10
10
|
console.log("initializing posthog client...")
|
|
11
11
|
posthog = new PostHog(env.POSTHOG_TOKEN, {
|
|
12
12
|
host: env.POSTHOG_API_HOST,
|
|
@@ -266,5 +266,7 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
|
|
|
266
266
|
// All of the machinery in this file is to make sure that flags have their
|
|
267
267
|
// default values set correctly and their types flow through the system.
|
|
268
268
|
export const flags = new FlagSet({
|
|
269
|
-
DEFAULT_VALUES: Flag.boolean(
|
|
269
|
+
DEFAULT_VALUES: Flag.boolean(env.isDev()),
|
|
270
|
+
SQS: Flag.boolean(env.isDev()),
|
|
271
|
+
[FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(false),
|
|
270
272
|
})
|
|
@@ -147,13 +147,13 @@ describe("feature flags", () => {
|
|
|
147
147
|
}) => {
|
|
148
148
|
const env: Partial<typeof environment> = {
|
|
149
149
|
TENANT_FEATURE_FLAGS: environmentFlags,
|
|
150
|
+
SELF_HOSTED: false,
|
|
150
151
|
}
|
|
151
152
|
|
|
152
153
|
if (posthogFlags) {
|
|
153
154
|
mockPosthogFlags(posthogFlags)
|
|
154
155
|
env.POSTHOG_TOKEN = "test"
|
|
155
156
|
env.POSTHOG_API_HOST = "https://us.i.posthog.com"
|
|
156
|
-
env.POSTHOG_PERSONAL_TOKEN = "test"
|
|
157
157
|
}
|
|
158
158
|
|
|
159
159
|
const ctx = { user: { license: { features: licenseFlags || [] } } }
|
package/src/tenancy/db.ts
CHANGED
|
@@ -15,7 +15,15 @@ export async function saveTenantInfo(tenantInfo: TenantInfo) {
|
|
|
15
15
|
})
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
export async function getTenantInfo(
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
export async function getTenantInfo(
|
|
19
|
+
tenantId: string
|
|
20
|
+
): Promise<TenantInfo | undefined> {
|
|
21
|
+
try {
|
|
22
|
+
const db = getTenantDB(tenantId)
|
|
23
|
+
const tenantInfo = (await db.get("tenant_info")) as TenantInfo
|
|
24
|
+
delete tenantInfo.owner.password
|
|
25
|
+
return tenantInfo
|
|
26
|
+
} catch {
|
|
27
|
+
return undefined
|
|
28
|
+
}
|
|
21
29
|
}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
require("../../../tests")
|
|
2
|
-
const { structures } = require("../../../tests")
|
|
3
|
-
const { getDB } = require("../db")
|
|
4
|
-
|
|
5
|
-
describe("db", () => {
|
|
6
|
-
describe("getDB", () => {
|
|
7
|
-
it("returns a db", async () => {
|
|
8
|
-
const dbName = structures.db.id()
|
|
9
|
-
const db = getDB(dbName)
|
|
10
|
-
expect(db).toBeDefined()
|
|
11
|
-
expect(db.name).toBe(dbName)
|
|
12
|
-
})
|
|
13
|
-
|
|
14
|
-
it("uses the custom put function", async () => {
|
|
15
|
-
const db = getDB(structures.db.id())
|
|
16
|
-
let doc = { _id: "test" }
|
|
17
|
-
await db.put(doc)
|
|
18
|
-
doc = await db.get(doc._id)
|
|
19
|
-
expect(doc.createdAt).toBe(new Date().toISOString())
|
|
20
|
-
expect(doc.updatedAt).toBe(new Date().toISOString())
|
|
21
|
-
await db.destroy()
|
|
22
|
-
})
|
|
23
|
-
})
|
|
24
|
-
})
|