@vendure/core 2.0.3 → 2.0.5
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/api/config/graphql-custom-fields.js +2 -1
- package/dist/api/config/graphql-custom-fields.js.map +1 -1
- package/dist/api/resolvers/admin/auth.resolver.js +12 -1
- package/dist/api/resolvers/admin/auth.resolver.js.map +1 -1
- package/dist/api/resolvers/base/base-auth.resolver.d.ts +1 -4
- package/dist/api/resolvers/base/base-auth.resolver.js +0 -14
- package/dist/api/resolvers/base/base-auth.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-auth.resolver.js +11 -1
- package/dist/api/resolvers/shop/shop-auth.resolver.js.map +1 -1
- package/dist/config/default-config.js +1 -1
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/fulfillment/default-fulfillment-process.js +4 -1
- package/dist/config/fulfillment/default-fulfillment-process.js.map +1 -1
- package/dist/config/order/default-order-process.js +5 -0
- package/dist/config/order/default-order-process.js.map +1 -1
- package/dist/config/session-cache/session-cache-strategy.d.ts +24 -8
- package/dist/entity/surcharge/surcharge.entity.js +3 -2
- package/dist/entity/surcharge/surcharge.entity.js.map +1 -1
- package/dist/plugin/default-search-plugin/fulltext-search.service.js +2 -2
- package/dist/plugin/default-search-plugin/fulltext-search.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/index.d.ts +6 -0
- package/dist/plugin/default-search-plugin/index.js +6 -0
- package/dist/plugin/default-search-plugin/index.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +12 -10
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/types.d.ts +1 -1
- package/dist/service/helpers/request-context/request-context.service.d.ts +2 -1
- package/dist/service/helpers/request-context/request-context.service.js +2 -1
- package/dist/service/helpers/request-context/request-context.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +1 -3
- package/dist/service/services/collection.service.js +4 -5
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/customer.service.js +1 -3
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.d.ts +2 -1
- package/dist/service/services/fulfillment.service.js +11 -9
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/payment.service.js +1 -1
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/session.service.d.ts +6 -0
- package/dist/service/services/session.service.js +20 -9
- package/dist/service/services/session.service.js.map +1 -1
- package/dist/service/services/stock-location.service.js +5 -8
- package/dist/service/services/stock-location.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -36,6 +36,7 @@ let SessionService = class SessionService {
|
|
|
36
36
|
this.connection = connection;
|
|
37
37
|
this.configService = configService;
|
|
38
38
|
this.orderService = orderService;
|
|
39
|
+
this.sessionCacheTimeoutMs = 50;
|
|
39
40
|
this.sessionCacheStrategy = this.configService.authOptions.sessionCacheStrategy;
|
|
40
41
|
this.sessionDurationInMs = (0, ms_1.default)(this.configService.authOptions.sessionDuration);
|
|
41
42
|
// This allows us to register this class as a TypeORM Subscriber while also allowing
|
|
@@ -60,7 +61,7 @@ let SessionService = class SessionService {
|
|
|
60
61
|
// session cache will be wrong, so we just clear the entire cache. It should however
|
|
61
62
|
// be a very rare occurrence in normal operation, once initial setup is complete.
|
|
62
63
|
if (event.entity instanceof channel_entity_1.Channel || event.entity instanceof role_entity_1.Role) {
|
|
63
|
-
await this.sessionCacheStrategy.clear();
|
|
64
|
+
await this.withTimeout(this.sessionCacheStrategy.clear());
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
}
|
|
@@ -83,7 +84,7 @@ let SessionService = class SessionService {
|
|
|
83
84
|
expires: this.getExpiryDate(this.sessionDurationInMs),
|
|
84
85
|
invalidated: false,
|
|
85
86
|
}));
|
|
86
|
-
await this.sessionCacheStrategy.set(this.serializeSession(authenticatedSession));
|
|
87
|
+
await this.withTimeout(this.sessionCacheStrategy.set(this.serializeSession(authenticatedSession)));
|
|
87
88
|
return authenticatedSession;
|
|
88
89
|
}
|
|
89
90
|
/**
|
|
@@ -101,7 +102,7 @@ let SessionService = class SessionService {
|
|
|
101
102
|
// save the new session
|
|
102
103
|
const newSession = await this.connection.rawConnection.getRepository(anonymous_session_entity_1.AnonymousSession).save(session);
|
|
103
104
|
const serializedSession = this.serializeSession(newSession);
|
|
104
|
-
await this.sessionCacheStrategy.set(serializedSession);
|
|
105
|
+
await this.withTimeout(this.sessionCacheStrategy.set(serializedSession));
|
|
105
106
|
return serializedSession;
|
|
106
107
|
}
|
|
107
108
|
/**
|
|
@@ -109,14 +110,14 @@ let SessionService = class SessionService {
|
|
|
109
110
|
* Returns the cached session object matching the given session token.
|
|
110
111
|
*/
|
|
111
112
|
async getSessionFromToken(sessionToken) {
|
|
112
|
-
let serializedSession = await this.sessionCacheStrategy.get(sessionToken);
|
|
113
|
+
let serializedSession = await this.withTimeout(this.sessionCacheStrategy.get(sessionToken));
|
|
113
114
|
const stale = !!(serializedSession && serializedSession.cacheExpiry < new Date().getTime() / 1000);
|
|
114
115
|
const expired = !!(serializedSession && serializedSession.expires < new Date());
|
|
115
116
|
if (!serializedSession || stale || expired) {
|
|
116
117
|
const session = await this.findSessionByToken(sessionToken);
|
|
117
118
|
if (session) {
|
|
118
119
|
serializedSession = this.serializeSession(session);
|
|
119
|
-
await this.sessionCacheStrategy.set(serializedSession);
|
|
120
|
+
await this.withTimeout(this.sessionCacheStrategy.set(serializedSession));
|
|
120
121
|
return serializedSession;
|
|
121
122
|
}
|
|
122
123
|
else {
|
|
@@ -151,6 +152,16 @@ let SessionService = class SessionService {
|
|
|
151
152
|
}
|
|
152
153
|
return serializedSession;
|
|
153
154
|
}
|
|
155
|
+
/**
|
|
156
|
+
* If the session cache is taking longer than say 50ms then something is wrong - it is supposed to
|
|
157
|
+
* be very fast after all! So we will return undefined and let the request continue without a cached session.
|
|
158
|
+
*/
|
|
159
|
+
withTimeout(maybeSlow) {
|
|
160
|
+
return Promise.race([
|
|
161
|
+
new Promise(resolve => setTimeout(() => resolve(undefined), this.sessionCacheTimeoutMs)),
|
|
162
|
+
maybeSlow,
|
|
163
|
+
]);
|
|
164
|
+
}
|
|
154
165
|
/**
|
|
155
166
|
* Looks for a valid session with the given token and returns one if found.
|
|
156
167
|
*/
|
|
@@ -182,7 +193,7 @@ let SessionService = class SessionService {
|
|
|
182
193
|
session.activeOrder = order;
|
|
183
194
|
await this.connection.getRepository(ctx, session_entity_1.Session).save(session, { reload: false });
|
|
184
195
|
const updatedSerializedSession = this.serializeSession(session);
|
|
185
|
-
await this.sessionCacheStrategy.set(updatedSerializedSession);
|
|
196
|
+
await this.withTimeout(this.sessionCacheStrategy.set(updatedSerializedSession));
|
|
186
197
|
return updatedSerializedSession;
|
|
187
198
|
}
|
|
188
199
|
return serializedSession;
|
|
@@ -220,7 +231,7 @@ let SessionService = class SessionService {
|
|
|
220
231
|
session.activeChannel = channel;
|
|
221
232
|
await this.connection.rawConnection.getRepository(session_entity_1.Session).save(session, { reload: false });
|
|
222
233
|
const updatedSerializedSession = this.serializeSession(session);
|
|
223
|
-
await this.sessionCacheStrategy.set(updatedSerializedSession);
|
|
234
|
+
await this.withTimeout(this.sessionCacheStrategy.set(updatedSerializedSession));
|
|
224
235
|
return updatedSerializedSession;
|
|
225
236
|
}
|
|
226
237
|
return serializedSession;
|
|
@@ -235,7 +246,7 @@ let SessionService = class SessionService {
|
|
|
235
246
|
.find({ where: { user: { id: user.id } } });
|
|
236
247
|
await this.connection.getRepository(ctx, authenticated_session_entity_1.AuthenticatedSession).remove(userSessions);
|
|
237
248
|
for (const session of userSessions) {
|
|
238
|
-
await this.sessionCacheStrategy.delete(session.token);
|
|
249
|
+
await this.withTimeout(this.sessionCacheStrategy.delete(session.token));
|
|
239
250
|
}
|
|
240
251
|
}
|
|
241
252
|
/**
|
|
@@ -246,7 +257,7 @@ let SessionService = class SessionService {
|
|
|
246
257
|
const sessions = await this.connection.getRepository(ctx, session_entity_1.Session).find({ where: { activeOrderId } });
|
|
247
258
|
await this.connection.getRepository(ctx, session_entity_1.Session).remove(sessions);
|
|
248
259
|
for (const session of sessions) {
|
|
249
|
-
await this.sessionCacheStrategy.delete(session.token);
|
|
260
|
+
await this.withTimeout(this.sessionCacheStrategy.delete(session.token));
|
|
250
261
|
}
|
|
251
262
|
}
|
|
252
263
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/service/services/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oDAA4B;AAC5B,4CAAoB;AAIpB,gEAA4D;AAE5D,wFAAoF;AACpF,wEAA8D;AAE9D,+DAAqD;AACrD,4FAAiF;AACjF,oGAAyF;AACzF,wEAA8D;AAE9D,kGAA4F;AAE5F,mDAA+C;AAE/C;;;;;GAKG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAc;
|
|
1
|
+
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/service/services/session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const index_5 = require("../../entity/index");
|
|
|
20
20
|
const stock_location_entity_1 = require("../../entity/stock-location/stock-location.entity");
|
|
21
21
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
22
22
|
const request_context_service_1 = require("../helpers/request-context/request-context.service");
|
|
23
|
+
const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
23
24
|
const channel_service_1 = require("./channel.service");
|
|
24
25
|
const role_service_1 = require("./role.service");
|
|
25
26
|
let StockLocationService = class StockLocationService {
|
|
@@ -54,10 +55,11 @@ let StockLocationService = class StockLocationService {
|
|
|
54
55
|
}));
|
|
55
56
|
}
|
|
56
57
|
async create(ctx, input) {
|
|
57
|
-
var _a;
|
|
58
|
+
var _a, _b;
|
|
58
59
|
const stockLocation = await this.connection.getRepository(ctx, stock_location_entity_1.StockLocation).save(new stock_location_entity_1.StockLocation({
|
|
59
60
|
name: input.name,
|
|
60
61
|
description: (_a = input.description) !== null && _a !== void 0 ? _a : '',
|
|
62
|
+
customFields: (_b = input.customFields) !== null && _b !== void 0 ? _b : {},
|
|
61
63
|
}));
|
|
62
64
|
await this.channelService.assignToCurrentChannel(stockLocation, ctx);
|
|
63
65
|
await this.connection.getRepository(ctx, stock_location_entity_1.StockLocation).save(stockLocation);
|
|
@@ -65,13 +67,8 @@ let StockLocationService = class StockLocationService {
|
|
|
65
67
|
}
|
|
66
68
|
async update(ctx, input) {
|
|
67
69
|
const stockLocation = await this.connection.getEntityOrThrow(ctx, stock_location_entity_1.StockLocation, input.id);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
if (input.description) {
|
|
72
|
-
stockLocation.description = input.description;
|
|
73
|
-
}
|
|
74
|
-
return this.connection.getRepository(ctx, stock_location_entity_1.StockLocation).save(stockLocation);
|
|
70
|
+
const updatedStockLocation = (0, patch_entity_1.patchEntity)(stockLocation, input);
|
|
71
|
+
return this.connection.getRepository(ctx, stock_location_entity_1.StockLocation).save(updatedStockLocation);
|
|
75
72
|
}
|
|
76
73
|
async delete(ctx, input) {
|
|
77
74
|
const stockLocation = await this.connection.findOneInChannel(ctx, stock_location_entity_1.StockLocation, input.id, ctx.channelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stock-location.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-location.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAS6C;AAI7C,6CAA+D;AAC/D,8CAM4B;AAC5B,8CAAmD;AACnD,kDAAiE;AACjE,8CAA2D;AAC3D,6FAAkF;AAClF,yFAAoF;AACpF,gGAA2F;
|
|
1
|
+
{"version":3,"file":"stock-location.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-location.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.5",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@nestjs/testing": "9.3.9",
|
|
53
53
|
"@nestjs/typeorm": "9.0.1",
|
|
54
54
|
"@types/fs-extra": "^9.0.1",
|
|
55
|
-
"@vendure/common": "^2.0.
|
|
55
|
+
"@vendure/common": "^2.0.5",
|
|
56
56
|
"apollo-server-express": "3.6.3",
|
|
57
57
|
"bcrypt": "^5.1.0",
|
|
58
58
|
"body-parser": "^1.19.0",
|
|
@@ -105,5 +105,5 @@
|
|
|
105
105
|
"sqlite3": "^5.1.4",
|
|
106
106
|
"typescript": "4.9.5"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "2fb595caf6460d6159fe3c62f8975b62e5c3c3d7"
|
|
109
109
|
}
|