@vendure/core 2.0.3 → 2.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/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/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/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/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
|
@@ -15,7 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.AuthResolver = void 0;
|
|
16
16
|
const graphql_1 = require("@nestjs/graphql");
|
|
17
17
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
18
|
+
const generated_graphql_admin_errors_1 = require("../../../common/error/generated-graphql-admin-errors");
|
|
19
|
+
const native_authentication_strategy_1 = require("../../../config/auth/native-authentication-strategy");
|
|
18
20
|
const config_service_1 = require("../../../config/config.service");
|
|
21
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
19
22
|
const administrator_service_1 = require("../../../service/services/administrator.service");
|
|
20
23
|
const auth_service_1 = require("../../../service/services/auth.service");
|
|
21
24
|
const user_service_1 = require("../../../service/services/user.service");
|
|
@@ -45,7 +48,15 @@ let AuthResolver = class AuthResolver extends base_auth_resolver_1.BaseAuthResol
|
|
|
45
48
|
return super.me(ctx, 'admin');
|
|
46
49
|
}
|
|
47
50
|
requireNativeAuthStrategy() {
|
|
48
|
-
|
|
51
|
+
const { adminAuthenticationStrategy } = this.configService.authOptions;
|
|
52
|
+
const nativeAuthStrategyIsConfigured = !!adminAuthenticationStrategy.find(strategy => strategy.name === native_authentication_strategy_1.NATIVE_AUTH_STRATEGY_NAME);
|
|
53
|
+
if (!nativeAuthStrategyIsConfigured) {
|
|
54
|
+
const authStrategyNames = adminAuthenticationStrategy.map(s => s.name).join(', ');
|
|
55
|
+
const errorMessage = 'This GraphQL operation requires that the NativeAuthenticationStrategy be configured for the Admin API.\n' +
|
|
56
|
+
`Currently the following AuthenticationStrategies are enabled: ${authStrategyNames}`;
|
|
57
|
+
vendure_logger_1.Logger.error(errorMessage);
|
|
58
|
+
return new generated_graphql_admin_errors_1.NativeAuthStrategyError();
|
|
59
|
+
}
|
|
49
60
|
}
|
|
50
61
|
};
|
|
51
62
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/auth.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA2E;AAC3E,yEAO6C;
|
|
1
|
+
{"version":3,"file":"auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/auth.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { AuthenticationResult as ShopAuthenticationResult, PasswordValidationError } from '@vendure/common/lib/generated-shop-types';
|
|
2
2
|
import { AuthenticationResult as AdminAuthenticationResult, CurrentUser, MutationAuthenticateArgs, MutationLoginArgs, Success } from '@vendure/common/lib/generated-types';
|
|
3
3
|
import { Request, Response } from 'express';
|
|
4
|
-
import {
|
|
5
|
-
import { InvalidCredentialsError, NativeAuthStrategyError as ShopNativeAuthStrategyError, NotVerifiedError } from '../../../common/error/generated-graphql-shop-errors';
|
|
4
|
+
import { InvalidCredentialsError, NotVerifiedError } from '../../../common/error/generated-graphql-shop-errors';
|
|
6
5
|
import { ConfigService } from '../../../config/config.service';
|
|
7
6
|
import { User } from '../../../entity/user/user.entity';
|
|
8
7
|
import { AdministratorService } from '../../../service/services/administrator.service';
|
|
@@ -15,7 +14,6 @@ export declare class BaseAuthResolver {
|
|
|
15
14
|
protected userService: UserService;
|
|
16
15
|
protected administratorService: AdministratorService;
|
|
17
16
|
protected configService: ConfigService;
|
|
18
|
-
protected readonly nativeAuthStrategyIsConfigured: boolean;
|
|
19
17
|
constructor(authService: AuthService, userService: UserService, administratorService: AdministratorService, configService: ConfigService);
|
|
20
18
|
/**
|
|
21
19
|
* Attempts a login given the username and password of a user. If successful, returns
|
|
@@ -39,5 +37,4 @@ export declare class BaseAuthResolver {
|
|
|
39
37
|
* Exposes a subset of the User properties which we want to expose to the public API.
|
|
40
38
|
*/
|
|
41
39
|
protected publiclyAccessibleUser(user: User): CurrentUser;
|
|
42
|
-
protected requireNativeAuthStrategy(): AdminNativeAuthStrategyError | ShopNativeAuthStrategyError | undefined;
|
|
43
40
|
}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseAuthResolver = void 0;
|
|
4
4
|
const error_result_1 = require("../../../common/error/error-result");
|
|
5
5
|
const errors_1 = require("../../../common/error/errors");
|
|
6
|
-
const generated_graphql_admin_errors_1 = require("../../../common/error/generated-graphql-admin-errors");
|
|
7
6
|
const generated_graphql_shop_errors_1 = require("../../../common/error/generated-graphql-shop-errors");
|
|
8
7
|
const native_authentication_strategy_1 = require("../../../config/auth/native-authentication-strategy");
|
|
9
8
|
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
@@ -16,8 +15,6 @@ class BaseAuthResolver {
|
|
|
16
15
|
this.userService = userService;
|
|
17
16
|
this.administratorService = administratorService;
|
|
18
17
|
this.configService = configService;
|
|
19
|
-
this.nativeAuthStrategyIsConfigured =
|
|
20
|
-
!!this.configService.authOptions.shopAuthenticationStrategy.find(strategy => strategy.name === native_authentication_strategy_1.NATIVE_AUTH_STRATEGY_NAME);
|
|
21
18
|
}
|
|
22
19
|
/**
|
|
23
20
|
* Attempts a login given the username and password of a user. If successful, returns
|
|
@@ -106,17 +103,6 @@ class BaseAuthResolver {
|
|
|
106
103
|
channels: (0, get_user_channels_permissions_1.getUserChannelsPermissions)(user),
|
|
107
104
|
};
|
|
108
105
|
}
|
|
109
|
-
requireNativeAuthStrategy() {
|
|
110
|
-
if (!this.nativeAuthStrategyIsConfigured) {
|
|
111
|
-
const authStrategyNames = this.configService.authOptions.shopAuthenticationStrategy
|
|
112
|
-
.map(s => s.name)
|
|
113
|
-
.join(', ');
|
|
114
|
-
const errorMessage = 'This GraphQL operation requires that the NativeAuthenticationStrategy be configured for the Shop API.\n' +
|
|
115
|
-
`Currently the following AuthenticationStrategies are enabled: ${authStrategyNames}`;
|
|
116
|
-
vendure_logger_1.Logger.error(errorMessage);
|
|
117
|
-
return new generated_graphql_admin_errors_1.NativeAuthStrategyError();
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
106
|
}
|
|
121
107
|
exports.BaseAuthResolver = BaseAuthResolver;
|
|
122
108
|
//# sourceMappingURL=base-auth.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/base/base-auth.resolver.ts"],"names":[],"mappings":";;;AAcA,qEAA0E;AAC1E,yDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"base-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/base/base-auth.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,10 @@ const generated_shop_types_1 = require("@vendure/common/lib/generated-shop-types
|
|
|
18
18
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
19
19
|
const error_result_1 = require("../../../common/error/error-result");
|
|
20
20
|
const errors_1 = require("../../../common/error/errors");
|
|
21
|
+
const generated_graphql_shop_errors_1 = require("../../../common/error/generated-graphql-shop-errors");
|
|
21
22
|
const native_authentication_strategy_1 = require("../../../config/auth/native-authentication-strategy");
|
|
22
23
|
const config_service_1 = require("../../../config/config.service");
|
|
24
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
23
25
|
const administrator_service_1 = require("../../../service/services/administrator.service");
|
|
24
26
|
const auth_service_1 = require("../../../service/services/auth.service");
|
|
25
27
|
const customer_service_1 = require("../../../service/services/customer.service");
|
|
@@ -198,7 +200,15 @@ let ShopAuthResolver = class ShopAuthResolver extends base_auth_resolver_1.BaseA
|
|
|
198
200
|
return { success: result };
|
|
199
201
|
}
|
|
200
202
|
requireNativeAuthStrategy() {
|
|
201
|
-
|
|
203
|
+
const { shopAuthenticationStrategy } = this.configService.authOptions;
|
|
204
|
+
const nativeAuthStrategyIsConfigured = !!shopAuthenticationStrategy.find(strategy => strategy.name === native_authentication_strategy_1.NATIVE_AUTH_STRATEGY_NAME);
|
|
205
|
+
if (!nativeAuthStrategyIsConfigured) {
|
|
206
|
+
const authStrategyNames = shopAuthenticationStrategy.map(s => s.name).join(', ');
|
|
207
|
+
const errorMessage = 'This GraphQL operation requires that the NativeAuthenticationStrategy be configured for the Shop API.\n' +
|
|
208
|
+
`Currently the following AuthenticationStrategies are enabled: ${authStrategyNames}`;
|
|
209
|
+
vendure_logger_1.Logger.error(errorMessage);
|
|
210
|
+
return new generated_graphql_shop_errors_1.NativeAuthStrategyError();
|
|
211
|
+
}
|
|
202
212
|
}
|
|
203
213
|
};
|
|
204
214
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shop-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-auth.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA2E;AAC3E,mFA0BkD;AAClD,yEAAuE;AAGvE,qEAA0E;AAC1E,yDAA8D;
|
|
1
|
+
{"version":3,"file":"shop-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-auth.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -280,6 +280,11 @@ function configureDefaultOrderProcess(options) {
|
|
|
280
280
|
if (toState === 'Cancelled') {
|
|
281
281
|
order.active = false;
|
|
282
282
|
}
|
|
283
|
+
if (fromState === 'Draft' && toState === 'ArrangingPayment') {
|
|
284
|
+
// Once we exit the Draft state, we can consider the order active,
|
|
285
|
+
// which will allow us to run the OrderPlacedStrategy at the correct point.
|
|
286
|
+
order.active = true;
|
|
287
|
+
}
|
|
283
288
|
await historyService.createHistoryEntryForOrder({
|
|
284
289
|
orderId: order.id,
|
|
285
290
|
type: generated_types_1.HistoryEntryType.ORDER_STATE_TRANSITION,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-order-process.js","sourceRoot":"","sources":["../../../src/config/order/default-order-process.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"default-order-process.js","sourceRoot":"","sources":["../../../src/config/order/default-order-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,23 +75,39 @@ export type CachedSession = {
|
|
|
75
75
|
* this.client.on('error', err => Logger.error(err.message, loggerCtx, err.stack));
|
|
76
76
|
* }
|
|
77
77
|
*
|
|
78
|
+
* async destroy() {
|
|
79
|
+
* await this.client.quit();
|
|
80
|
+
* }
|
|
81
|
+
*
|
|
78
82
|
* async get(sessionToken: string): Promise<CachedSession | undefined> {
|
|
79
|
-
*
|
|
80
|
-
*
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
83
|
+
* try {
|
|
84
|
+
* const retrieved = await this.client.get(this.namespace(sessionToken));
|
|
85
|
+
* if (retrieved) {
|
|
86
|
+
* try {
|
|
87
|
+
* return JSON.parse(retrieved);
|
|
88
|
+
* } catch (e: any) {
|
|
89
|
+
* Logger.error(`Could not parse cached session data: ${e.message}`, loggerCtx);
|
|
90
|
+
* }
|
|
85
91
|
* }
|
|
92
|
+
* } catch (e: any) {
|
|
93
|
+
* Logger.error(`Could not get cached session: ${e.message}`, loggerCtx);
|
|
86
94
|
* }
|
|
87
95
|
* }
|
|
88
96
|
*
|
|
89
97
|
* async set(session: CachedSession) {
|
|
90
|
-
*
|
|
98
|
+
* try {
|
|
99
|
+
* await this.client.set(this.namespace(session.token), JSON.stringify(session));
|
|
100
|
+
* } catch (e: any) {
|
|
101
|
+
* Logger.error(`Could not set cached session: ${e.message}`, loggerCtx);
|
|
102
|
+
* }
|
|
91
103
|
* }
|
|
92
104
|
*
|
|
93
105
|
* async delete(sessionToken: string) {
|
|
94
|
-
*
|
|
106
|
+
* try {
|
|
107
|
+
* await this.client.del(this.namespace(sessionToken));
|
|
108
|
+
* } catch (e: any) {
|
|
109
|
+
* Logger.error(`Could not delete cached session: ${e.message}`, loggerCtx);
|
|
110
|
+
* }
|
|
95
111
|
* }
|
|
96
112
|
*
|
|
97
113
|
* clear() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LanguageCode, Permission } from '@vendure/common/lib/generated-types';
|
|
1
|
+
import { CurrencyCode, LanguageCode, Permission } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { Request } from 'express';
|
|
4
4
|
import { GraphQLResolveInfo } from 'graphql';
|
|
@@ -33,6 +33,7 @@ export declare class RequestContextService {
|
|
|
33
33
|
apiType: ApiType;
|
|
34
34
|
channelOrToken?: Channel | string;
|
|
35
35
|
languageCode?: LanguageCode;
|
|
36
|
+
currencyCode?: CurrencyCode;
|
|
36
37
|
user?: User;
|
|
37
38
|
activeOrderId?: ID;
|
|
38
39
|
}): Promise<RequestContext>;
|
|
@@ -44,7 +44,7 @@ let RequestContextService = class RequestContextService {
|
|
|
44
44
|
* @since 1.5.0
|
|
45
45
|
*/
|
|
46
46
|
async create(config) {
|
|
47
|
-
const { req, apiType, channelOrToken, languageCode, user, activeOrderId } = config;
|
|
47
|
+
const { req, apiType, channelOrToken, languageCode, currencyCode, user, activeOrderId } = config;
|
|
48
48
|
let channel;
|
|
49
49
|
if (channelOrToken instanceof channel_entity_1.Channel) {
|
|
50
50
|
channel = channelOrToken;
|
|
@@ -77,6 +77,7 @@ let RequestContextService = class RequestContextService {
|
|
|
77
77
|
apiType,
|
|
78
78
|
channel,
|
|
79
79
|
languageCode,
|
|
80
|
+
currencyCode,
|
|
80
81
|
session,
|
|
81
82
|
isAuthorized: true,
|
|
82
83
|
authorizedAsOwnerOnly: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/request-context/request-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA6F;AAI7F,4CAAoB;AAEpB,mEAAuE;AACvE,yEAAqE;AACrE,iDAAoD;AACpD,mEAA+D;AAE/D,2EAAiE;AAEjE,oEAAgE;AAChE,0FAAoF;AAEpF;;;;;GAKG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,gBAAgB;IAChB,YAAoB,cAA8B,EAAU,aAA4B;QAApE,mBAAc,GAAd,cAAc,CAAgB;QAAU,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE5F;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/request-context/request-context.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export declare class SessionService implements EntitySubscriberInterface {
|
|
|
22
22
|
private orderService;
|
|
23
23
|
private sessionCacheStrategy;
|
|
24
24
|
private readonly sessionDurationInMs;
|
|
25
|
+
private readonly sessionCacheTimeoutMs;
|
|
25
26
|
constructor(connection: TransactionalConnection, configService: ConfigService, orderService: OrderService);
|
|
26
27
|
/** @internal */
|
|
27
28
|
afterInsert(event: InsertEvent<any>): Promise<any>;
|
|
@@ -51,6 +52,11 @@ export declare class SessionService implements EntitySubscriberInterface {
|
|
|
51
52
|
* Serializes a {@link Session} instance into a simplified plain object suitable for caching.
|
|
52
53
|
*/
|
|
53
54
|
serializeSession(session: AuthenticatedSession | AnonymousSession): CachedSession;
|
|
55
|
+
/**
|
|
56
|
+
* If the session cache is taking longer than say 50ms then something is wrong - it is supposed to
|
|
57
|
+
* be very fast after all! So we will return undefined and let the request continue without a cached session.
|
|
58
|
+
*/
|
|
59
|
+
private withTimeout;
|
|
54
60
|
/**
|
|
55
61
|
* Looks for a valid session with the given token and returns one if found.
|
|
56
62
|
*/
|
|
@@ -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.4",
|
|
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.4",
|
|
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": "e1713e8c0fd9e32708f7cbe7ac00a5964c3348af"
|
|
109
109
|
}
|