@budibase/backend-core 2.8.28-alpha.0 → 2.8.28
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/package.json +3 -4
- package/dist/src/auth/auth.js.map +1 -1
- package/dist/src/cache/appMetadata.d.ts +1 -7
- package/dist/src/cache/appMetadata.js +8 -5
- package/dist/src/cache/appMetadata.js.map +1 -1
- package/dist/src/cache/user.js.map +1 -1
- package/dist/src/constants/misc.d.ts +0 -2
- package/dist/src/constants/misc.js +0 -2
- package/dist/src/constants/misc.js.map +1 -1
- package/dist/src/db/couch/index.d.ts +0 -1
- package/dist/src/db/couch/index.js +0 -1
- package/dist/src/db/couch/index.js.map +1 -1
- package/dist/src/db/searchIndexes/searchIndexes.js.map +1 -1
- package/dist/src/db/utils.js +2 -7
- package/dist/src/db/utils.js.map +1 -1
- package/dist/src/environment.d.ts +4 -6
- package/dist/src/environment.js +71 -13
- package/dist/src/environment.js.map +1 -1
- package/dist/src/logging/index.d.ts +1 -1
- package/dist/src/logging/index.js +3 -2
- package/dist/src/logging/index.js.map +1 -1
- package/dist/src/logging/pino/logger.js +24 -40
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/src/users.js.map +1 -1
- package/dist/tests/core/utilities/jestUtils.d.ts +0 -7
- package/dist/tests/core/utilities/jestUtils.js +1 -14
- package/dist/tests/core/utilities/jestUtils.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -4
- package/src/auth/auth.ts +1 -1
- package/src/cache/appMetadata.ts +8 -10
- package/src/cache/user.ts +1 -1
- package/src/constants/misc.ts +0 -2
- package/src/db/couch/index.ts +0 -1
- package/src/db/searchIndexes/searchIndexes.ts +1 -1
- package/src/db/utils.ts +3 -9
- package/src/environment.ts +4 -12
- package/src/logging/index.ts +3 -1
- package/src/logging/pino/logger.ts +24 -45
- package/src/users.ts +2 -2
- package/tests/core/utilities/jestUtils.ts +0 -21
- package/dist/src/db/constants.d.ts +0 -2
- package/dist/src/db/constants.js +0 -13
- package/dist/src/db/constants.js.map +0 -1
- package/dist/src/logging/system.d.ts +0 -9
- package/dist/src/logging/system.js +0 -101
- package/dist/src/logging/system.js.map +0 -1
- package/src/db/constants.ts +0 -10
- package/src/logging/system.ts +0 -81
- package/src/logging/tests/system.spec.ts +0 -61
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.8.28
|
|
3
|
+
"version": "2.8.28",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@budibase/nano": "10.1.2",
|
|
24
24
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
25
|
-
"@budibase/types": "2.8.28
|
|
25
|
+
"@budibase/types": "2.8.28",
|
|
26
26
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
27
27
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
28
28
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -51,7 +51,6 @@
|
|
|
51
51
|
"pouchdb": "7.3.0",
|
|
52
52
|
"pouchdb-find": "7.2.2",
|
|
53
53
|
"redlock": "4.2.0",
|
|
54
|
-
"rotating-file-stream": "3.1.0",
|
|
55
54
|
"sanitize-s3-objectkey": "0.0.1",
|
|
56
55
|
"semver": "7.3.7",
|
|
57
56
|
"tar-fs": "2.1.1",
|
|
@@ -102,5 +101,5 @@
|
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
103
|
},
|
|
105
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "07e0c18f914be17cfef131d6d918baa0f2d392a0"
|
|
106
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth/auth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,4 @@
|
|
|
1
1
|
import { App } from "@budibase/types";
|
|
2
|
-
export declare enum AppState {
|
|
3
|
-
INVALID = "invalid"
|
|
4
|
-
}
|
|
5
|
-
export interface DeletedApp {
|
|
6
|
-
state: AppState;
|
|
7
|
-
}
|
|
8
2
|
/**
|
|
9
3
|
* Get the requested app metadata by id.
|
|
10
4
|
* Use redis cache to first read the app metadata.
|
|
@@ -12,7 +6,7 @@ export interface DeletedApp {
|
|
|
12
6
|
* @param {string} appId the id of the app to get metadata from.
|
|
13
7
|
* @returns {object} the app metadata.
|
|
14
8
|
*/
|
|
15
|
-
export declare function getAppMetadata(appId: string): Promise<App
|
|
9
|
+
export declare function getAppMetadata(appId: string): Promise<App>;
|
|
16
10
|
/**
|
|
17
11
|
* Invalidate/reset the cached metadata when a change occurs in the db.
|
|
18
12
|
* @param appId {string} the cache key to bust/update.
|
|
@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.invalidateAppMetadata = exports.getAppMetadata =
|
|
12
|
+
exports.invalidateAppMetadata = exports.getAppMetadata = void 0;
|
|
13
13
|
const init_1 = require("../redis/init");
|
|
14
14
|
const db_1 = require("../db");
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
})(AppState = exports.AppState || (exports.AppState = {}));
|
|
15
|
+
const AppState = {
|
|
16
|
+
INVALID: "invalid",
|
|
17
|
+
};
|
|
19
18
|
const EXPIRY_SECONDS = 3600;
|
|
20
19
|
/**
|
|
21
20
|
* The default populate app metadata function
|
|
@@ -70,6 +69,10 @@ function getAppMetadata(appId) {
|
|
|
70
69
|
}
|
|
71
70
|
yield client.store(appId, metadata, expiry);
|
|
72
71
|
}
|
|
72
|
+
// we've stored in the cache an object to tell us that it is currently invalid
|
|
73
|
+
if (isInvalid(metadata)) {
|
|
74
|
+
throw { status: 404, message: "No app metadata found" };
|
|
75
|
+
}
|
|
73
76
|
return metadata;
|
|
74
77
|
});
|
|
75
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appMetadata.js","sourceRoot":"","sources":["../../../src/cache/appMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA4C;AAC5C,8BAA8C;AAG9C,
|
|
1
|
+
{"version":3,"file":"appMetadata.js","sourceRoot":"","sources":["../../../src/cache/appMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA4C;AAC5C,8BAA8C;AAG9C,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,SAAS;CACnB,CAAA;AACD,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B;;GAEG;AACH,SAAe,cAAc,CAAC,KAAa;;QACzC,OAAO,IAAA,aAAQ,EACb,KAAK,EACL,CAAC,EAAY,EAAE,EAAE;YACf,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAY,CAAC,YAAY,CAAC,CAAA;QAC1C,CAAC,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAA;IACH,CAAC;CAAA;AAED,SAAS,SAAS,CAAC,QAA4B;IAC7C,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO,CAAA;AACzD,CAAC;AAED;;;;;;GAMG;AACH,SAAsB,cAAc,CAAC,KAAa;;QAChD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAY,GAAE,CAAA;QACnC,YAAY;QACZ,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,MAAM,GAAuB,cAAc,CAAA;YAC/C,IAAI;gBACF,QAAQ,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,CAAA;aACvC;YAAC,OAAO,GAAQ,EAAE;gBACjB,qDAAqD;gBACrD,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;oBAC7B,QAAQ,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAA;oBACtC,8DAA8D;oBAC9D,0EAA0E;oBAC1E,MAAM,GAAG,SAAS,CAAA;iBACnB;qBAAM;oBACL,MAAM,GAAG,CAAA;iBACV;aACF;YACD,8DAA8D;YAC9D,uDAAuD;YACvD,0DAA0D;YAC1D,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE;gBACvB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBACpC,IAAI,IAAI,EAAE;oBACR,QAAQ,GAAG,IAAI,CAAA;iBAChB;aACF;YACD,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;SAC5C;QACD,8EAA8E;QAC9E,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE;YACvB,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAA;SACxD;QACD,OAAO,QAAe,CAAA;IACxB,CAAC;CAAA;AAnCD,wCAmCC;AAED;;;;;GAKG;AACH,SAAsB,qBAAqB,CAAC,KAAa,EAAE,WAAiB;;QAC1E,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,0CAA0C,CAAA;SACjD;QACD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAY,GAAE,CAAA;QACnC,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1B,IAAI,WAAW,EAAE;YACf,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;SACvD;IACH,CAAC;CAAA;AATD,sDASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/cache/user.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAsC;AACtC,oDAAqC;AACrC,oDAAqC;AACrC,sDAAuC;AACvC,iEAAgC;AAChC,sDAAuC;AAEvC,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B;;GAEG;AACH,SAAe,cAAc,CAAC,MAAc,EAAE,QAAgB;;QAC5D,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/cache/user.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAsC;AACtC,oDAAqC;AACrC,oDAAqC;AACrC,sDAAuC;AACvC,iEAAgC;AAChC,sDAAuC;AAEvC,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B;;GAEG;AACH,SAAe,cAAc,CAAC,MAAc,EAAE,QAAgB;;QAC5D,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAC1B,IAAI,CAAC,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE;YACnD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACrD,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;gBACtB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;aAChC;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CAAA;AAED;;;;;;;;GAQG;AACH,SAAsB,OAAO,CAC3B,MAAc,EACd,QAAiB,EACjB,YAAkB;;QAElB,IAAI,CAAC,YAAY,EAAE;YACjB,YAAY,GAAG,cAAc,CAAA;SAC9B;QACD,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI;gBACF,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;aACjC;YAAC,OAAO,GAAG,EAAE;gBACZ,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;aACvD;SACF;QACD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,CAAA;QAC1C,YAAY;QACZ,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnC,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC3C,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;SACjD;QACD,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE;YACtC,gDAAgD;YAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;SACzB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CAAA;AA3BD,0BA2BC;AAED,SAAsB,cAAc,CAAC,MAAc;;QACjD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;CAAA;AAHD,wCAGC"}
|
|
@@ -18,8 +18,6 @@ export declare enum Header {
|
|
|
18
18
|
TYPE = "x-budibase-type",
|
|
19
19
|
PREVIEW_ROLE = "x-budibase-role",
|
|
20
20
|
TENANT_ID = "x-budibase-tenant-id",
|
|
21
|
-
VERIFICATION_CODE = "x-budibase-verification-code",
|
|
22
|
-
RETURN_VERIFICATION_CODE = "x-budibase-return-verification-code",
|
|
23
21
|
TOKEN = "x-budibase-token",
|
|
24
22
|
CSRF_TOKEN = "x-csrf-token",
|
|
25
23
|
CORRELATION_ID = "x-budibase-correlation-id",
|
|
@@ -24,8 +24,6 @@ var Header;
|
|
|
24
24
|
Header["TYPE"] = "x-budibase-type";
|
|
25
25
|
Header["PREVIEW_ROLE"] = "x-budibase-role";
|
|
26
26
|
Header["TENANT_ID"] = "x-budibase-tenant-id";
|
|
27
|
-
Header["VERIFICATION_CODE"] = "x-budibase-verification-code";
|
|
28
|
-
Header["RETURN_VERIFICATION_CODE"] = "x-budibase-return-verification-code";
|
|
29
27
|
Header["TOKEN"] = "x-budibase-token";
|
|
30
28
|
Header["CSRF_TOKEN"] = "x-csrf-token";
|
|
31
29
|
Header["CORRELATION_ID"] = "x-budibase-correlation-id";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAED,IAAY,MAaX;AAbD,WAAY,MAAM;IAChB,wCAA8B,CAAA;IAC9B,gDAAsC,CAAA;IACtC,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,8CAAoC,CAAA;IACpC,kCAAwB,CAAA;IACxB,0CAAgC,CAAA;IAChC,4CAAkC,CAAA;IAClC,oCAA0B,CAAA;IAC1B,qCAA2B,CAAA;IAC3B,sDAA4C,CAAA;IAC5C,yCAA+B,CAAA;AACjC,CAAC,EAbW,MAAM,GAAN,cAAM,KAAN,cAAM,QAajB;AAED,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,6BAAe,CAAA;IACf,iCAAmB,CAAA;IACnB,qDAAuC,CAAA;AACzC,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB;AAED,IAAY,MAQX;AARD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,6BAAmB,CAAA;IACnB,uBAAa,CAAA;IACb,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,mCAAyB,CAAA;IACzB,uBAAa,CAAA;AACf,CAAC,EARW,MAAM,GAAN,cAAM,KAAN,cAAM,QAQjB;AAEY,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,CAAC,aAAa,CAAC,CAAA;AACzC,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAA;AACxC,QAAA,iBAAiB,GAAG,SAAS,CAAA"}
|
|
@@ -23,5 +23,4 @@ Object.defineProperty(exports, "init", { enumerable: true, get: function () { re
|
|
|
23
23
|
Object.defineProperty(exports, "getPouch", { enumerable: true, get: function () { return pouchDB_1.getPouch; } });
|
|
24
24
|
Object.defineProperty(exports, "getPouchDB", { enumerable: true, get: function () { return pouchDB_1.getPouchDB; } });
|
|
25
25
|
Object.defineProperty(exports, "closePouchDB", { enumerable: true, get: function () { return pouchDB_1.closePouchDB; } });
|
|
26
|
-
__exportStar(require("../constants"), exports);
|
|
27
26
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/db/couch/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,iDAA8B;AAC9B,0CAAuB;AACvB,qCAAoE;AAA3D,+FAAA,IAAI,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,qGAAA,UAAU,OAAA;AAAE,uGAAA,YAAY,OAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/db/couch/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,iDAA8B;AAC9B,0CAAuB;AACvB,qCAAoE;AAA3D,+FAAA,IAAI,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,qGAAA,UAAU,OAAA;AAAE,uGAAA,YAAY,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchIndexes.js","sourceRoot":"","sources":["../../../../src/db/searchIndexes/searchIndexes.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmD;AACnD,2CAA2C;AAE3C,SAAsB,eAAe;;QACnC,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;QACxB,IAAI,SAAS,CAAA;QACb,IAAI;YACF,SAAS,GAAG,MAAM,EAAE,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"searchIndexes.js","sourceRoot":"","sources":["../../../../src/db/searchIndexes/searchIndexes.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmD;AACnD,2CAA2C;AAE3C,SAAsB,eAAe;;QACnC,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;QACxB,IAAI,SAAS,CAAA;QACb,IAAI;YACF,SAAS,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;SAC7C;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtB,SAAS,GAAG,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAA;aACxC;SACF;QAED,MAAM,EAAE,GAAG,UAAU,IAAU;YAC7B,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBAC3C,OAAM;aACP;YACD,MAAM,aAAa,GAAG;gBACpB,KAAK;gBACL,MAAM;gBACN,UAAU;gBACV,SAAS;gBACT,SAAS;gBACT,gBAAgB;gBAChB,qBAAqB;gBACrB,WAAW;aACZ,CAAA;YAED,SAAS,GAAG,CAAC,KAA0B,EAAE,IAAa;gBACpD,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAClC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBAC/B,SAAQ;qBACT;oBACD,IAAI,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;oBAClD,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;wBAClC,oCAAoC;wBACpC,aAAa;wBACb,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;qBACzD;yBAAM,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;wBACzC,oCAAoC;wBACpC,aAAa;wBACb,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;qBAC3C;yBAAM;wBACL,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;qBACxB;iBACF;YACH,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,CAAA;QACX,CAAC,CAAA;QAED,SAAS,CAAC,OAAO,GAAG;YAClB,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE;gBAClB,KAAK,EAAE,EAAE,CAAC,QAAQ,EAAE;gBACpB,QAAQ,EAAE;oBACR,OAAO,EAAE,SAAS;oBAClB,IAAI,EAAE,UAAU;iBACjB;aACF;SACF,CAAA;QACD,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;CAAA;AA1DD,0CA0DC"}
|
package/dist/src/db/utils.js
CHANGED
|
@@ -121,11 +121,7 @@ function getAllApps({ dev, all, idsOnly, efficient, } = {}) {
|
|
|
121
121
|
else {
|
|
122
122
|
const response = yield Promise.allSettled(appPromises);
|
|
123
123
|
const apps = response
|
|
124
|
-
.filter((result) =>
|
|
125
|
-
var _a;
|
|
126
|
-
return result.status === "fulfilled" &&
|
|
127
|
-
((_a = result.value) === null || _a === void 0 ? void 0 : _a.state) !== appMetadata_1.AppState.INVALID;
|
|
128
|
-
})
|
|
124
|
+
.filter((result) => result.status === "fulfilled" && result.value != null)
|
|
129
125
|
.map(({ value }) => value);
|
|
130
126
|
if (!all) {
|
|
131
127
|
return apps.filter((app) => {
|
|
@@ -147,8 +143,7 @@ function getAppsByIDs(appIds) {
|
|
|
147
143
|
const settled = yield Promise.allSettled(appIds.map(appId => (0, appMetadata_1.getAppMetadata)(appId)));
|
|
148
144
|
// have to list the apps which exist, some may have been deleted
|
|
149
145
|
return settled
|
|
150
|
-
.filter(promise => promise.status === "fulfilled"
|
|
151
|
-
promise.value.state !== appMetadata_1.AppState.INVALID)
|
|
146
|
+
.filter(promise => promise.status === "fulfilled")
|
|
152
147
|
.map(promise => promise.value);
|
|
153
148
|
});
|
|
154
149
|
}
|
package/dist/src/db/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/db/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,4CAAyE;AACzE,wCAAyD;AACzD,6BAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/db/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,6 @@ declare function isTest(): boolean;
|
|
|
2
2
|
declare function isJest(): boolean;
|
|
3
3
|
declare function isDev(): boolean;
|
|
4
4
|
declare const environment: {
|
|
5
|
-
DISABLE_PINO_LOGGER: string | undefined;
|
|
6
|
-
OFFLINE_MODE: string | undefined;
|
|
7
|
-
_set(key: any, value: any): void;
|
|
8
|
-
ROLLING_LOG_MAX_SIZE: string;
|
|
9
|
-
VERSION: string;
|
|
10
|
-
SERVICE_NAME: string;
|
|
11
5
|
isTest: typeof isTest;
|
|
12
6
|
isJest: typeof isJest;
|
|
13
7
|
isDev: typeof isDev;
|
|
@@ -74,5 +68,9 @@ declare const environment: {
|
|
|
74
68
|
* However, this should be turned OFF by default for security purposes.
|
|
75
69
|
*/
|
|
76
70
|
ENABLE_SSO_MAINTENANCE_MODE: string | boolean | undefined;
|
|
71
|
+
VERSION: any;
|
|
72
|
+
DISABLE_PINO_LOGGER: string | undefined;
|
|
73
|
+
OFFLINE_MODE: string | undefined;
|
|
74
|
+
_set(key: any, value: any): void;
|
|
77
75
|
};
|
|
78
76
|
export default environment;
|
package/dist/src/environment.js
CHANGED
|
@@ -38,7 +38,7 @@ function httpLogging() {
|
|
|
38
38
|
}
|
|
39
39
|
return process.env.HTTP_LOGGING;
|
|
40
40
|
}
|
|
41
|
-
function
|
|
41
|
+
function findVersion() {
|
|
42
42
|
function findFileInAncestors(fileName, currentDir) {
|
|
43
43
|
const filePath = `${currentDir}/${fileName}`;
|
|
44
44
|
if ((0, fs_1.existsSync)(filePath)) {
|
|
@@ -54,24 +54,77 @@ function getPackageJsonFields() {
|
|
|
54
54
|
try {
|
|
55
55
|
const packageJsonFile = findFileInAncestors("package.json", process.cwd());
|
|
56
56
|
const content = (0, fs_1.readFileSync)(packageJsonFile, "utf-8");
|
|
57
|
-
|
|
58
|
-
return {
|
|
59
|
-
VERSION: parsedContent.version,
|
|
60
|
-
SERVICE_NAME: parsedContent.name,
|
|
61
|
-
};
|
|
57
|
+
return JSON.parse(content).version;
|
|
62
58
|
}
|
|
63
59
|
catch (_a) {
|
|
64
60
|
// throwing an error here is confusing/causes backend-core to be hard to import
|
|
65
|
-
return
|
|
61
|
+
return undefined;
|
|
66
62
|
}
|
|
67
63
|
}
|
|
68
|
-
const environment =
|
|
64
|
+
const environment = {
|
|
65
|
+
isTest,
|
|
69
66
|
isJest,
|
|
70
|
-
isDev,
|
|
67
|
+
isDev,
|
|
68
|
+
isProd: () => {
|
|
71
69
|
return !isDev();
|
|
72
|
-
},
|
|
70
|
+
},
|
|
71
|
+
JS_BCRYPT: process.env.JS_BCRYPT,
|
|
72
|
+
JWT_SECRET: process.env.JWT_SECRET,
|
|
73
|
+
JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,
|
|
74
|
+
ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
|
|
75
|
+
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
|
|
76
|
+
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
|
|
77
|
+
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
|
|
78
|
+
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
|
|
79
|
+
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
|
|
80
|
+
GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
|
|
81
|
+
SALT_ROUNDS: process.env.SALT_ROUNDS,
|
|
82
|
+
REDIS_URL: process.env.REDIS_URL || "localhost:6379",
|
|
83
|
+
REDIS_PASSWORD: process.env.REDIS_PASSWORD,
|
|
84
|
+
REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
|
|
85
|
+
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
|
|
86
|
+
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
|
|
87
|
+
AWS_REGION: process.env.AWS_REGION,
|
|
88
|
+
MINIO_URL: process.env.MINIO_URL,
|
|
89
|
+
MINIO_ENABLED: process.env.MINIO_ENABLED || 1,
|
|
90
|
+
INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
|
|
91
|
+
INTERNAL_API_KEY_FALLBACK: process.env.INTERNAL_API_KEY_FALLBACK,
|
|
92
|
+
MULTI_TENANCY: process.env.MULTI_TENANCY,
|
|
93
|
+
ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app",
|
|
94
|
+
ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "",
|
|
95
|
+
DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
|
|
96
|
+
SELF_HOSTED: selfHosted,
|
|
97
|
+
COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
|
|
98
|
+
PLATFORM_URL: process.env.PLATFORM_URL || "",
|
|
99
|
+
POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
|
|
100
|
+
ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
|
|
101
|
+
TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
|
|
102
|
+
CLOUDFRONT_CDN: process.env.CLOUDFRONT_CDN,
|
|
103
|
+
CLOUDFRONT_PRIVATE_KEY_64: process.env.CLOUDFRONT_PRIVATE_KEY_64,
|
|
104
|
+
CLOUDFRONT_PUBLIC_KEY_ID: process.env.CLOUDFRONT_PUBLIC_KEY_ID,
|
|
105
|
+
BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS,
|
|
106
|
+
APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS,
|
|
107
|
+
TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES,
|
|
108
|
+
GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
|
|
109
|
+
PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
|
|
110
|
+
USE_COUCH: process.env.USE_COUCH || true,
|
|
111
|
+
MOCK_REDIS: process.env.MOCK_REDIS,
|
|
112
|
+
DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
|
|
113
|
+
SERVICE: process.env.SERVICE || "budibase",
|
|
114
|
+
LOG_LEVEL: process.env.LOG_LEVEL || "info",
|
|
115
|
+
SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
|
|
116
|
+
DEPLOYMENT_ENVIRONMENT: process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
|
|
117
|
+
HTTP_LOGGING: httpLogging(),
|
|
118
|
+
ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
|
|
73
119
|
// smtp
|
|
74
|
-
SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
|
|
120
|
+
SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
|
|
121
|
+
SMTP_USER: process.env.SMTP_USER,
|
|
122
|
+
SMTP_PASSWORD: process.env.SMTP_PASSWORD,
|
|
123
|
+
SMTP_HOST: process.env.SMTP_HOST,
|
|
124
|
+
SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
|
|
125
|
+
SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
|
|
126
|
+
DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
|
|
127
|
+
BLACKLIST_IPS: process.env.BLACKLIST_IPS,
|
|
75
128
|
/**
|
|
76
129
|
* Enable to allow an admin user to login using a password.
|
|
77
130
|
* This can be useful to prevent lockout when configuring SSO.
|
|
@@ -79,11 +132,16 @@ const environment = Object.assign(Object.assign({ isTest,
|
|
|
79
132
|
*/
|
|
80
133
|
ENABLE_SSO_MAINTENANCE_MODE: selfHosted
|
|
81
134
|
? process.env.ENABLE_SSO_MAINTENANCE_MODE
|
|
82
|
-
: false
|
|
135
|
+
: false,
|
|
136
|
+
VERSION: findVersion(),
|
|
137
|
+
DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
|
|
138
|
+
OFFLINE_MODE: process.env.OFFLINE_MODE,
|
|
139
|
+
_set(key, value) {
|
|
83
140
|
process.env[key] = value;
|
|
84
141
|
// @ts-ignore
|
|
85
142
|
environment[key] = value;
|
|
86
|
-
},
|
|
143
|
+
},
|
|
144
|
+
};
|
|
87
145
|
// clean up any environment variable edge cases
|
|
88
146
|
for (let [key, value] of Object.entries(environment)) {
|
|
89
147
|
// handle the edge case of "0" to disable an environment variable
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":";;AAAA,2BAA6C;AAE7C,SAAS,MAAM;IACb,OAAO,SAAS,EAAE,IAAI,MAAM,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,MAAM;IACb,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC1E,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAA;AAC3C,CAAC;AAED,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAC9C,CAAC;AAED,IAAI,MAAM,GAAG,KAAK,CAAA;AAClB,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;IAC1B,MAAM,GAAG,IAAI,CAAA;CACd;AAED,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,sBAAsB;IAC5B,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;AAE5D,SAAS,mBAAmB;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA,CAAC,+CAA+C;AAC5E,CAAC;AAED,SAAS,WAAW;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS,EAAE;QAC1C,2CAA2C;QAC3C,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;AACjC,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,10 +26,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
26
26
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
29
|
+
exports.LOG_CONTEXT = exports.logger = exports.correlation = void 0;
|
|
30
30
|
exports.correlation = __importStar(require("./correlation/correlation"));
|
|
31
31
|
var logger_1 = require("./pino/logger");
|
|
32
32
|
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return logger_1.logger; } });
|
|
33
33
|
__exportStar(require("./alerts"), exports);
|
|
34
|
-
|
|
34
|
+
// turn off or on context logging i.e. tenantId, appId etc
|
|
35
|
+
exports.LOG_CONTEXT = true;
|
|
35
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAwD;AACxD,wCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,2CAAwB;AAExB,0DAA0D;AAC/C,QAAA,WAAW,GAAG,IAAI,CAAA"}
|
|
@@ -27,53 +27,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.logger = void 0;
|
|
30
|
-
const pino_1 = __importDefault(require("pino"));
|
|
31
|
-
const pino_pretty_1 = __importDefault(require("pino-pretty"));
|
|
32
30
|
const environment_1 = __importDefault(require("../../environment"));
|
|
31
|
+
const pino_1 = __importDefault(require("pino"));
|
|
33
32
|
const context = __importStar(require("../../context"));
|
|
34
33
|
const correlation = __importStar(require("../correlation"));
|
|
35
|
-
const
|
|
34
|
+
const index_1 = require("../index");
|
|
36
35
|
// LOGGER
|
|
37
36
|
let pinoInstance;
|
|
38
37
|
if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
39
|
-
const level = environment_1.default.LOG_LEVEL;
|
|
40
38
|
const pinoOptions = {
|
|
41
|
-
level,
|
|
39
|
+
level: environment_1.default.LOG_LEVEL,
|
|
42
40
|
formatters: {
|
|
43
|
-
level:
|
|
44
|
-
return { level:
|
|
41
|
+
level: label => {
|
|
42
|
+
return { level: label.toUpperCase() };
|
|
45
43
|
},
|
|
46
44
|
bindings: () => {
|
|
47
|
-
|
|
48
|
-
// "service" is being injected in datadog using the pod names,
|
|
49
|
-
// so we should leave it blank to allow the default behaviour if it's not running self-hosted
|
|
50
|
-
return {
|
|
51
|
-
service: environment_1.default.SERVICE_NAME,
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
return {};
|
|
56
|
-
}
|
|
45
|
+
return {};
|
|
57
46
|
},
|
|
58
47
|
},
|
|
59
48
|
timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
|
|
60
49
|
};
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (environment_1.default.SELF_HOSTED) {
|
|
69
|
-
destinations.push({
|
|
70
|
-
stream: (0, system_1.localFileDestination)(),
|
|
71
|
-
level: level,
|
|
72
|
-
});
|
|
50
|
+
if (environment_1.default.isDev()) {
|
|
51
|
+
pinoOptions.transport = {
|
|
52
|
+
target: "pino-pretty",
|
|
53
|
+
options: {
|
|
54
|
+
singleLine: true,
|
|
55
|
+
},
|
|
56
|
+
};
|
|
73
57
|
}
|
|
74
|
-
pinoInstance =
|
|
75
|
-
? (0, pino_1.default)(pinoOptions, pino_1.default.multistream(destinations))
|
|
76
|
-
: (0, pino_1.default)(pinoOptions);
|
|
58
|
+
pinoInstance = (0, pino_1.default)(pinoOptions);
|
|
77
59
|
function isPlainObject(obj) {
|
|
78
60
|
return typeof obj === "object" && obj !== null && !(obj instanceof Error);
|
|
79
61
|
}
|
|
@@ -104,14 +86,16 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
|
104
86
|
});
|
|
105
87
|
const identity = getIdentity();
|
|
106
88
|
let contextObject = {};
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
89
|
+
if (index_1.LOG_CONTEXT) {
|
|
90
|
+
contextObject = {
|
|
91
|
+
tenantId: getTenantId(),
|
|
92
|
+
appId: getAppId(),
|
|
93
|
+
automationId: getAutomationId(),
|
|
94
|
+
identityId: identity === null || identity === void 0 ? void 0 : identity._id,
|
|
95
|
+
identityType: identity === null || identity === void 0 ? void 0 : identity.type,
|
|
96
|
+
correlationId: correlation.getId(),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
115
99
|
const mergingObject = Object.assign({ err: error, pid: process.pid }, contextObject);
|
|
116
100
|
if (objects.length) {
|
|
117
101
|
// init generic data object for params supplied that don't have a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/src/users.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/users.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAaa;AAEb,uCAAuC;AACvC,mDAAoC;AAIpC,SAAS,kBAAkB,CAAC,KAAoB;IAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtB,IAAI,IAAI,EAAE;gBACR,OAAO,IAAI,CAAC,QAAQ,CAAA;gBACpB,OAAO,IAAI,CAAA;aACZ;QACH,CAAC,CAAC,CAAA;KACH;SAAM,IAAI,KAAK,EAAE;QAChB,OAAO,KAAK,CAAC,QAAQ,CAAA;QACrB,OAAO,KAAK,CAAA;KACb;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAEM,MAAM,sBAAsB,GAAG,CACpC,OAAiB,EACjB,IAAc,EACd,EAAE;IACF,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;IACxB,IAAI,KAAK,GAAG,CACV,MAAM,EAAE,CAAC,OAAO,CAAC;QACf,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,IAAI;KACnB,CAAC,CACH,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAW,CAAA;IACpC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAE;QACjB,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAW,CAAA;KAC5C;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA,CAAA;AAfY,QAAA,sBAAsB,0BAelC;AAEM,MAAM,aAAa,GAAG,GAAS,EAAE;IACtC,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;IACxB,MAAM,QAAQ,GAAG,GAAG,iBAAY,CAAC,IAAI,GAAG,cAAS,EAAE,CAAA;IACnD,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC;QAChC,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,GAAG,QAAQ,GAAG,gBAAW,EAAE;KACpC,CAAC,CAAA;IACF,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AACzC,CAAC,CAAA,CAAA;AARY,QAAA,aAAa,iBAQzB;AAEM,MAAM,qBAAqB,GAAG,CAAO,KAAa,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,IAAA,qBAAW,GAAE,CAAA;IACxB,OAAO,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAqB,CAAA;AACvD,CAAC,CAAA,CAAA;AAHY,QAAA,qBAAqB,yBAGjC;AAED,SAAsB,OAAO,CAAC,EAAU,EAAE,IAAc;;QACtD,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QAChC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1 @@
|
|
|
1
|
-
import { db } from "../../../src";
|
|
2
1
|
export declare function expectFunctionWasCalledTimesWith(jestFunction: any, times: number, argument: any): void;
|
|
3
|
-
export declare const expectAnyInternalColsAttributes: {
|
|
4
|
-
[K in (typeof db.CONSTANT_INTERNAL_ROW_COLS)[number]]: any;
|
|
5
|
-
};
|
|
6
|
-
export declare const expectAnyExternalColsAttributes: {
|
|
7
|
-
[K in (typeof db.CONSTANT_EXTERNAL_ROW_COLS)[number]]: any;
|
|
8
|
-
};
|