@rakun-kit/core 1.0.1 → 1.0.4
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/cjs/api/utils/parseId.js +3 -2
- package/dist/cjs/api/utils/parseId.js.map +1 -1
- package/dist/cjs/api/utils/passwords.js +4 -6
- package/dist/cjs/api/utils/passwords.js.map +1 -1
- package/dist/cjs/api/utils/populates/populateRelations.js +3 -2
- package/dist/cjs/api/utils/populates/populateRelations.js.map +1 -1
- package/dist/cjs/api/utils/transformObjectIdsToStrings.js +4 -3
- package/dist/cjs/api/utils/transformObjectIdsToStrings.js.map +1 -1
- package/dist/cjs/api/utils/transformStringToObjectIds.js +4 -3
- package/dist/cjs/api/utils/transformStringToObjectIds.js.map +1 -1
- package/dist/cjs/client.js +39 -1
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/lib/utils/peerDependencies.js +26 -0
- package/dist/cjs/lib/utils/peerDependencies.js.map +1 -0
- package/dist/cjs/media/imageOptimization.js +10 -4
- package/dist/cjs/media/imageOptimization.js.map +1 -1
- package/dist/cjs/orm/database.js +3 -2
- package/dist/cjs/orm/database.js.map +1 -1
- package/dist/cjs/orm/mongodbPeer.js +7 -0
- package/dist/cjs/orm/mongodbPeer.js.map +1 -0
- package/dist/cjs/orm/operations/findDependencies.js +3 -2
- package/dist/cjs/orm/operations/findDependencies.js.map +1 -1
- package/dist/cjs/orm/utils/parseId.js +3 -2
- package/dist/cjs/orm/utils/parseId.js.map +1 -1
- package/dist/cjs/orm/utils/transformObjectIdsToStrings.js +3 -2
- package/dist/cjs/orm/utils/transformObjectIdsToStrings.js.map +1 -1
- package/dist/cjs/orm/utils/transformStringToObjectIds.js +4 -3
- package/dist/cjs/orm/utils/transformStringToObjectIds.js.map +1 -1
- package/dist/esm/api/utils/parseId.d.ts +1 -1
- package/dist/esm/api/utils/parseId.d.ts.map +1 -1
- package/dist/esm/api/utils/parseId.js +2 -1
- package/dist/esm/api/utils/parseId.js.map +1 -1
- package/dist/esm/api/utils/passwords.d.ts.map +1 -1
- package/dist/esm/api/utils/passwords.js +4 -3
- package/dist/esm/api/utils/passwords.js.map +1 -1
- package/dist/esm/api/utils/populates/populateRelations.d.ts.map +1 -1
- package/dist/esm/api/utils/populates/populateRelations.js +2 -1
- package/dist/esm/api/utils/populates/populateRelations.js.map +1 -1
- package/dist/esm/api/utils/transformObjectIdsToStrings.d.ts.map +1 -1
- package/dist/esm/api/utils/transformObjectIdsToStrings.js +2 -1
- package/dist/esm/api/utils/transformObjectIdsToStrings.js.map +1 -1
- package/dist/esm/api/utils/transformStringToObjectIds.d.ts.map +1 -1
- package/dist/esm/api/utils/transformStringToObjectIds.js +2 -1
- package/dist/esm/api/utils/transformStringToObjectIds.js.map +1 -1
- package/dist/esm/client.d.ts +20 -0
- package/dist/esm/client.d.ts.map +1 -1
- package/dist/esm/client.js +19 -0
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/lib/utils/peerDependencies.d.ts +2 -0
- package/dist/esm/lib/utils/peerDependencies.d.ts.map +1 -0
- package/dist/esm/lib/utils/peerDependencies.js +22 -0
- package/dist/esm/lib/utils/peerDependencies.js.map +1 -0
- package/dist/esm/media/imageOptimization.d.ts.map +1 -1
- package/dist/esm/media/imageOptimization.js +7 -1
- package/dist/esm/media/imageOptimization.js.map +1 -1
- package/dist/esm/orm/database.d.ts +1 -2
- package/dist/esm/orm/database.d.ts.map +1 -1
- package/dist/esm/orm/database.js +2 -1
- package/dist/esm/orm/database.js.map +1 -1
- package/dist/esm/orm/mongodbPeer.d.ts +2 -0
- package/dist/esm/orm/mongodbPeer.d.ts.map +1 -0
- package/dist/esm/orm/mongodbPeer.js +3 -0
- package/dist/esm/orm/mongodbPeer.js.map +1 -0
- package/dist/esm/orm/operations/findDependencies.d.ts +1 -1
- package/dist/esm/orm/operations/findDependencies.d.ts.map +1 -1
- package/dist/esm/orm/operations/findDependencies.js +2 -1
- package/dist/esm/orm/operations/findDependencies.js.map +1 -1
- package/dist/esm/orm/utils/parseId.d.ts +1 -2
- package/dist/esm/orm/utils/parseId.d.ts.map +1 -1
- package/dist/esm/orm/utils/parseId.js +2 -1
- package/dist/esm/orm/utils/parseId.js.map +1 -1
- package/dist/esm/orm/utils/transformObjectIdsToStrings.d.ts.map +1 -1
- package/dist/esm/orm/utils/transformObjectIdsToStrings.js +2 -1
- package/dist/esm/orm/utils/transformObjectIdsToStrings.js.map +1 -1
- package/dist/esm/orm/utils/transformStringToObjectIds.d.ts.map +1 -1
- package/dist/esm/orm/utils/transformStringToObjectIds.js +2 -1
- package/dist/esm/orm/utils/transformStringToObjectIds.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +6 -4
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseId = parseId;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../../orm/mongodbPeer");
|
|
5
5
|
function parseId(id) {
|
|
6
|
-
|
|
6
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
7
|
+
return new ObjectId(id);
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=parseId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":";;AAKA,0BAGC;AALD,uDAAmD;AAEnD,SAAgB,OAAO,CAAC,EAAM;IAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAC;IAClC,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.hashPassword = exports.verifyPassword = void 0;
|
|
7
|
-
const
|
|
4
|
+
const peerDependencies_1 = require("../../lib/utils/peerDependencies");
|
|
5
|
+
const getBcrypt = () => (0, peerDependencies_1.requirePeerDependency)("bcrypt", "npm install bcrypt", "Rakun uses bcrypt to verify and hash manager passwords.");
|
|
8
6
|
const verifyPassword = (password, hash) => {
|
|
9
|
-
return
|
|
7
|
+
return getBcrypt().compareSync(password, hash);
|
|
10
8
|
};
|
|
11
9
|
exports.verifyPassword = verifyPassword;
|
|
12
10
|
const hashPassword = (password) => {
|
|
13
|
-
return
|
|
11
|
+
return getBcrypt().hashSync(password, 10);
|
|
14
12
|
};
|
|
15
13
|
exports.hashPassword = hashPassword;
|
|
16
14
|
//# sourceMappingURL=passwords.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AAIzE,MAAM,SAAS,GAAG,GAAG,EAAE,CACrB,IAAA,wCAAqB,EACnB,QAAQ,EACR,oBAAoB,EACpB,yDAAyD,CAC1D,CAAC;AAEG,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,EAAE;IAC/D,OAAO,SAAS,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC/C,OAAO,SAAS,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.populateRelations = populateRelations;
|
|
4
|
-
const mongodb_1 = require("mongodb");
|
|
5
4
|
const internal_content_types_1 = require("../../../internal-content-types");
|
|
6
5
|
const Registry_1 = require("../../../lib/Registry");
|
|
7
6
|
const hasKeys_1 = require("../../../lib/utils/hasKeys");
|
|
8
7
|
const media_1 = require("../../../media");
|
|
9
8
|
const orm_1 = require("../../../orm");
|
|
9
|
+
const mongodbPeer_1 = require("../../../orm/mongodbPeer");
|
|
10
10
|
async function populateRelations(data) {
|
|
11
11
|
const db = await (0, orm_1.getMongoService)();
|
|
12
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
12
13
|
if (Array.isArray(data)) {
|
|
13
14
|
return Promise.all(data.map((item) => populateRelations(item)));
|
|
14
15
|
}
|
|
@@ -97,7 +98,7 @@ async function populateRelations(data) {
|
|
|
97
98
|
const data = value.data;
|
|
98
99
|
return {
|
|
99
100
|
...(await populateRelations(data)),
|
|
100
|
-
_id: new
|
|
101
|
+
_id: new ObjectId().toString(),
|
|
101
102
|
};
|
|
102
103
|
}
|
|
103
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populateRelations.js","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"populateRelations.js","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformObjectIdsToStrings = transformObjectIdsToStrings;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../../orm/mongodbPeer");
|
|
5
5
|
/**
|
|
6
6
|
* Transform MongoDB ObjectIds to strings recursively in an object
|
|
7
7
|
*/
|
|
8
8
|
function transformObjectIdsToStrings(obj) {
|
|
9
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
9
10
|
if (obj === null || obj === undefined) {
|
|
10
11
|
return obj;
|
|
11
12
|
}
|
|
12
13
|
if (Array.isArray(obj)) {
|
|
13
14
|
return obj.map((item) => transformObjectIdsToStrings(item));
|
|
14
15
|
}
|
|
15
|
-
if (obj instanceof
|
|
16
|
+
if (obj instanceof ObjectId) {
|
|
16
17
|
return obj.toString();
|
|
17
18
|
}
|
|
18
19
|
if (typeof obj === 'object') {
|
|
19
20
|
const result = {};
|
|
20
21
|
for (const [key, value] of Object.entries(obj)) {
|
|
21
|
-
if (value instanceof
|
|
22
|
+
if (value instanceof ObjectId) {
|
|
22
23
|
result[key] = value.toString();
|
|
23
24
|
}
|
|
24
25
|
else if (typeof value === 'object' && value !== null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformObjectIdsToStrings.js","sourceRoot":"","sources":["../../../../src/api/utils/transformObjectIdsToStrings.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"transformObjectIdsToStrings.js","sourceRoot":"","sources":["../../../../src/api/utils/transformObjectIdsToStrings.ts"],"names":[],"mappings":";;AAKA,kEA8BC;AAnCD,uDAAkD;AAElD;;GAEG;AACH,SAAgB,2BAA2B,CAAI,GAAM;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAA;IAEjC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAM,CAAA;IAClE,CAAC;IAED,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,QAAQ,EAAO,CAAA;IAC5B,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,MAAM,GAA4B,EAAE,CAAA;QAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;gBAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;YAChC,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACvD,MAAM,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAA;YAClD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YACrB,CAAC;QACH,CAAC;QACD,OAAO,MAAW,CAAA;IACpB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformStringToObjectIds = transformStringToObjectIds;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../../orm/mongodbPeer");
|
|
5
5
|
/**
|
|
6
6
|
* Transform string IDs to MongoDB ObjectIds recursively in an object
|
|
7
7
|
*/
|
|
8
8
|
function transformStringToObjectIds(obj) {
|
|
9
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
9
10
|
if (obj === null || obj === undefined) {
|
|
10
11
|
return obj;
|
|
11
12
|
}
|
|
@@ -18,8 +19,8 @@ function transformStringToObjectIds(obj) {
|
|
|
18
19
|
// Transform _id fields to ObjectId
|
|
19
20
|
if (key === '_id' &&
|
|
20
21
|
typeof value === 'string' &&
|
|
21
|
-
|
|
22
|
-
result[key] = new
|
|
22
|
+
ObjectId.isValid(value)) {
|
|
23
|
+
result[key] = new ObjectId(value);
|
|
23
24
|
}
|
|
24
25
|
else if (typeof value === 'object' && value !== null) {
|
|
25
26
|
result[key] = transformStringToObjectIds(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformStringToObjectIds.js","sourceRoot":"","sources":["../../../../src/api/utils/transformStringToObjectIds.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"transformStringToObjectIds.js","sourceRoot":"","sources":["../../../../src/api/utils/transformStringToObjectIds.ts"],"names":[],"mappings":";;AAKA,gEA+BC;AApCD,uDAAkD;AAElD;;GAEG;AACH,SAAgB,0BAA0B,CAAI,GAAM;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAA;IAEjC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAM,CAAA;IACjE,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,MAAM,GAA4B,EAAE,CAAA;QAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,mCAAmC;YACnC,IACE,GAAG,KAAK,KAAK;gBACb,OAAO,KAAK,KAAK,QAAQ;gBACzB,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EACvB,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAA;YACnC,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACvD,MAAM,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YACrB,CAAC;QACH,CAAC;QACD,OAAO,MAAW,CAAA;IACpB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
package/dist/cjs/client.js
CHANGED
|
@@ -1,12 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
2
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Seo = exports.loginInput = exports.EncodedContentTypeSchema = exports.instanceofAppErrorShape = exports.getTranslation = exports.mapPermissions = exports.hasPermissions = exports.getPermissionList = void 0;
|
|
17
|
+
exports.Seo = exports.loginInput = exports.EncodedContentTypeSchema = exports.instanceofAppErrorShape = exports.slugify = exports.isTranslatableObject = exports.isId = exports.Id = exports.getTranslation = exports.getListField = exports.mapPermissions = exports.hasPermissions = exports.getPermissionList = void 0;
|
|
4
18
|
var Permissions_1 = require("./lib/Permissions");
|
|
5
19
|
Object.defineProperty(exports, "getPermissionList", { enumerable: true, get: function () { return Permissions_1.getPermissionList; } });
|
|
6
20
|
Object.defineProperty(exports, "hasPermissions", { enumerable: true, get: function () { return Permissions_1.hasPermissions; } });
|
|
7
21
|
Object.defineProperty(exports, "mapPermissions", { enumerable: true, get: function () { return Permissions_1.mapPermissions; } });
|
|
22
|
+
__exportStar(require("./lib/fields"), exports);
|
|
23
|
+
__exportStar(require("./lib/fields/Boolean"), exports);
|
|
24
|
+
__exportStar(require("./lib/fields/ContentReference"), exports);
|
|
25
|
+
__exportStar(require("./lib/fields/Date"), exports);
|
|
26
|
+
__exportStar(require("./lib/fields/Field"), exports);
|
|
27
|
+
__exportStar(require("./lib/fields/File"), exports);
|
|
28
|
+
__exportStar(require("./lib/fields/Iterator"), exports);
|
|
29
|
+
__exportStar(require("./lib/fields/Link"), exports);
|
|
30
|
+
__exportStar(require("./lib/fields/List"), exports);
|
|
31
|
+
__exportStar(require("./lib/fields/Number"), exports);
|
|
32
|
+
__exportStar(require("./lib/fields/Relation"), exports);
|
|
33
|
+
__exportStar(require("./lib/fields/Select"), exports);
|
|
34
|
+
__exportStar(require("./lib/fields/SelfRelation"), exports);
|
|
35
|
+
__exportStar(require("./lib/fields/SimpleList"), exports);
|
|
36
|
+
__exportStar(require("./lib/fields/String"), exports);
|
|
37
|
+
var getListField_1 = require("./lib/utils/getListField");
|
|
38
|
+
Object.defineProperty(exports, "getListField", { enumerable: true, get: function () { return getListField_1.getListField; } });
|
|
8
39
|
var getTranslation_1 = require("./lib/utils/getTranslation");
|
|
9
40
|
Object.defineProperty(exports, "getTranslation", { enumerable: true, get: function () { return getTranslation_1.getTranslation; } });
|
|
41
|
+
var id_1 = require("./lib/utils/id");
|
|
42
|
+
Object.defineProperty(exports, "Id", { enumerable: true, get: function () { return id_1.Id; } });
|
|
43
|
+
Object.defineProperty(exports, "isId", { enumerable: true, get: function () { return id_1.isId; } });
|
|
44
|
+
var isTranslatableObject_1 = require("./lib/utils/isTranslatableObject");
|
|
45
|
+
Object.defineProperty(exports, "isTranslatableObject", { enumerable: true, get: function () { return isTranslatableObject_1.isTranslatableObject; } });
|
|
46
|
+
var slugify_1 = require("./lib/utils/slugify");
|
|
47
|
+
Object.defineProperty(exports, "slugify", { enumerable: true, get: function () { return slugify_1.slugify; } });
|
|
10
48
|
var errors_1 = require("./lib/errors/errors");
|
|
11
49
|
Object.defineProperty(exports, "instanceofAppErrorShape", { enumerable: true, get: function () { return errors_1.instanceofAppErrorShape; } });
|
|
12
50
|
var ContentType_1 = require("./lib/ContentType");
|
package/dist/cjs/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAK2B;AAJzB,gHAAA,iBAAiB,OAAA;AACjB,6GAAA,cAAc,OAAA;AACd,6GAAA,cAAc,OAAA;AAIhB,+CAA6B;AAC7B,uDAAqC;AACrC,gEAA8C;AAC9C,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,wDAAsC;AACtC,oDAAkC;AAClC,oDAAkC;AAClC,sDAAoC;AACpC,wDAAsC;AACtC,sDAAoC;AACpC,4DAA0C;AAC1C,0DAAwC;AACxC,sDAAoC;AACpC,yDAAwD;AAA/C,4GAAA,YAAY,OAAA;AACrB,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AACvB,qCAA6D;AAApD,wFAAA,EAAE,OAAA;AAAE,0FAAA,IAAI,OAAA;AACjB,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,+CAA8C;AAArC,kGAAA,OAAO,OAAA;AAChB,8CAG6B;AAF3B,iHAAA,uBAAuB,OAAA;AAGzB,iDAG2B;AADzB,uHAAA,wBAAwB,OAAA;AAG1B,sDAA2E;AAAlE,mGAAA,UAAU,OAAA;AAenB,oDAAmD;AAA1C,0FAAA,GAAG,OAAA"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.requirePeerDependency = void 0;
|
|
4
|
+
const module_1 = require("module");
|
|
5
|
+
const requireFromApp = (0, module_1.createRequire)(`${process.cwd()}/package.json`);
|
|
6
|
+
const originalMessage = (error) => {
|
|
7
|
+
if (error instanceof Error)
|
|
8
|
+
return error.message;
|
|
9
|
+
return String(error);
|
|
10
|
+
};
|
|
11
|
+
const requirePeerDependency = (packageName, installCommand, details) => {
|
|
12
|
+
try {
|
|
13
|
+
return requireFromApp(packageName);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
throw new Error([
|
|
17
|
+
`Rakun could not load peer dependency "${packageName}".`,
|
|
18
|
+
details,
|
|
19
|
+
`Install it in your app with: ${installCommand}`,
|
|
20
|
+
`If it is already installed, rebuild native dependencies and use a Node.js LTS version.`,
|
|
21
|
+
`Original error: ${originalMessage(error)}`,
|
|
22
|
+
].join(" "));
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
exports.requirePeerDependency = requirePeerDependency;
|
|
26
|
+
//# sourceMappingURL=peerDependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"peerDependencies.js","sourceRoot":"","sources":["../../../../src/lib/utils/peerDependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAEvC,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AAEtE,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE;IACjD,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC;IACjD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,cAAsB,EACtB,OAAe,EACZ,EAAE;IACL,IAAI,CAAC;QACH,OAAO,cAAc,CAAC,WAAW,CAAM,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb;YACE,yCAAyC,WAAW,IAAI;YACxD,OAAO;YACP,gCAAgC,cAAc,EAAE;YAChD,wFAAwF;YACxF,mBAAmB,eAAe,CAAC,KAAK,CAAC,EAAE;SAC5C,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,qBAAqB,yBAkBhC"}
|
|
@@ -5,8 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.optimizeImageUpload = optimizeImageUpload;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const sharp_1 = __importDefault(require("sharp"));
|
|
9
8
|
const File_1 = require("../lib/fields/File");
|
|
9
|
+
const peerDependencies_1 = require("../lib/utils/peerDependencies");
|
|
10
|
+
const getSharp = () => {
|
|
11
|
+
const sharp = (0, peerDependencies_1.requirePeerDependency)("sharp", "npm install sharp", "Rakun uses sharp to read image dimensions and optimize media uploads.");
|
|
12
|
+
return sharp.default ?? sharp;
|
|
13
|
+
};
|
|
10
14
|
const formatToExt = {
|
|
11
15
|
webp: "webp",
|
|
12
16
|
jpeg: "jpg",
|
|
@@ -36,7 +40,8 @@ const resolveDimensions = async (mime, content) => {
|
|
|
36
40
|
if (!isImageMime(mime))
|
|
37
41
|
return {};
|
|
38
42
|
try {
|
|
39
|
-
const
|
|
43
|
+
const sharp = getSharp();
|
|
44
|
+
const metadata = await sharp(content, { failOn: "none" }).metadata();
|
|
40
45
|
const width = metadata.width;
|
|
41
46
|
const height = metadata.height;
|
|
42
47
|
if (!width || !height)
|
|
@@ -84,7 +89,8 @@ async function optimizeImageUpload(input) {
|
|
|
84
89
|
const targetExt = formatToExt[targetFormat];
|
|
85
90
|
const targetMime = formatToMime[targetFormat];
|
|
86
91
|
const quality = options.quality;
|
|
87
|
-
|
|
92
|
+
const sharp = getSharp();
|
|
93
|
+
let optimized = sharp(input.buffer, { failOn: "none" }).rotate();
|
|
88
94
|
if (targetFormat === "webp")
|
|
89
95
|
optimized = optimized.webp({ quality });
|
|
90
96
|
if (targetFormat === "jpeg")
|
|
@@ -108,7 +114,7 @@ async function optimizeImageUpload(input) {
|
|
|
108
114
|
: input.fileName;
|
|
109
115
|
let preview;
|
|
110
116
|
if (options.generatePreview) {
|
|
111
|
-
let previewPipeline = (
|
|
117
|
+
let previewPipeline = sharp(finalBuffer, { failOn: "none" })
|
|
112
118
|
.rotate()
|
|
113
119
|
.resize({ width: options.previewMaxWidth, withoutEnlargement: true });
|
|
114
120
|
if (targetFormat === "webp")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageOptimization.js","sourceRoot":"","sources":["../../../src/media/imageOptimization.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"imageOptimization.js","sourceRoot":"","sources":["../../../src/media/imageOptimization.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/orm/database.js
CHANGED
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.connectDatabase = connectDatabase;
|
|
4
4
|
exports.closeDatabase = closeDatabase;
|
|
5
5
|
exports.getDatabase = getDatabase;
|
|
6
|
-
const mongodb_1 = require("mongodb");
|
|
7
6
|
const dbService_1 = require("./dbService");
|
|
8
7
|
const createIndexes_1 = require("./createIndexes");
|
|
8
|
+
const mongodbPeer_1 = require("./mongodbPeer");
|
|
9
9
|
let _client = null;
|
|
10
10
|
let _db = null;
|
|
11
11
|
let _connectPromise = null;
|
|
@@ -23,7 +23,8 @@ async function connectDatabase(config) {
|
|
|
23
23
|
}
|
|
24
24
|
_connectPromise = (async () => {
|
|
25
25
|
try {
|
|
26
|
-
const
|
|
26
|
+
const { MongoClient } = (0, mongodbPeer_1.getMongoDB)();
|
|
27
|
+
const client = await MongoClient.connect(config.MONGO_URI);
|
|
27
28
|
const db = client.db(config.MONGO_URI.split('/').pop()?.split('?')[0]);
|
|
28
29
|
if (config.ENVIRONMENT !== 'test') {
|
|
29
30
|
await (0, createIndexes_1.createIndexes)(db);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/orm/database.ts"],"names":[],"mappings":";;AAkBA,
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/orm/database.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getMongoDB = void 0;
|
|
4
|
+
const peerDependencies_1 = require("../lib/utils/peerDependencies");
|
|
5
|
+
const getMongoDB = () => (0, peerDependencies_1.requirePeerDependency)("mongodb", "npm install mongodb", "Rakun uses the official MongoDB driver for database access and ObjectId handling.");
|
|
6
|
+
exports.getMongoDB = getMongoDB;
|
|
7
|
+
//# sourceMappingURL=mongodbPeer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mongodbPeer.js","sourceRoot":"","sources":["../../../src/orm/mongodbPeer.ts"],"names":[],"mappings":";;;AAAA,oEAAsE;AAI/D,MAAM,UAAU,GAAG,GAAG,EAAE,CAC7B,IAAA,wCAAqB,EACnB,SAAS,EACT,qBAAqB,EACrB,mFAAmF,CACpF,CAAC;AALS,QAAA,UAAU,cAKnB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findDependenciesHandler = void 0;
|
|
4
|
-
const mongodb_1 = require("mongodb");
|
|
5
4
|
const dbService_1 = require("../dbService");
|
|
6
5
|
const parseId_1 = require("../utils/parseId");
|
|
6
|
+
const mongodbPeer_1 = require("../mongodbPeer");
|
|
7
7
|
const Registry_1 = require("../../lib/Registry");
|
|
8
8
|
const isRelationFieldAndTarget = (field, contentType) => field.getConfig().ui === "ContentType" &&
|
|
9
9
|
field.contentType.name === contentType;
|
|
@@ -29,6 +29,7 @@ const isSelfRelationFieldAndSameTarget = (field, thisContentType, targetContentT
|
|
|
29
29
|
*/
|
|
30
30
|
const findDependenciesHandler = (db) => async (contentType, id) => {
|
|
31
31
|
(0, dbService_1.checkFailureCase)("FoundError");
|
|
32
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
32
33
|
const parsedId = (0, parseId_1.parseId)(id);
|
|
33
34
|
const parsedIdString = parsedId.toString();
|
|
34
35
|
const hasTargetId = (value) => {
|
|
@@ -38,7 +39,7 @@ const findDependenciesHandler = (db) => async (contentType, id) => {
|
|
|
38
39
|
if (!value || typeof value !== "object")
|
|
39
40
|
return false;
|
|
40
41
|
const maybeRelation = value;
|
|
41
|
-
if (maybeRelation._id instanceof
|
|
42
|
+
if (maybeRelation._id instanceof ObjectId) {
|
|
42
43
|
return maybeRelation._id.toString() === parsedIdString;
|
|
43
44
|
}
|
|
44
45
|
if (typeof maybeRelation._id === "string") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findDependencies.js","sourceRoot":"","sources":["../../../../src/orm/operations/findDependencies.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"findDependencies.js","sourceRoot":"","sources":["../../../../src/orm/operations/findDependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseId = void 0;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../mongodbPeer");
|
|
5
5
|
const parseId = (id) => {
|
|
6
|
-
|
|
6
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
7
|
+
return new ObjectId(id.toString());
|
|
7
8
|
};
|
|
8
9
|
exports.parseId = parseId;
|
|
9
10
|
//# sourceMappingURL=parseId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/orm/utils/parseId.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/orm/utils/parseId.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAErC,MAAM,OAAO,GAAG,CAAC,EAAM,EAAE,EAAE;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAC;IAClC,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformObjectIdsToStrings = transformObjectIdsToStrings;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../mongodbPeer");
|
|
5
5
|
function transformObjectIdsToStrings(obj) {
|
|
6
|
-
|
|
6
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
7
|
+
if (obj instanceof ObjectId) {
|
|
7
8
|
return obj.toString();
|
|
8
9
|
}
|
|
9
10
|
if (Array.isArray(obj)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformObjectIdsToStrings.js","sourceRoot":"","sources":["../../../../src/orm/utils/transformObjectIdsToStrings.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"transformObjectIdsToStrings.js","sourceRoot":"","sources":["../../../../src/orm/utils/transformObjectIdsToStrings.ts"],"names":[],"mappings":";;AAEA,kEAoBC;AAtBD,gDAA2C;AAE3C,SAAgB,2BAA2B,CAAI,GAAM;IACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAA;IAEjC,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,QAAQ,EAAkB,CAAA;IACvC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAiB,CAAA;IAC7E,CAAC;IAED,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,GAA4B,EAAE,CAAA;QAC1C,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAY,CAAA;QAChE,CAAC;QACD,OAAO,MAAW,CAAA;IACpB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformStringToObjectIds = transformStringToObjectIds;
|
|
4
|
-
const
|
|
4
|
+
const mongodbPeer_1 = require("../mongodbPeer");
|
|
5
5
|
function transformStringToObjectIds(obj) {
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const { ObjectId } = (0, mongodbPeer_1.getMongoDB)();
|
|
7
|
+
if (typeof obj === 'string' && ObjectId.isValid(obj)) {
|
|
8
|
+
return new ObjectId(obj);
|
|
8
9
|
}
|
|
9
10
|
if (Array.isArray(obj)) {
|
|
10
11
|
return obj.map((item) => transformStringToObjectIds(item));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformStringToObjectIds.js","sourceRoot":"","sources":["../../../../src/orm/utils/transformStringToObjectIds.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"transformStringToObjectIds.js","sourceRoot":"","sources":["../../../../src/orm/utils/transformStringToObjectIds.ts"],"names":[],"mappings":";;AAEA,gEAoBC;AAtBD,gDAA2C;AAE3C,SAAgB,0BAA0B,CAAI,GAAM;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAA;IAEjC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAiB,CAAA;IAC1C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAiB,CAAA;IAC5E,CAAC;IAED,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,GAA4B,EAAE,CAAA;QAC1C,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAY,CAAA;QAC/D,CAAC;QACD,OAAO,MAAW,CAAA;IACpB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseId.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"parseId.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGxC,wBAAgB,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAGxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseId.js","sourceRoot":"","sources":["../../../../src/api/utils/parseId.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,UAAU,OAAO,CAAC,EAAM;IAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC;IAClC,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwords.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"passwords.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,YAE5D,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,WAE5C,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { requirePeerDependency } from "../../lib/utils/peerDependencies";
|
|
2
|
+
const getBcrypt = () => requirePeerDependency("bcrypt", "npm install bcrypt", "Rakun uses bcrypt to verify and hash manager passwords.");
|
|
2
3
|
export const verifyPassword = (password, hash) => {
|
|
3
|
-
return
|
|
4
|
+
return getBcrypt().compareSync(password, hash);
|
|
4
5
|
};
|
|
5
6
|
export const hashPassword = (password) => {
|
|
6
|
-
return
|
|
7
|
+
return getBcrypt().hashSync(password, 10);
|
|
7
8
|
};
|
|
8
9
|
//# sourceMappingURL=passwords.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../../../src/api/utils/passwords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAIzE,MAAM,SAAS,GAAG,GAAG,EAAE,CACrB,qBAAqB,CACnB,QAAQ,EACR,oBAAoB,EACpB,yDAAyD,CAC1D,CAAC;AAEJ,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,EAAE;IAC/D,OAAO,SAAS,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC/C,OAAO,SAAS,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populateRelations.d.ts","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"populateRelations.d.ts","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAM7D;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,WAAW,EACrD,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,WAAW,EACrD,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAClB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { ObjectId } from "mongodb";
|
|
2
1
|
import { Media } from "../../../internal-content-types";
|
|
3
2
|
import { getContentTypeByName } from "../../../lib/Registry";
|
|
4
3
|
import { hasKeys } from "../../../lib/utils/hasKeys";
|
|
5
4
|
import { getMediaService } from "../../../media";
|
|
6
5
|
import { getMongoService } from "../../../orm";
|
|
6
|
+
import { getMongoDB } from "../../../orm/mongodbPeer";
|
|
7
7
|
export async function populateRelations(data) {
|
|
8
8
|
const db = await getMongoService();
|
|
9
|
+
const { ObjectId } = getMongoDB();
|
|
9
10
|
if (Array.isArray(data)) {
|
|
10
11
|
return Promise.all(data.map((item) => populateRelations(item)));
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populateRelations.js","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"populateRelations.js","sourceRoot":"","sources":["../../../../../src/api/utils/populates/populateRelations.ts"],"names":[],"mappings":"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"}
|