@unchainedshop/core 3.0.0-rc.11 → 3.0.0-rc.13
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/lib/services/deleteUser.d.ts.map +1 -1
- package/lib/services/deleteUser.js +9 -1
- package/lib/services/deleteUser.js.map +1 -1
- package/lib/services/index.js +1 -1
- package/lib/services/index.js.map +1 -1
- package/lib/services/migrateUserData.js +2 -2
- package/lib/services/migrateUserData.js.map +1 -1
- package/package.json +20 -20
- package/src/services/deleteUser.ts +12 -2
- package/src/services/index.ts +1 -1
- package/src/services/migrateUserData.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteUser.d.ts","sourceRoot":"","sources":["../../src/services/deleteUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"deleteUser.d.ts","sourceRoot":"","sources":["../../src/services/deleteUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,qDAwCpF"}
|
|
@@ -5,6 +5,8 @@ export async function deleteUserService({ userId }) {
|
|
|
5
5
|
await this.bookmarks.deleteByUserId(userId);
|
|
6
6
|
await this.quotations.deleteRequestedUserQuotations(userId);
|
|
7
7
|
await this.enrollments.deleteInactiveUserEnrollments(userId);
|
|
8
|
+
await this.payment.paymentCredentials.deleteUserPaymentCredentials(userId);
|
|
9
|
+
await this.users.webAuthn.deleteUserWebAuthnCredentials(user.username);
|
|
8
10
|
const carts = await this.orders.findOrders({ userId, status: null });
|
|
9
11
|
await Array.fromAsync(carts, async (userCart) => {
|
|
10
12
|
await this.orders.positions.deleteOrderPositions(userCart?._id);
|
|
@@ -18,7 +20,13 @@ export async function deleteUserService({ userId }) {
|
|
|
18
20
|
const reviewsCount = await this.products.reviews.count({ authorId: userId });
|
|
19
21
|
const enrollmentsCount = await this.enrollments.count({ userId });
|
|
20
22
|
const tokens = await this.warehousing.findTokensForUser({ userId });
|
|
21
|
-
|
|
23
|
+
const paymentCredentials = await this.payment.paymentCredentials.count({ userId });
|
|
24
|
+
if (!ordersCount &&
|
|
25
|
+
!reviewsCount &&
|
|
26
|
+
!enrollmentsCount &&
|
|
27
|
+
!quotationsCount &&
|
|
28
|
+
!tokens?.length &&
|
|
29
|
+
!paymentCredentials) {
|
|
22
30
|
await this.users.deletePermanently({ userId });
|
|
23
31
|
}
|
|
24
32
|
return user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteUser.js","sourceRoot":"","sources":["../../src/services/deleteUser.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAgB,EAAE,MAAM,EAAsB;IACnF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,IAAI,CAAC,WAAW,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deleteUser.js","sourceRoot":"","sources":["../../src/services/deleteUser.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAgB,EAAE,MAAM,EAAsB;IACnF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,IAAI,CAAC,WAAW,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,6BAA6B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9D,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnF,IACE,CAAC,WAAW;QACZ,CAAC,YAAY;QACb,CAAC,gBAAgB;QACjB,CAAC,eAAe;QAChB,CAAC,MAAM,EAAE,MAAM;QACf,CAAC,kBAAkB,EACnB,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/lib/services/index.js
CHANGED
|
@@ -43,7 +43,7 @@ import { simulateProductPricingService } from './simulateProductPricing.js';
|
|
|
43
43
|
import { simulateProductDispatchingService } from './simulateProductDispatching.js';
|
|
44
44
|
import { simulateProductInventoryService } from './simulateProductInventory.js';
|
|
45
45
|
import { findOrInitCartService } from './findOrInitCart.js';
|
|
46
|
-
//
|
|
46
|
+
// Auto-Inject Unchained API as last parameter
|
|
47
47
|
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
|
|
48
48
|
function bindMethodsToModules(modules) {
|
|
49
49
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,kCAAkC,EAAE,MAAM,kCAAkC,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAE,oCAAoC,EAAE,MAAM,oCAAoC,CAAC;AAC1F,OAAO,EAAE,mCAAmC,EAAE,MAAM,mCAAmC,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,13 @@ export async function migrateUserDataService(userIdBeforeLogin, userId) {
|
|
|
8
8
|
fromUserId: userIdBeforeLogin,
|
|
9
9
|
toUserId: userId,
|
|
10
10
|
shouldMerge: userSettings.mergeUserCartsOnLogin,
|
|
11
|
-
countryContext: userBeforeLogin
|
|
11
|
+
countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
|
|
12
12
|
});
|
|
13
13
|
await migrateBookmarksService.bind(this)({
|
|
14
14
|
fromUserId: userIdBeforeLogin,
|
|
15
15
|
toUserId: userId,
|
|
16
16
|
shouldMerge: userSettings.mergeUserCartsOnLogin,
|
|
17
|
-
countryContext: userBeforeLogin
|
|
17
|
+
countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=migrateUserData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateUserData.js","sourceRoot":"","sources":["../../src/services/migrateUserData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,iBAAyB,EAAE,MAAc;IACpF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEzE,MAAM,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,cAAc,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"migrateUserData.js","sourceRoot":"","sources":["../../src/services/migrateUserData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,iBAAyB,EAAE,MAAc;IACpF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEzE,MAAM,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,IAAI,IAAI,EAAE,SAAS,EAAE,WAAW;KACxF,CAAC,CAAC;IAEH,MAAM,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,IAAI,IAAI,EAAE,SAAS,EAAE,WAAW;KACxF,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core",
|
|
3
|
-
"version": "3.0.0-rc.
|
|
3
|
+
"version": "3.0.0-rc.13",
|
|
4
4
|
"main": "lib/core-index.js",
|
|
5
5
|
"types": "lib/core-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -32,25 +32,25 @@
|
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@breejs/later": "^4.2.0",
|
|
35
|
-
"@unchainedshop/core-assortments": "^3.0.0-rc.
|
|
36
|
-
"@unchainedshop/core-bookmarks": "^3.0.0-rc.
|
|
37
|
-
"@unchainedshop/core-countries": "^3.0.0-rc.
|
|
38
|
-
"@unchainedshop/core-currencies": "^3.0.0-rc.
|
|
39
|
-
"@unchainedshop/core-delivery": "^3.0.0-rc.
|
|
40
|
-
"@unchainedshop/core-enrollments": "^3.0.0-rc.
|
|
41
|
-
"@unchainedshop/core-events": "^3.0.0-rc.
|
|
42
|
-
"@unchainedshop/core-files": "^3.0.0-rc.
|
|
43
|
-
"@unchainedshop/core-filters": "^3.0.0-rc.
|
|
44
|
-
"@unchainedshop/core-languages": "^3.0.0-rc.
|
|
45
|
-
"@unchainedshop/core-orders": "^3.0.0-rc.
|
|
46
|
-
"@unchainedshop/core-payment": "^3.0.0-rc.
|
|
47
|
-
"@unchainedshop/core-products": "^3.0.0-rc.
|
|
48
|
-
"@unchainedshop/core-quotations": "^3.0.0-rc.
|
|
49
|
-
"@unchainedshop/core-users": "^3.0.0-rc.
|
|
50
|
-
"@unchainedshop/core-warehousing": "^3.0.0-rc.
|
|
51
|
-
"@unchainedshop/core-worker": "^3.0.0-rc.
|
|
52
|
-
"@unchainedshop/logger": "^3.0.0-rc.
|
|
53
|
-
"@unchainedshop/utils": "^3.0.0-rc.
|
|
35
|
+
"@unchainedshop/core-assortments": "^3.0.0-rc.13",
|
|
36
|
+
"@unchainedshop/core-bookmarks": "^3.0.0-rc.13",
|
|
37
|
+
"@unchainedshop/core-countries": "^3.0.0-rc.13",
|
|
38
|
+
"@unchainedshop/core-currencies": "^3.0.0-rc.13",
|
|
39
|
+
"@unchainedshop/core-delivery": "^3.0.0-rc.13",
|
|
40
|
+
"@unchainedshop/core-enrollments": "^3.0.0-rc.13",
|
|
41
|
+
"@unchainedshop/core-events": "^3.0.0-rc.13",
|
|
42
|
+
"@unchainedshop/core-files": "^3.0.0-rc.13",
|
|
43
|
+
"@unchainedshop/core-filters": "^3.0.0-rc.13",
|
|
44
|
+
"@unchainedshop/core-languages": "^3.0.0-rc.13",
|
|
45
|
+
"@unchainedshop/core-orders": "^3.0.0-rc.13",
|
|
46
|
+
"@unchainedshop/core-payment": "^3.0.0-rc.13",
|
|
47
|
+
"@unchainedshop/core-products": "^3.0.0-rc.13",
|
|
48
|
+
"@unchainedshop/core-quotations": "^3.0.0-rc.13",
|
|
49
|
+
"@unchainedshop/core-users": "^3.0.0-rc.13",
|
|
50
|
+
"@unchainedshop/core-warehousing": "^3.0.0-rc.13",
|
|
51
|
+
"@unchainedshop/core-worker": "^3.0.0-rc.13",
|
|
52
|
+
"@unchainedshop/logger": "^3.0.0-rc.13",
|
|
53
|
+
"@unchainedshop/utils": "^3.0.0-rc.13"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@types/node": "^22.10.2",
|
|
@@ -8,6 +8,8 @@ export async function deleteUserService(this: Modules, { userId }: { userId: str
|
|
|
8
8
|
await this.bookmarks.deleteByUserId(userId);
|
|
9
9
|
await this.quotations.deleteRequestedUserQuotations(userId);
|
|
10
10
|
await this.enrollments.deleteInactiveUserEnrollments(userId);
|
|
11
|
+
await this.payment.paymentCredentials.deleteUserPaymentCredentials(userId);
|
|
12
|
+
await this.users.webAuthn.deleteUserWebAuthnCredentials(user.username);
|
|
11
13
|
|
|
12
14
|
const carts = await this.orders.findOrders({ userId, status: null });
|
|
13
15
|
|
|
@@ -24,8 +26,16 @@ export async function deleteUserService(this: Modules, { userId }: { userId: str
|
|
|
24
26
|
const reviewsCount = await this.products.reviews.count({ authorId: userId });
|
|
25
27
|
const enrollmentsCount = await this.enrollments.count({ userId });
|
|
26
28
|
const tokens = await this.warehousing.findTokensForUser({ userId });
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
const paymentCredentials = await this.payment.paymentCredentials.count({ userId });
|
|
30
|
+
|
|
31
|
+
if (
|
|
32
|
+
!ordersCount &&
|
|
33
|
+
!reviewsCount &&
|
|
34
|
+
!enrollmentsCount &&
|
|
35
|
+
!quotationsCount &&
|
|
36
|
+
!tokens?.length &&
|
|
37
|
+
!paymentCredentials
|
|
38
|
+
) {
|
|
29
39
|
await this.users.deletePermanently({ userId });
|
|
30
40
|
}
|
|
31
41
|
|
package/src/services/index.ts
CHANGED
|
@@ -45,7 +45,7 @@ import { simulateProductDispatchingService } from './simulateProductDispatching.
|
|
|
45
45
|
import { simulateProductInventoryService } from './simulateProductInventory.js';
|
|
46
46
|
import { findOrInitCartService } from './findOrInitCart.js';
|
|
47
47
|
|
|
48
|
-
//
|
|
48
|
+
// Auto-Inject Unchained API as last parameter
|
|
49
49
|
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
|
|
50
50
|
|
|
51
51
|
function bindMethodsToModules(modules: Modules) {
|
|
@@ -10,13 +10,13 @@ export async function migrateUserDataService(userIdBeforeLogin: string, userId:
|
|
|
10
10
|
fromUserId: userIdBeforeLogin,
|
|
11
11
|
toUserId: userId,
|
|
12
12
|
shouldMerge: userSettings.mergeUserCartsOnLogin,
|
|
13
|
-
countryContext: userBeforeLogin
|
|
13
|
+
countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
|
|
14
14
|
});
|
|
15
15
|
|
|
16
16
|
await migrateBookmarksService.bind(this)({
|
|
17
17
|
fromUserId: userIdBeforeLogin,
|
|
18
18
|
toUserId: userId,
|
|
19
19
|
shouldMerge: userSettings.mergeUserCartsOnLogin,
|
|
20
|
-
countryContext: userBeforeLogin
|
|
20
|
+
countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
|
|
21
21
|
});
|
|
22
22
|
}
|