From 91df9ffbc1f83698adf2020f9df94d67b63785fb Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 15 Feb 2023 13:49:30 +0000 Subject: [PATCH] Removing pro from backend-core. --- packages/backend-core/package.json | 1 - packages/backend-core/src/events/events.ts | 21 ++++++++++++++------- packages/backend-core/tsconfig.json | 6 ++---- packages/types/src/sdk/auditLogs.ts | 13 +++++++++++++ packages/types/src/sdk/index.ts | 1 + scripts/link-dependencies.sh | 4 ---- 6 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 packages/types/src/sdk/auditLogs.ts diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b51afcb8b1..705e4b1114 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -25,7 +25,6 @@ "@budibase/nano": "10.1.1", "@budibase/pouchdb-replication-stream": "1.2.10", "@budibase/types": "2.3.14-alpha.0", - "@budibase/pro": "2.3.14-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts index e54497c0cf..14ef50b69c 100644 --- a/packages/backend-core/src/events/events.ts +++ b/packages/backend-core/src/events/events.ts @@ -1,10 +1,15 @@ -import { Event, IdentityType } from "@budibase/types" -import { sdk } from "@budibase/pro" +import { Event, IdentityType, AuditLogFn } from "@budibase/types" import { processors } from "./processors" import identification from "./identification" import { getAppId } from "../context" import * as backfill from "./backfill" +let writeAuditLogs: AuditLogFn | undefined + +export const initAuditLogs = (fn: AuditLogFn) => { + writeAuditLogs = fn +} + export const publishEvent = async ( event: Event, properties: any, @@ -18,11 +23,13 @@ export const publishEvent = async ( if (!backfilling) { // only audit log actual events, don't include backfills const userId = identity.type === IdentityType.USER ? identity.id : undefined - await sdk.auditLogs.write(event, properties, { - userId, - timestamp, - appId: getAppId(), - }) + if (writeAuditLogs) { + await writeAuditLogs(event, properties, { + userId, + timestamp, + appId: getAppId(), + }) + } await processors.processEvent(event, identity, properties, timestamp) return } diff --git a/packages/backend-core/tsconfig.json b/packages/backend-core/tsconfig.json index 62944d7f2c..e95fb9ab4d 100644 --- a/packages/backend-core/tsconfig.json +++ b/packages/backend-core/tsconfig.json @@ -4,13 +4,11 @@ "composite": true, "baseUrl": ".", "paths": { - "@budibase/types": ["../types/src"], - "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] + "@budibase/types": ["../types/src"] } }, "references": [ - { "path": "../types" }, - { "path": "../../../budibase-pro/packages/pro" } + { "path": "../types" } ], "exclude": [ "node_modules", diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts new file mode 100644 index 0000000000..9f8eb3825c --- /dev/null +++ b/packages/types/src/sdk/auditLogs.ts @@ -0,0 +1,13 @@ +import { Event } from "./events" + +export type AuditWriteOpts = { + appId?: string + timestamp?: string | number + userId?: string +} + +export type AuditLogFn = ( + event: Event, + metadata: any, + opts: AuditWriteOpts +) => Promise diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts index f8f9d9cb97..1b0fdb193b 100644 --- a/packages/types/src/sdk/index.ts +++ b/packages/types/src/sdk/index.ts @@ -12,3 +12,4 @@ export * from "./db" export * from "./middleware" export * from "./featureFlag" export * from "./environmentVariables" +export * from "./auditLogs" diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 3a401e1f02..d2a501162b 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -53,10 +53,6 @@ if [ -d "../budibase-pro" ]; then echo "Linking pro to server" cd packages/server && yarn link '@budibase/pro' cd - - - echo "Linking pro to backend-core" - cd packages/backend-core && yarn link '@budibase/pro' - cd - fi if [ -d "../account-portal" ]; then