@vendure/core 1.4.7 → 1.5.2

package/cli/service/services/user.service.d.ts

@@ -0,0 +1,37 @@
+import { VerifyCustomerAccountResult } from '@vendure/common/lib/generated-shop-types';
+import { ID } from '@vendure/common/lib/shared-types';
+import { RequestContext } from '../../api/common/request-context';
+import { ErrorResultUnion } from '../../common/error/error-result';
+import { IdentifierChangeTokenExpiredError, IdentifierChangeTokenInvalidError, InvalidCredentialsError, PasswordResetTokenExpiredError, PasswordResetTokenInvalidError, PasswordValidationError } from '../../common/error/generated-graphql-shop-errors';
+import { ConfigService } from '../../config/config.service';
+import { TransactionalConnection } from '../../connection/transactional-connection';
+import { User } from '../../entity/user/user.entity';
+import { PasswordCipher } from '../helpers/password-cipher/password-cipher';
+import { VerificationTokenGenerator } from '../helpers/verification-token-generator/verification-token-generator';
+import { RoleService } from './role.service';
+export declare class UserService {
+    private connection;
+    private configService;
+    private roleService;
+    private passwordCipher;
+    private verificationTokenGenerator;
+    constructor(connection: TransactionalConnection, configService: ConfigService, roleService: RoleService, passwordCipher: PasswordCipher, verificationTokenGenerator: VerificationTokenGenerator);
+    getUserById(ctx: RequestContext, userId: ID): Promise<User | undefined>;
+    getUserByEmailAddress(ctx: RequestContext, emailAddress: string): Promise<User | undefined>;
+    createCustomerUser(ctx: RequestContext, identifier: string, password?: string): Promise<User | PasswordValidationError>;
+    addNativeAuthenticationMethod(ctx: RequestContext, user: User, identifier: string, password?: string): Promise<User | PasswordValidationError>;
+    createAdminUser(ctx: RequestContext, identifier: string, password: string): Promise<User>;
+    softDelete(ctx: RequestContext, userId: ID): Promise<void>;
+    setVerificationToken(ctx: RequestContext, user: User): Promise<User>;
+    verifyUserByToken(ctx: RequestContext, verificationToken: string, password?: string): Promise<ErrorResultUnion<VerifyCustomerAccountResult, User>>;
+    setPasswordResetToken(ctx: RequestContext, emailAddress: string): Promise<User | undefined>;
+    resetPasswordByToken(ctx: RequestContext, passwordResetToken: string, password: string): Promise<User | PasswordResetTokenExpiredError | PasswordResetTokenInvalidError | PasswordValidationError>;
+    changeNativeIdentifier(ctx: RequestContext, userId: ID, newIdentifier: string): Promise<void>;
+    setIdentifierChangeToken(ctx: RequestContext, user: User): Promise<User>;
+    changeIdentifierByToken(ctx: RequestContext, token: string): Promise<{
+        user: User;
+        oldIdentifier: string;
+    } | IdentifierChangeTokenInvalidError | IdentifierChangeTokenExpiredError>;
+    updatePassword(ctx: RequestContext, userId: ID, currentPassword: string, newPassword: string): Promise<boolean | InvalidCredentialsError>;
+    private validatePassword;
+}

package/cli/service/services/user.service.js

@@ -0,0 +1,287 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserService = void 0;
+const common_1 = require("@nestjs/common");
+const error_result_1 = require("../../common/error/error-result");
+const errors_1 = require("../../common/error/errors");
+const generated_graphql_shop_errors_1 = require("../../common/error/generated-graphql-shop-errors");
+const config_service_1 = require("../../config/config.service");
+const transactional_connection_1 = require("../../connection/transactional-connection");
+const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
+const user_entity_1 = require("../../entity/user/user.entity");
+const password_cipher_1 = require("../helpers/password-cipher/password-cipher");
+const verification_token_generator_1 = require("../helpers/verification-token-generator/verification-token-generator");
+const role_service_1 = require("./role.service");
+let UserService = class UserService {
+    constructor(connection, configService, roleService, passwordCipher, verificationTokenGenerator) {
+        this.connection = connection;
+        this.configService = configService;
+        this.roleService = roleService;
+        this.passwordCipher = passwordCipher;
+        this.verificationTokenGenerator = verificationTokenGenerator;
+    }
+    async getUserById(ctx, userId) {
+        return this.connection.getRepository(ctx, user_entity_1.User).findOne(userId, {
+            relations: ['roles', 'roles.channels', 'authenticationMethods'],
+        });
+    }
+    async getUserByEmailAddress(ctx, emailAddress) {
+        return this.connection.getRepository(ctx, user_entity_1.User).findOne({
+            where: {
+                identifier: emailAddress,
+                deletedAt: null,
+            },
+            relations: ['roles', 'roles.channels', 'authenticationMethods'],
+        });
+    }
+    async createCustomerUser(ctx, identifier, password) {
+        const user = new user_entity_1.User();
+        user.identifier = identifier;
+        const customerRole = await this.roleService.getCustomerRole();
+        user.roles = [customerRole];
+        const addNativeAuthResult = await this.addNativeAuthenticationMethod(ctx, user, identifier, password);
+        if (error_result_1.isGraphQlErrorResult(addNativeAuthResult)) {
+            return addNativeAuthResult;
+        }
+        return this.connection.getRepository(ctx, user_entity_1.User).save(addNativeAuthResult);
+    }
+    async addNativeAuthenticationMethod(ctx, user, identifier, password) {
+        var _a;
+        const checkUser = user.id != null && (await this.getUserById(ctx, user.id));
+        if (checkUser) {
+            if (!!checkUser.authenticationMethods.find((m) => m instanceof native_authentication_method_entity_1.NativeAuthenticationMethod)) {
+                return user;
+            }
+        }
+        const authenticationMethod = new native_authentication_method_entity_1.NativeAuthenticationMethod();
+        if (this.configService.authOptions.requireVerification) {
+            authenticationMethod.verificationToken =
+                this.verificationTokenGenerator.generateVerificationToken();
+            user.verified = false;
+        }
+        else {
+            user.verified = true;
+        }
+        if (password) {
+            const passwordValidationResult = await this.validatePassword(ctx, password);
+            if (passwordValidationResult !== true) {
+                return passwordValidationResult;
+            }
+            authenticationMethod.passwordHash = await this.passwordCipher.hash(password);
+        }
+        else {
+            authenticationMethod.passwordHash = '';
+        }
+        authenticationMethod.identifier = identifier;
+        await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(authenticationMethod);
+        user.authenticationMethods = [...((_a = user.authenticationMethods) !== null && _a !== void 0 ? _a : []), authenticationMethod];
+        return user;
+    }
+    async createAdminUser(ctx, identifier, password) {
+        const user = new user_entity_1.User({
+            identifier,
+            verified: true,
+        });
+        const authenticationMethod = await this.connection
+            .getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod)
+            .save(new native_authentication_method_entity_1.NativeAuthenticationMethod({
+            identifier,
+            passwordHash: await this.passwordCipher.hash(password),
+        }));
+        user.authenticationMethods = [authenticationMethod];
+        return this.connection.getRepository(ctx, user_entity_1.User).save(user);
+    }
+    async softDelete(ctx, userId) {
+        await this.connection.getEntityOrThrow(ctx, user_entity_1.User, userId);
+        await this.connection.getRepository(ctx, user_entity_1.User).update({ id: userId }, { deletedAt: new Date() });
+    }
+    async setVerificationToken(ctx, user) {
+        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        nativeAuthMethod.verificationToken = this.verificationTokenGenerator.generateVerificationToken();
+        user.verified = false;
+        await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+        return this.connection.getRepository(ctx, user_entity_1.User).save(user);
+    }
+    async verifyUserByToken(ctx, verificationToken, password) {
+        const user = await this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .createQueryBuilder('user')
+            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
+            .addSelect('authenticationMethod.passwordHash')
+            .where('authenticationMethod.verificationToken = :verificationToken', { verificationToken })
+            .getOne();
+        if (user) {
+            if (this.verificationTokenGenerator.verifyVerificationToken(verificationToken)) {
+                const nativeAuthMethod = user.getNativeAuthenticationMethod();
+                if (!password) {
+                    if (!nativeAuthMethod.passwordHash) {
+                        return new generated_graphql_shop_errors_1.MissingPasswordError();
+                    }
+                }
+                else {
+                    if (!!nativeAuthMethod.passwordHash) {
+                        return new generated_graphql_shop_errors_1.PasswordAlreadySetError();
+                    }
+                    const passwordValidationResult = await this.validatePassword(ctx, password);
+                    if (passwordValidationResult !== true) {
+                        return passwordValidationResult;
+                    }
+                    nativeAuthMethod.passwordHash = await this.passwordCipher.hash(password);
+                }
+                nativeAuthMethod.verificationToken = null;
+                user.verified = true;
+                await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+                return this.connection.getRepository(ctx, user_entity_1.User).save(user);
+            }
+            else {
+                return new generated_graphql_shop_errors_1.VerificationTokenExpiredError();
+            }
+        }
+        else {
+            return new generated_graphql_shop_errors_1.VerificationTokenInvalidError();
+        }
+    }
+    async setPasswordResetToken(ctx, emailAddress) {
+        const user = await this.getUserByEmailAddress(ctx, emailAddress);
+        if (!user) {
+            return;
+        }
+        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        nativeAuthMethod.passwordResetToken = this.verificationTokenGenerator.generateVerificationToken();
+        await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+        return user;
+    }
+    async resetPasswordByToken(ctx, passwordResetToken, password) {
+        const user = await this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .createQueryBuilder('user')
+            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
+            .where('authenticationMethod.passwordResetToken = :passwordResetToken', { passwordResetToken })
+            .getOne();
+        if (!user) {
+            return new generated_graphql_shop_errors_1.PasswordResetTokenInvalidError();
+        }
+        const passwordValidationResult = await this.validatePassword(ctx, password);
+        if (passwordValidationResult !== true) {
+            return passwordValidationResult;
+        }
+        if (this.verificationTokenGenerator.verifyVerificationToken(passwordResetToken)) {
+            const nativeAuthMethod = user.getNativeAuthenticationMethod();
+            nativeAuthMethod.passwordHash = await this.passwordCipher.hash(password);
+            nativeAuthMethod.passwordResetToken = null;
+            await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+            return this.connection.getRepository(ctx, user_entity_1.User).save(user);
+        }
+        else {
+            return new generated_graphql_shop_errors_1.PasswordResetTokenExpiredError();
+        }
+    }
+    async changeNativeIdentifier(ctx, userId, newIdentifier) {
+        const user = await this.getUserById(ctx, userId);
+        if (!user) {
+            return;
+        }
+        const nativeAuthMethod = user.authenticationMethods.find((m) => m instanceof native_authentication_method_entity_1.NativeAuthenticationMethod);
+        if (!nativeAuthMethod) {
+            return;
+        }
+        user.identifier = newIdentifier;
+        nativeAuthMethod.identifier = newIdentifier;
+        nativeAuthMethod.identifierChangeToken = null;
+        nativeAuthMethod.pendingIdentifier = null;
+        await this.connection
+            .getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod)
+            .save(nativeAuthMethod, { reload: false });
+        await this.connection.getRepository(ctx, user_entity_1.User).save(user, { reload: false });
+    }
+    async setIdentifierChangeToken(ctx, user) {
+        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        nativeAuthMethod.identifierChangeToken = this.verificationTokenGenerator.generateVerificationToken();
+        await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+        return user;
+    }
+    async changeIdentifierByToken(ctx, token) {
+        const user = await this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .createQueryBuilder('user')
+            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
+            .where('authenticationMethod.identifierChangeToken = :identifierChangeToken', {
+            identifierChangeToken: token,
+        })
+            .getOne();
+        if (!user) {
+            return new generated_graphql_shop_errors_1.IdentifierChangeTokenInvalidError();
+        }
+        if (!this.verificationTokenGenerator.verifyVerificationToken(token)) {
+            return new generated_graphql_shop_errors_1.IdentifierChangeTokenExpiredError();
+        }
+        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        const pendingIdentifier = nativeAuthMethod.pendingIdentifier;
+        if (!pendingIdentifier) {
+            throw new errors_1.InternalServerError('error.pending-identifier-missing');
+        }
+        const oldIdentifier = user.identifier;
+        user.identifier = pendingIdentifier;
+        nativeAuthMethod.identifier = pendingIdentifier;
+        nativeAuthMethod.identifierChangeToken = null;
+        nativeAuthMethod.pendingIdentifier = null;
+        await this.connection
+            .getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod)
+            .save(nativeAuthMethod, { reload: false });
+        await this.connection.getRepository(ctx, user_entity_1.User).save(user, { reload: false });
+        return { user, oldIdentifier };
+    }
+    async updatePassword(ctx, userId, currentPassword, newPassword) {
+        const user = await this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .createQueryBuilder('user')
+            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethods')
+            .addSelect('authenticationMethods.passwordHash')
+            .where('user.id = :id', { id: userId })
+            .getOne();
+        if (!user) {
+            throw new errors_1.EntityNotFoundError('User', userId);
+        }
+        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        const matches = await this.passwordCipher.check(currentPassword, nativeAuthMethod.passwordHash);
+        if (!matches) {
+            return new generated_graphql_shop_errors_1.InvalidCredentialsError('');
+        }
+        nativeAuthMethod.passwordHash = await this.passwordCipher.hash(newPassword);
+        await this.connection
+            .getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod)
+            .save(nativeAuthMethod, { reload: false });
+        return true;
+    }
+    async validatePassword(ctx, password) {
+        const passwordValidationResult = await this.configService.authOptions.passwordValidationStrategy.validate(ctx, password);
+        if (passwordValidationResult !== true) {
+            const message = typeof passwordValidationResult === 'string'
+                ? passwordValidationResult
+                : 'Password is invalid';
+            return new generated_graphql_shop_errors_1.PasswordValidationError(message);
+        }
+        else {
+            return true;
+        }
+    }
+};
+UserService = __decorate([
+    common_1.Injectable(),
+    __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
+        config_service_1.ConfigService,
+        role_service_1.RoleService,
+        password_cipher_1.PasswordCipher,
+        verification_token_generator_1.VerificationTokenGenerator])
+], UserService);
+exports.UserService = UserService;
+//# sourceMappingURL=user.service.js.map

package/cli/service/services/user.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/service/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAK5C,kEAAyF;AACzF,sDAAqF;AACrF,oGAW0D;AAC1D,gEAA4D;AAC5D,wFAAoF;AACpF,gIAAoH;AACpH,+DAAqD;AACrD,gFAA4E;AAC5E,uHAAkH;AAElH,iDAA6C;AAS7C,IAAa,WAAW,GAAxB,MAAa,WAAW;IACpB,YACY,UAAmC,EACnC,aAA4B,EAC5B,WAAwB,EACxB,cAA8B,EAC9B,0BAAsD;QAJtD,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,+BAA0B,GAA1B,0BAA0B,CAA4B;IAC/D,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,GAAmB,EAAE,MAAU;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE;YAC5D,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,CAAC;SAClE,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,GAAmB,EAAE,YAAoB;QACjE,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE;gBACH,UAAU,EAAE,YAAY;gBACxB,SAAS,EAAE,IAAI;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,CAAC;SAClE,CAAC,CAAC;IACP,CAAC;IAMD,KAAK,CAAC,kBAAkB,CACpB,GAAmB,EACnB,UAAkB,EAClB,QAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,kBAAI,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;QAC9D,IAAI,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtG,IAAI,mCAAoB,CAAC,mBAAmB,CAAC,EAAE;YAC3C,OAAO,mBAAmB,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9E,CAAC;IAQD,KAAK,CAAC,6BAA6B,CAC/B,GAAmB,EACnB,IAAU,EACV,UAAkB,EAClB,QAAiB;;QAEjB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5E,IAAI,SAAS,EAAE;YACX,IACI,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAClC,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,EACH;gBAEE,OAAO,IAAI,CAAC;aACf;SACJ;QACD,MAAM,oBAAoB,GAAG,IAAI,gEAA0B,EAAE,CAAC;QAC9D,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,mBAAmB,EAAE;YACpD,oBAAoB,CAAC,iBAAiB;gBAClC,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;YAChE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACzB;aAAM;YACH,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;QACD,IAAI,QAAQ,EAAE;YACV,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;gBACnC,OAAO,wBAAwB,CAAC;aACnC;YACD,oBAAoB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChF;aAAM;YACH,oBAAoB,CAAC,YAAY,GAAG,EAAE,CAAC;SAC1C;QACD,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChG,IAAI,CAAC,qBAAqB,GAAG,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,qBAAqB,mCAAI,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IAChB,CAAC;IAMD,KAAK,CAAC,eAAe,CAAC,GAAmB,EAAE,UAAkB,EAAE,QAAgB;QAC3E,MAAM,IAAI,GAAG,IAAI,kBAAI,CAAC;YAClB,UAAU;YACV,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7C,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CACD,IAAI,gEAA0B,CAAC;YAC3B,UAAU;YACV,YAAY,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;SACzD,CAAC,CACL,CAAC;QACN,IAAI,CAAC,qBAAqB,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,MAAU;QAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;IAOD,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,IAAU;QACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QACjG,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IASD,KAAK,CAAC,iBAAiB,CACnB,GAAmB,EACnB,iBAAyB,EACzB,QAAiB;QAEjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aACvE,SAAS,CAAC,mCAAmC,CAAC;aAC9C,KAAK,CAAC,6DAA6D,EAAE,EAAE,iBAAiB,EAAE,CAAC;aAC3F,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,EAAE;gBAC5E,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBAC9D,IAAI,CAAC,QAAQ,EAAE;oBACX,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;wBAChC,OAAO,IAAI,oDAAoB,EAAE,CAAC;qBACrC;iBACJ;qBAAM;oBACH,IAAI,CAAC,CAAC,gBAAgB,CAAC,YAAY,EAAE;wBACjC,OAAO,IAAI,uDAAuB,EAAE,CAAC;qBACxC;oBACD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;wBACnC,OAAO,wBAAwB,CAAC;qBACnC;oBACD,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5E;gBACD,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;gBAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9D;iBAAM;gBACH,OAAO,IAAI,6DAA6B,EAAE,CAAC;aAC9C;SACJ;aAAM;YACH,OAAO,IAAI,6DAA6B,EAAE,CAAC;SAC9C;IACL,CAAC;IAOD,KAAK,CAAC,qBAAqB,CAAC,GAAmB,EAAE,YAAoB;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QAClG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IASD,KAAK,CAAC,oBAAoB,CACtB,GAAmB,EACnB,kBAA0B,EAC1B,QAAgB;QAIhB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aACvE,KAAK,CAAC,+DAA+D,EAAE,EAAE,kBAAkB,EAAE,CAAC;aAC9F,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,IAAI,8DAA8B,EAAE,CAAC;SAC/C;QACD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;YACnC,OAAO,wBAAwB,CAAC;SACnC;QACD,IAAI,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,EAAE;YAC7E,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAC9D,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzE,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9D;aAAM;YACH,OAAO,IAAI,8DAA8B,EAAE,CAAC;SAC/C;IACL,CAAC;IAOD,KAAK,CAAC,sBAAsB,CAAC,GAAmB,EAAE,MAAU,EAAE,aAAqB;QAC/E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACpD,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE;YAGnB,OAAO;SACV;QACD,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;QAChC,gBAAgB,CAAC,UAAU,GAAG,aAAa,CAAC;QAC5C,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC9C,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC1C,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC;IAOD,KAAK,CAAC,wBAAwB,CAAC,GAAmB,EAAE,IAAU;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QACrG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAOD,KAAK,CAAC,uBAAuB,CACzB,GAAmB,EACnB,KAAa;QAMb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aACvE,KAAK,CAAC,qEAAqE,EAAE;YAC1E,qBAAqB,EAAE,KAAK;SAC/B,CAAC;aACD,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,IAAI,iEAAiC,EAAE,CAAC;SAClD;QACD,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE;YACjE,OAAO,IAAI,iEAAiC,EAAE,CAAC;SAClD;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;QAC7D,IAAI,CAAC,iBAAiB,EAAE;YACpB,MAAM,IAAI,4BAAmB,CAAC,kCAAkC,CAAC,CAAC;SACrE;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC;QACpC,gBAAgB,CAAC,UAAU,GAAG,iBAAiB,CAAC;QAChD,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC9C,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC1C,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACnC,CAAC;IAMD,KAAK,CAAC,cAAc,CAChB,GAAmB,EACnB,MAAU,EACV,eAAuB,EACvB,WAAmB;QAEnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,uBAAuB,CAAC;aACxE,SAAS,CAAC,oCAAoC,CAAC;aAC/C,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACtC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,4BAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjD;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAChG,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,IAAI,uDAAuB,CAAC,EAAE,CAAC,CAAC;SAC1C;QACD,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5E,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC1B,GAAmB,EACnB,QAAgB;QAEhB,MAAM,wBAAwB,GAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,0BAA0B,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5F,IAAI,wBAAwB,KAAK,IAAI,EAAE;YACnC,MAAM,OAAO,GACT,OAAO,wBAAwB,KAAK,QAAQ;gBACxC,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,qBAAqB,CAAC;YAChC,OAAO,IAAI,uDAAuB,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ,CAAA;AA5WY,WAAW;IADvB,mBAAU,EAAE;qCAGe,kDAAuB;QACpB,8BAAa;QACf,0BAAW;QACR,gCAAc;QACF,yDAA0B;GANzD,WAAW,CA4WvB;AA5WY,kCAAW"}

package/cli/service/services/zone.service.d.ts

@@ -0,0 +1,26 @@
+import { CreateZoneInput, DeletionResponse, MutationAddMembersToZoneArgs, MutationRemoveMembersFromZoneArgs, UpdateZoneInput } from '@vendure/common/lib/generated-types';
+import { ID } from '@vendure/common/lib/shared-types';
+import { RequestContext } from '../../api/common/request-context';
+import { SelfRefreshingCache } from '../../common/self-refreshing-cache';
+import { ConfigService } from '../../config/config.service';
+import { TransactionalConnection } from '../../connection/transactional-connection';
+import { Zone } from '../../entity/zone/zone.entity';
+import { EventBus } from '../../event-bus';
+export declare class ZoneService {
+    private connection;
+    private configService;
+    private eventBus;
+    private zones;
+    constructor(connection: TransactionalConnection, configService: ConfigService, eventBus: EventBus);
+    initZones(): Promise<void>;
+    createCache(): Promise<SelfRefreshingCache<Zone[], [RequestContext]>>;
+    findAll(ctx: RequestContext): Promise<Zone[]>;
+    findOne(ctx: RequestContext, zoneId: ID): Promise<Zone | undefined>;
+    create(ctx: RequestContext, input: CreateZoneInput): Promise<Zone>;
+    update(ctx: RequestContext, input: UpdateZoneInput): Promise<Zone>;
+    delete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
+    addMembersToZone(ctx: RequestContext, { memberIds, zoneId }: MutationAddMembersToZoneArgs): Promise<Zone>;
+    removeMembersFromZone(ctx: RequestContext, { memberIds, zoneId }: MutationRemoveMembersFromZoneArgs): Promise<Zone>;
+    private getCountriesFromIds;
+    private ensureCacheExists;
+}

package/cli/service/services/zone.service.js

@@ -0,0 +1,168 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZoneService = void 0;
+const common_1 = require("@nestjs/common");
+const generated_types_1 = require("@vendure/common/lib/generated-types");
+const unique_1 = require("@vendure/common/lib/unique");
+const request_context_1 = require("../../api/common/request-context");
+const self_refreshing_cache_1 = require("../../common/self-refreshing-cache");
+const utils_1 = require("../../common/utils");
+const config_service_1 = require("../../config/config.service");
+const transactional_connection_1 = require("../../connection/transactional-connection");
+const entity_1 = require("../../entity");
+const country_entity_1 = require("../../entity/country/country.entity");
+const zone_entity_1 = require("../../entity/zone/zone.entity");
+const event_bus_1 = require("../../event-bus");
+const zone_event_1 = require("../../event-bus/events/zone-event");
+const zone_members_event_1 = require("../../event-bus/events/zone-members-event");
+const patch_entity_1 = require("../helpers/utils/patch-entity");
+const translate_entity_1 = require("../helpers/utils/translate-entity");
+let ZoneService = class ZoneService {
+    constructor(connection, configService, eventBus) {
+        this.connection = connection;
+        this.configService = configService;
+        this.eventBus = eventBus;
+    }
+    async initZones() {
+        await this.ensureCacheExists();
+    }
+    async createCache() {
+        return await self_refreshing_cache_1.createSelfRefreshingCache({
+            name: 'ZoneService.zones',
+            ttl: this.configService.entityOptions.zoneCacheTtl,
+            refresh: {
+                fn: ctx => this.connection.getRepository(ctx, zone_entity_1.Zone).find({
+                    relations: ['members'],
+                }),
+                defaultArgs: [request_context_1.RequestContext.empty()],
+            },
+        });
+    }
+    async findAll(ctx) {
+        return this.zones.memoize([ctx.languageCode], [ctx], (zones, languageCode) => {
+            return zones.map((zone, i) => {
+                const cloneZone = Object.assign({}, zone);
+                cloneZone.members = zone.members.map(country => translate_entity_1.translateDeep(country, languageCode));
+                return cloneZone;
+            });
+        });
+    }
+    findOne(ctx, zoneId) {
+        return this.connection
+            .getRepository(ctx, zone_entity_1.Zone)
+            .findOne(zoneId, {
+            relations: ['members'],
+        })
+            .then(zone => {
+            if (zone) {
+                zone.members = zone.members.map(country => translate_entity_1.translateDeep(country, ctx.languageCode));
+                return zone;
+            }
+        });
+    }
+    async create(ctx, input) {
+        const zone = new zone_entity_1.Zone(input);
+        if (input.memberIds) {
+            zone.members = await this.getCountriesFromIds(ctx, input.memberIds);
+        }
+        const newZone = await this.connection.getRepository(ctx, zone_entity_1.Zone).save(zone);
+        await this.zones.refresh(ctx);
+        this.eventBus.publish(new zone_event_1.ZoneEvent(ctx, newZone, 'created', input));
+        return utils_1.assertFound(this.findOne(ctx, newZone.id));
+    }
+    async update(ctx, input) {
+        const zone = await this.connection.getEntityOrThrow(ctx, zone_entity_1.Zone, input.id);
+        const updatedZone = patch_entity_1.patchEntity(zone, input);
+        await this.connection.getRepository(ctx, zone_entity_1.Zone).save(updatedZone, { reload: false });
+        await this.zones.refresh(ctx);
+        this.eventBus.publish(new zone_event_1.ZoneEvent(ctx, zone, 'updated', input));
+        return utils_1.assertFound(this.findOne(ctx, zone.id));
+    }
+    async delete(ctx, id) {
+        const zone = await this.connection.getEntityOrThrow(ctx, zone_entity_1.Zone, id);
+        const channelsUsingZone = await this.connection
+            .getRepository(ctx, entity_1.Channel)
+            .createQueryBuilder('channel')
+            .where('channel.defaultTaxZone = :id', { id })
+            .orWhere('channel.defaultShippingZone = :id', { id })
+            .getMany();
+        if (0 < channelsUsingZone.length) {
+            return {
+                result: generated_types_1.DeletionResult.NOT_DELETED,
+                message: ctx.translate('message.zone-used-in-channels', {
+                    channelCodes: channelsUsingZone.map(t => t.code).join(', '),
+                }),
+            };
+        }
+        const taxRatesUsingZone = await this.connection
+            .getRepository(ctx, entity_1.TaxRate)
+            .createQueryBuilder('taxRate')
+            .where('taxRate.zone = :id', { id })
+            .getMany();
+        if (0 < taxRatesUsingZone.length) {
+            return {
+                result: generated_types_1.DeletionResult.NOT_DELETED,
+                message: ctx.translate('message.zone-used-in-tax-rates', {
+                    taxRateNames: taxRatesUsingZone.map(t => t.name).join(', '),
+                }),
+            };
+        }
+        else {
+            await this.connection.getRepository(ctx, zone_entity_1.Zone).remove(zone);
+            await this.zones.refresh(ctx);
+            this.eventBus.publish(new zone_event_1.ZoneEvent(ctx, zone, 'deleted', id));
+            return {
+                result: generated_types_1.DeletionResult.DELETED,
+                message: '',
+            };
+        }
+    }
+    async addMembersToZone(ctx, { memberIds, zoneId }) {
+        const countries = await this.getCountriesFromIds(ctx, memberIds);
+        const zone = await this.connection.getEntityOrThrow(ctx, zone_entity_1.Zone, zoneId, {
+            relations: ['members'],
+        });
+        const members = unique_1.unique(zone.members.concat(countries), 'id');
+        zone.members = members;
+        await this.connection.getRepository(ctx, zone_entity_1.Zone).save(zone, { reload: false });
+        await this.zones.refresh(ctx);
+        this.eventBus.publish(new zone_members_event_1.ZoneMembersEvent(ctx, zone, 'assigned', memberIds));
+        return utils_1.assertFound(this.findOne(ctx, zone.id));
+    }
+    async removeMembersFromZone(ctx, { memberIds, zoneId }) {
+        const zone = await this.connection.getEntityOrThrow(ctx, zone_entity_1.Zone, zoneId, {
+            relations: ['members'],
+        });
+        zone.members = zone.members.filter(country => !memberIds.includes(country.id));
+        await this.connection.getRepository(ctx, zone_entity_1.Zone).save(zone, { reload: false });
+        await this.zones.refresh(ctx);
+        this.eventBus.publish(new zone_members_event_1.ZoneMembersEvent(ctx, zone, 'removed', memberIds));
+        return utils_1.assertFound(this.findOne(ctx, zone.id));
+    }
+    getCountriesFromIds(ctx, ids) {
+        return this.connection.getRepository(ctx, country_entity_1.Country).findByIds(ids);
+    }
+    async ensureCacheExists() {
+        if (this.zones) {
+            return;
+        }
+        this.zones = await this.createCache();
+    }
+};
+ZoneService = __decorate([
+    common_1.Injectable(),
+    __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
+        config_service_1.ConfigService,
+        event_bus_1.EventBus])
+], ZoneService);
+exports.ZoneService = ZoneService;
+//# sourceMappingURL=zone.service.js.map

package/cli/service/services/zone.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone.service.js","sourceRoot":"","sources":["../../../src/service/services/zone.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAO6C;AAE7C,uDAAoD;AAEpD,sEAAkE;AAClE,8EAAoG;AACpG,8CAAiD;AACjD,gEAA4D;AAC5D,wFAAoF;AACpF,yCAAgD;AAChD,wEAA8D;AAC9D,+DAAqD;AACrD,+CAA2C;AAC3C,kEAA8D;AAC9D,kFAA6E;AAC7E,gEAA4D;AAC5D,wEAAkE;AASlE,IAAa,WAAW,GAAxB,MAAa,WAAW;IAKpB,YACY,UAAmC,EACnC,aAA4B,EAC5B,QAAkB;QAFlB,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,aAAQ,GAAR,QAAQ,CAAU;IAC1B,CAAC;IAGL,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACnC,CAAC;IAOD,KAAK,CAAC,WAAW;QACb,OAAO,MAAM,iDAAyB,CAAC;YACnC,IAAI,EAAE,mBAAmB;YACzB,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY;YAClD,OAAO,EAAE;gBACL,EAAE,EAAE,GAAG,CAAC,EAAE,CACN,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC;oBAC1C,SAAS,EAAE,CAAC,SAAS,CAAC;iBACzB,CAAC;gBACN,WAAW,EAAE,CAAC,gCAAc,CAAC,KAAK,EAAE,CAAC;aACxC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAmB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;YACzE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBACzB,MAAM,SAAS,qBAAQ,IAAI,CAAE,CAAC;gBAC9B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,gCAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;gBACtF,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,GAAmB,EAAE,MAAU;QACnC,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,OAAO,CAAC,MAAM,EAAE;YACb,SAAS,EAAE,CAAC,SAAS,CAAC;SACzB,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,IAAI,IAAI,EAAE;gBACN,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,gCAAa,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACrF,OAAO,IAAI,CAAC;aACf;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAsB;QACpD,MAAM,IAAI,GAAG,IAAI,kBAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;SACvE;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACrE,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAsB;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,0BAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAClE,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,EAAM;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,EAAE,CAAC,CAAC;QAEnE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC1C,aAAa,CAAC,GAAG,EAAE,gBAAO,CAAC;aAC3B,kBAAkB,CAAC,SAAS,CAAC;aAC7B,KAAK,CAAC,8BAA8B,EAAE,EAAE,EAAE,EAAE,CAAC;aAC7C,OAAO,CAAC,mCAAmC,EAAE,EAAE,EAAE,EAAE,CAAC;aACpD,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE;YAC9B,OAAO;gBACH,MAAM,EAAE,gCAAc,CAAC,WAAW;gBAClC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,+BAA+B,EAAE;oBACpD,YAAY,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC9D,CAAC;aACL,CAAC;SACL;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC1C,aAAa,CAAC,GAAG,EAAE,gBAAO,CAAC;aAC3B,kBAAkB,CAAC,SAAS,CAAC;aAC7B,KAAK,CAAC,oBAAoB,EAAE,EAAE,EAAE,EAAE,CAAC;aACnC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE;YAC9B,OAAO;gBACH,MAAM,EAAE,gCAAc,CAAC,WAAW;gBAClC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,gCAAgC,EAAE;oBACrD,YAAY,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC9D,CAAC;aACL,CAAC;SACL;aAAM;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO;gBACH,MAAM,EAAE,gCAAc,CAAC,OAAO;gBAC9B,OAAO,EAAE,EAAE;aACd,CAAC;SACL;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,EAAE,SAAS,EAAE,MAAM,EAAgC;QAEnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,MAAM,EAAE;YACnE,SAAS,EAAE,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,qCAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;QAC9E,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,GAAmB,EACnB,EAAE,SAAS,EAAE,MAAM,EAAqC;QAExD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,MAAM,EAAE;YACnE,SAAS,EAAE,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,qCAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7E,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IAEO,mBAAmB,CAAC,GAAmB,EAAE,GAAS;QACtD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACtE,CAAC;IAKO,KAAK,CAAC,iBAAiB;QAC3B,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,OAAM;SACT;QAED,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;CACJ,CAAA;AAtKY,WAAW;IADvB,mBAAU,EAAE;qCAOe,kDAAuB;QACpB,8BAAa;QAClB,oBAAQ;GARrB,WAAW,CAsKvB;AAtKY,kCAAW"}

package/dist/api/api.module.js

@@ -23,7 +23,6 @@ const data_import_module_1 = require("../data-import/data-import.module");
 const i18n_module_1 = require("../i18n/i18n.module");
 const service_module_1 = require("../service/service.module");
 const api_internal_modules_1 = require("./api-internal-modules");
-const request_context_service_1 = require("./common/request-context.service");
 const configure_graphql_module_1 = require("./config/configure-graphql-module");
 const auth_guard_1 = require("./middleware/auth-guard");
 const exception_logger_filter_1 = require("./middleware/exception-logger.filter");
@@ -77,7 +76,6 @@ ApiModule = __decorate([
             })),
         ],
         providers: [
-            request_context_service_1.RequestContextService,
             {
                 provide: core_1.APP_GUARD,
                 useClass: auth_guard_1.AuthGuard,

package/dist/api/api.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.module.js","sourceRoot":"","sources":["../../src/api/api.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsE;AACtE,mDAAsD;AACtD,gDAAwB;AAExB,6DAAyD;AACzD,uEAAmE;AACnE,0EAAqE;AACrE,qDAAiD;AACjD,8DAA0D;AAE1D,iEAAwF;AACxF,8EAAyE;AACzE,gFAA2E;AAC3E,wDAAoD;AACpD,kFAA6E;AAC7E,gEAA4D;AAC5D,wGAAkG;AAClG,wGAAkG;AAElG;;;;GAIG;AAqDH,IAAa,SAAS,GAAtB,MAAa,SAAS;IAClB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IACpD,SAAS,CAAC,QAA4B;QAClC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QACpE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QAE9D,QAAQ;aACH,KAAK,CAAC,qCAAoB,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAC;aAC/D,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AAVY,SAAS;IApDrB,eAAM,CAAC;QACJ,OAAO,EAAE;YACL,8BAAa;YACb,oCAAgB,CAAC,OAAO,EAAE;YAC1B,qCAAgB;YAChB,wBAAU;YACV,sCAAe;YACf,qCAAc;YACd,oCAAa;YACb,iDAAsB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,MAAM;gBACf,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,WAAW;gBAC7C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;gBACtD,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,YAAY;gBAC5C,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;gBAC1F,cAAc,EAAE,oCAAa;gBAC7B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,sBAAsB;aACnE,CAAC,CAAC;YACH,iDAAsB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,YAAY;gBAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,kBAAkB;gBACvD,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,aAAa;gBAC7C,SAAS,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;gBAC3F,cAAc,EAAE,qCAAc;gBAC9B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,uBAAuB;aACpE,CAAC,CAAC;SACN;QACD,SAAS,EAAE;YACP,+CAAqB;YACrB;gBACI,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,sBAAS;aACtB;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,8BAAa;aAC1B;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,oEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,oEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,+CAAqB;aAClC;SACJ;KACJ,CAAC;qCAEqC,8BAAa;GADvC,SAAS,CAUrB;AAVY,8BAAS"}
+{"version":3,"file":"api.module.js","sourceRoot":"","sources":["../../src/api/api.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsE;AACtE,mDAAsD;AACtD,gDAAwB;AAExB,6DAAyD;AACzD,uEAAmE;AACnE,0EAAqE;AACrE,qDAAiD;AACjD,8DAA0D;AAE1D,iEAAwF;AACxF,gFAA2E;AAC3E,wDAAoD;AACpD,kFAA6E;AAC7E,gEAA4D;AAC5D,wGAAkG;AAClG,wGAAkG;AAElG;;;;GAIG;AAoDH,IAAa,SAAS,GAAtB,MAAa,SAAS;IAClB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IACpD,SAAS,CAAC,QAA4B;QAClC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QACpE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QAE9D,QAAQ;aACH,KAAK,CAAC,qCAAoB,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAC;aAC/D,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AAVY,SAAS;IAnDrB,eAAM,CAAC;QACJ,OAAO,EAAE;YACL,8BAAa;YACb,oCAAgB,CAAC,OAAO,EAAE;YAC1B,qCAAgB;YAChB,wBAAU;YACV,sCAAe;YACf,qCAAc;YACd,oCAAa;YACb,iDAAsB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,MAAM;gBACf,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,WAAW;gBAC7C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;gBACtD,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,YAAY;gBAC5C,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;gBAC1F,cAAc,EAAE,oCAAa;gBAC7B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,sBAAsB;aACnE,CAAC,CAAC;YACH,iDAAsB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,YAAY;gBAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,kBAAkB;gBACvD,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,aAAa;gBAC7C,SAAS,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;gBAC3F,cAAc,EAAE,qCAAc;gBAC9B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,uBAAuB;aACpE,CAAC,CAAC;SACN;QACD,SAAS,EAAE;YACP;gBACI,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,sBAAS;aACtB;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,8BAAa;aAC1B;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,oEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,oEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,+CAAqB;aAClC;SACJ;KACJ,CAAC;qCAEqC,8BAAa;GADvC,SAAS,CAUrB;AAVY,8BAAS"}

package/dist/api/common/request-context.d.ts

@@ -61,7 +61,9 @@ export declare class RequestContext {
      * @description
      * Creates an "empty" RequestContext object. This is only intended to be used
      * when a service method must be called outside the normal request-response
-     * cycle, e.g. when programmatically populating data.
+     * cycle, e.g. when programmatically populating data. Usually a better alternative
+     * is to use the {@link RequestContextService} `create()` method, which allows more control
+     * over the resulting RequestContext object.
      */
     static empty(): RequestContext;
     /**

package/dist/api/common/request-context.js

@@ -44,7 +44,9 @@ class RequestContext {
      * @description
      * Creates an "empty" RequestContext object. This is only intended to be used
      * when a service method must be called outside the normal request-response
-     * cycle, e.g. when programmatically populating data.
+     * cycle, e.g. when programmatically populating data. Usually a better alternative
+     * is to use the {@link RequestContextService} `create()` method, which allows more control
+     * over the resulting RequestContext object.
      */
     static empty() {
         return new RequestContext({

package/dist/api/common/request-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.js","sourceRoot":"","sources":["../../../src/api/common/request-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-context.js","sourceRoot":"","sources":["../../../src/api/common/request-context.ts"],"names":[],"mappings":"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"}