npm - @vendure/core - Versions diffs - 1.8.3 → 1.8.4 - Mend

@vendure/core 1.8.3 → 1.8.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.

Files changed (19) hide show

package/dist/api/middleware/auth-guard.js CHANGED Viewed

@@ -158,7 +158,7 @@ let AuthGuard = class AuthGuard {
             return false;
         }
         const parentType = (_a = info === null || info === void 0 ? void 0 : info.parentType) === null || _a === void 0 ? void 0 : _a.name;
-        return parentType !== 'Query' && parentType !== 'Mutation';
+        return parentType !== 'Query' && parentType !== 'Mutation' && parentType !== 'Subscription';
     }
 };
 AuthGuard = __decorate([

package/dist/api/middleware/auth-guard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":"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~~IAC/D~~,CAAC;CACJ,CAAA;AAnJY,SAAS;IADrB,mBAAU,EAAE;qCAKc,gBAAS;QACL,8BAAa;QACL,+CAAqB;QAC5B,gCAAc;QACb,kCAAe;QAChB,gCAAc;GATjC,SAAS,CAmJrB;AAnJY,8BAAS"}
1	+ {"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA2E;AAC3E,uCAAyC;AACzC,yEAAiE;AAIjE,sDAA6D;AAC7D,sDAA2D;AAC3D,gEAA4D;AAC5D,uEAA8D;AAE9D,2EAAiE;AACjE,2GAAsG;AACtG,4EAAwE;AACxE,8EAA0E;AAC1E,4EAAwE;AACxE,2EAAsE;AACtE,2DAAuD;AAEvD,mEAA8D;AAC9D,mEAAyE;AAEzE;;;;;;;;GAQG;AAEH,IAAa,SAAS,GAAtB,MAAa,SAAS;IAGlB,YACY,SAAoB,EACpB,aAA4B,EAC5B,qBAA4C,EAC5C,cAA8B,EAC9B,eAAgC,EAChC,cAA8B;QAL9B,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;IACvC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,4BAAY,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAe,0CAAwB,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACrG,IAAI,eAAe,IAAI,CAAC,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC;QAChE,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC,4BAAU,CAAC,MAAM,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC,4BAAU,CAAC,KAAK,CAAC,CAAC;QACnF,IAAI,cAA8B,CAAC;QACnC,IAAI,eAAe,EAAE;YACjB,cAAc,GAAI,GAAW,CAAC,+BAAmB,CAAC,CAAC;SACtD;aAAM;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;YACpE,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAE/F,MAAM,mCAAmC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACjG,IAAI,mCAAmC,EAAE;gBACrC,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CACzD,GAAG,EACH,IAAI,EACJ,WAAW,EACX,OAAO,CACV,CAAC;aACL;YACA,GAAW,CAAC,+BAAmB,CAAC,GAAG,cAAc,CAAC;SACtD;QAED,IAAI,YAAY,IAAI,CAAC,WAAW,IAAI,QAAQ,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;aAAM;YACH,MAAM,WAAW,GACb,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC,qBAAqB,CAAC;YAC3F,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,uBAAc,CAAC,yBAAQ,CAAC,OAAO,CAAC,CAAC;aAC9C;iBAAM;gBACH,OAAO,WAAW,CAAC;aACtB;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC1B,cAA8B,EAC9B,OAAuB;QAEvB,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,KAAK,CAAC;SAChB;QACD,8EAA8E;QAC9E,wFAAwF;QACxF,MAAM,wBAAwB,GAC1B,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,KAAK,cAAc,CAAC,SAAS,CAAC;QACrF,IAAI,wBAAwB,EAAE;YAC1B,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;YAC5E,IAAI,cAAc,CAAC,YAAY,EAAE;gBAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CACvD,cAAc,EACd,cAAc,CAAC,YAAY,EAC3B,KAAK,CACR,CAAC;gBACF,0EAA0E;gBAC1E,wEAAwE;gBACxE,IAAI,QAAQ,EAAE;oBACV,IAAI;wBACA,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,cAAc,EAAE,0BAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;4BAC9E,cAAc,CAAC,SAAS;yBAC3B,CAAC,CAAC;qBACN;oBAAC,OAAO,CAAC,EAAE;wBACR,MAAM,gBAAgB,GAClB,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,mBAAmB;4BAC7C,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,cAAc;wBACtC,IAAI,gBAAgB,EAAE;4BAClB,4FAA4F;4BAC5F,2FAA2F;4BAC3F,uEAAuE;4BACvE,8DAA8D;yBACjE;6BAAM;4BACH,MAAM,CAAC,CAAC;yBACX;qBACJ;iBACJ;aACJ;YACD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,UAAU,CACpB,GAAY,EACZ,GAAa,EACb,kBAA2B;QAE3B,MAAM,YAAY,GAAG,2CAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,iBAA4C,CAAC;QACjD,IAAI,YAAY,EAAE;YACd,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAChF,IAAI,iBAAiB,EAAE;gBACnB,OAAO,iBAAiB,CAAC;aAC5B;YACD,+DAA+D;YAC/D,yDAAyD;YACzD,mCAAe,CAAC;gBACZ,GAAG;gBACH,GAAG;gBACH,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;gBAC3C,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,EAAE;aACnB,CAAC,CAAC;SACN;QAED,IAAI,kBAAkB,IAAI,CAAC,iBAAiB,EAAE;YAC1C,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,EAAE,CAAC;YACvE,mCAAe,CAAC;gBACZ,YAAY,EAAE,iBAAiB,CAAC,KAAK;gBACrC,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;gBAC3C,GAAG;gBACH,GAAG;aACN,CAAC,CAAC;SACN;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,IAAyB;;QAC7C,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,UAAU,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,0CAAE,IAAI,CAAC;QAC1C,OAAO,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,UAAU,IAAI,UAAU,KAAK,cAAc,CAAC;IAChG,CAAC;CACJ,CAAA;AAnJY,SAAS;IADrB,mBAAU,EAAE;qCAKc,gBAAS;QACL,8BAAa;QACL,+CAAqB;QAC5B,gCAAc;QACb,kCAAe;QAChB,gCAAc;GATjC,SAAS,CAmJrB;AAnJY,8BAAS"}

package/dist/api/resolvers/entity/job-entity.resolver.d.ts CHANGED Viewed

@@ -2,4 +2,6 @@ import { Job } from '../../../job-queue/job';
 export declare class JobEntityResolver {
     private readonly graphQlMaxInt;
     duration(job: Job): Promise<number>;
+    data(job: Job): Promise<any>;
+    private isSerializedRequestContext;
 }

package/dist/api/resolvers/entity/job-entity.resolver.js CHANGED Viewed

@@ -14,6 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobEntityResolver = void 0;
 const graphql_1 = require("@nestjs/graphql");
+const omit_1 = require("@vendure/common/lib/omit");
+const pick_1 = require("@vendure/common/lib/pick");
 const job_1 = require("../../../job-queue/job");
 let JobEntityResolver = class JobEntityResolver {
     constructor() {
@@ -22,6 +24,33 @@ let JobEntityResolver = class JobEntityResolver {
     async duration(job) {
         return Math.min(job.duration, this.graphQlMaxInt);
     }
+    async data(job) {
+        const ctx = job.data.ctx;
+        if (this.isSerializedRequestContext(ctx)) {
+            // The job data includes a serialized RequestContext object
+            // This can be very large, so we will manually prune it before
+            // returning
+            const prunedCtx = Object.assign(Object.assign({}, pick_1.pick(ctx, [
+                '_apiType',
+                '_languageCode',
+                '_authorizedAsOwnerOnly',
+                '_isAuthorized',
+                '_channel',
+            ])), { _session: ctx._session
+                    ? Object.assign(Object.assign({}, ctx._session), { user: ctx._session.user ? omit_1.omit(ctx._session.user, ['channelPermissions']) : {} }) : {} });
+            job.data.ctx = prunedCtx;
+        }
+        return job.data;
+    }
+    isSerializedRequestContext(input) {
+        if (typeof input !== 'object' || input == null) {
+            return false;
+        }
+        return (typeof input === 'object' &&
+            input.hasOwnProperty('_apiType') &&
+            input.hasOwnProperty('_channel') &&
+            input.hasOwnProperty('_languageCode'));
+    }
 };
 __decorate([
     graphql_1.ResolveField(),
@@ -30,6 +59,13 @@ __decorate([
     __metadata("design:paramtypes", [job_1.Job]),
     __metadata("design:returntype", Promise)
 ], JobEntityResolver.prototype, "duration", null);
+__decorate([
+    graphql_1.ResolveField(),
+    __param(0, graphql_1.Parent()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [job_1.Job]),
+    __metadata("design:returntype", Promise)
+], JobEntityResolver.prototype, "data", null);
 JobEntityResolver = __decorate([
     graphql_1.Resolver('Job')
 ], JobEntityResolver);

package/dist/api/resolvers/entity/job-entity.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"job-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/job-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;~~AAEjE~~,gDAA6C;~~AAG7C~~,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACqB,kBAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;~~IAMjD~~,CAAC;~~IAHG~~,KAAK,CAAC,QAAQ,CAAW,GAAQ;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;CACJ,CAAA;~~AAHG~~;IADC,sBAAY,EAAE;IACC,WAAA,gBAAM,EAAE,CAAA;;qCAAM,SAAG;;iDAEhC;~~AANQ~~,iBAAiB;IAD7B,kBAAQ,CAAC,KAAK,CAAC;GACH,iBAAiB,~~CAO7B~~;~~AAPY~~,8CAAiB"}
1	+ {"version":3,"file":"job-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/job-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AACjE,mDAAgD;AAChD,mDAAgD;AAEhD,gDAA6C;AAI7C,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACqB,kBAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IA6CjD,CAAC;IA1CG,KAAK,CAAC,QAAQ,CAAW,GAAQ;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;IAGD,KAAK,CAAC,IAAI,CAAW,GAAQ;QACzB,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;QACzB,IAAI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE;YACtC,2DAA2D;YAC3D,8DAA8D;YAC9D,YAAY;YACZ,MAAM,SAAS,mCACR,WAAI,CAAC,GAAG,EAAE;gBACT,UAAU;gBACV,eAAe;gBACf,wBAAwB;gBACxB,eAAe;gBACf,UAAU;aACb,CAAC,KACF,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBAClB,CAAC,iCACQ,GAAG,CAAC,QAAQ,KACf,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAEpF,CAAC,CAAC,EAAE,GACX,CAAC;YACF,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;SAC5B;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IACpB,CAAC;IAEO,0BAA0B,CAAC,KAAc;QAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,IAAI,EAAE;YAC5C,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC;YAChC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC;YAChC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CACxC,CAAC;IACN,CAAC;CACJ,CAAA;AA1CG;IADC,sBAAY,EAAE;IACC,WAAA,gBAAM,EAAE,CAAA;;qCAAM,SAAG;;iDAEhC;AAGD;IADC,sBAAY,EAAE;IACH,WAAA,gBAAM,EAAE,CAAA;;qCAAM,SAAG;;6CAwB5B;AAjCQ,iBAAiB;IAD7B,kBAAQ,CAAC,KAAK,CAAC;GACH,iBAAiB,CA8C7B;AA9CY,8CAAiB"}

package/dist/config/config.module.js CHANGED Viewed

@@ -67,7 +67,7 @@ let ConfigModule = class ConfigModule {
         const { assetNamingStrategy, assetPreviewStrategy, assetStorageStrategy } = this.configService.assetOptions;
         const { productVariantPriceCalculationStrategy, stockDisplayStrategy } = this.configService.catalogOptions;
         const { adminAuthenticationStrategy, shopAuthenticationStrategy, sessionCacheStrategy, passwordHashingStrategy, passwordValidationStrategy, } = this.configService.authOptions;
-        const { taxZoneStrategy } = this.configService.taxOptions;
+        const { taxZoneStrategy, taxLineCalculationStrategy } = this.configService.taxOptions;
         const { jobQueueStrategy, jobBufferStorageStrategy } = this.configService.jobQueueOptions;
         const { mergeStrategy, checkoutMergeStrategy, orderItemPriceCalculationStrategy, process, orderCodeStrategy, orderByCodeAccessStrategy, stockAllocationStrategy, } = this.configService.orderOptions;
         const { customFulfillmentProcess } = this.configService.shippingOptions;
@@ -86,6 +86,7 @@ let ConfigModule = class ConfigModule {
             assetPreviewStrategy,
             assetStorageStrategy,
             taxZoneStrategy,
+            taxLineCalculationStrategy,
             jobQueueStrategy,
             jobBufferStorageStrategy,
             mergeStrategy,

package/dist/config/config.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AACvF,uCAAyC;AACzC,mEAAsE;AAGtE,iDAA8C;AAG9C,qDAA+C;AAC/C,qDAAiD;AAMjD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAAoB,aAA4B,EAAU,SAAoB;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAAU,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAElF,KAAK,CAAC,sBAAsB;QACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC3C;;;;;;WAMG;QACH,4BAAW,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,wBAAwB;QAClC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBACrC,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACjC;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACrC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE;gBACxC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACpC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;IACL,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACvC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAEO,uBAAuB;QAC3B,MAAM,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GACrE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,sCAAsC,EAAE,oBAAoB,EAAE,GAClE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACtC,MAAM,EACF,2BAA2B,EAC3B,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,GAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QACnC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;~~QAC1D~~,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAC1F,MAAM,EACF,aAAa,EACb,qBAAqB,EACrB,iCAAiC,EACjC,OAAO,EACP,iBAAiB,EACjB,yBAAyB,EACzB,uBAAuB,GAC1B,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QACxE,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACnE,MAAM,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAC5E,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAC9D,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAC1D,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;QACvE,OAAO;YACH,GAAG,2BAA2B;YAC9B,GAAG,0BAA0B;YAC7B,oBAAoB;YACpB,uBAAuB;YACvB,0BAA0B;YAC1B,mBAAmB;YACnB,oBAAoB;YACpB,oBAAoB;YACpB,eAAe;YACf,gBAAgB;YAChB,wBAAwB;YACxB,aAAa;YACb,qBAAqB;YACrB,iBAAiB;YACjB,yBAAyB;YACzB,0BAA0B;YAC1B,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,iCAAkB,CAAC;YAChD,sCAAsC;YACtC,iCAAiC;YACjC,GAAG,OAAO;YACV,GAAG,wBAAwB;YAC3B,GAAG,oBAAoB;YACvB,uBAAuB;YACvB,oBAAoB;YACpB,GAAG,YAAY;YACf,mBAAmB;SACtB,CAAC;IACN,CAAC;IAEO,yBAAyB;QAC7B,MAAM,EAAE,qBAAqB,EAAE,gCAAgC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACtG,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QAChE,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACtF,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,GAC3E,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QACvC,OAAO;YACH,GAAG,CAAC,gCAAgC,IAAI,EAAE,CAAC;YAC3C,GAAG,qBAAqB;YACxB,GAAG,iBAAiB;YACpB,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,2BAA2B,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;SACjC,CAAC;IACN,CAAC;CACJ,CAAA;~~AA/HY~~,YAAY;IAJxB,eAAM,CAAC;QACJ,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KAC3B,CAAC;qCAEqC,8BAAa,EAAqB,gBAAS;GADrE,YAAY,~~CA+HxB~~;~~AA/HY~~,oCAAY"}
1	+ {"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AACvF,uCAAyC;AACzC,mEAAsE;AAGtE,iDAA8C;AAG9C,qDAA+C;AAC/C,qDAAiD;AAMjD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAAoB,aAA4B,EAAU,SAAoB;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAAU,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAElF,KAAK,CAAC,sBAAsB;QACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC3C;;;;;;WAMG;QACH,4BAAW,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,wBAAwB;QAClC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBACrC,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACjC;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACrC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE;gBACxC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACpC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;IACL,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACvC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAEO,uBAAuB;QAC3B,MAAM,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GACrE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,sCAAsC,EAAE,oBAAoB,EAAE,GAClE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACtC,MAAM,EACF,2BAA2B,EAC3B,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,GAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QACnC,MAAM,EAAE,eAAe,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QACtF,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAC1F,MAAM,EACF,aAAa,EACb,qBAAqB,EACrB,iCAAiC,EACjC,OAAO,EACP,iBAAiB,EACjB,yBAAyB,EACzB,uBAAuB,GAC1B,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QACxE,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACnE,MAAM,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAC5E,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAC9D,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAC1D,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;QACvE,OAAO;YACH,GAAG,2BAA2B;YAC9B,GAAG,0BAA0B;YAC7B,oBAAoB;YACpB,uBAAuB;YACvB,0BAA0B;YAC1B,mBAAmB;YACnB,oBAAoB;YACpB,oBAAoB;YACpB,eAAe;YACf,0BAA0B;YAC1B,gBAAgB;YAChB,wBAAwB;YACxB,aAAa;YACb,qBAAqB;YACrB,iBAAiB;YACjB,yBAAyB;YACzB,0BAA0B;YAC1B,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,iCAAkB,CAAC;YAChD,sCAAsC;YACtC,iCAAiC;YACjC,GAAG,OAAO;YACV,GAAG,wBAAwB;YAC3B,GAAG,oBAAoB;YACvB,uBAAuB;YACvB,oBAAoB;YACpB,GAAG,YAAY;YACf,mBAAmB;SACtB,CAAC;IACN,CAAC;IAEO,yBAAyB;QAC7B,MAAM,EAAE,qBAAqB,EAAE,gCAAgC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACtG,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QAChE,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACtF,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,GAC3E,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QACvC,OAAO;YACH,GAAG,CAAC,gCAAgC,IAAI,EAAE,CAAC;YAC3C,GAAG,qBAAqB;YACxB,GAAG,iBAAiB;YACpB,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,2BAA2B,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;SACjC,CAAC;IACN,CAAC;CACJ,CAAA;AAhIY,YAAY;IAJxB,eAAM,CAAC;QACJ,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KAC3B,CAAC;qCAEqC,8BAAa,EAAqB,gBAAS;GADrE,YAAY,CAgIxB;AAhIY,oCAAY"}

package/dist/config/payment/payment-method-handler.d.ts CHANGED Viewed

@@ -332,7 +332,7 @@ export declare class PaymentMethodHandler<T extends ConfigArgs = ConfigArgs> ext
          * If using a {@link CustomPaymentProcess}, may be something else
          * entirely according to your business logic.
          */
-        state: "Created" | "Cancelled" | "Authorized" | "Settled" | "Declined";
+        state: "Created" | "Cancelled" | "Settled" | "Authorized" | "Declined";
         /**
          * @description
          * The unique payment reference code typically assigned by

package/dist/i18n/messages/en.json CHANGED Viewed

@@ -1,5 +1,6 @@
 {
   "error": {
+    "active-user-does-not-have-sufficient-permissions": "Active user does not have sufficient permissions",
     "cannot-delete-role": "The role '{ roleCode }' cannot be deleted",
     "cannot-delete-sole-superadmin": "The sole SuperAdmin cannot be deleted",
     "cannot-locate-customer-for-user": "Cannot locate a Customer for the user",

package/dist/service/helpers/utils/get-user-channels-permissions.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Permission } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
+import { Role } from '../../../entity/index';
 import { User } from '../../../entity/user/user.entity';
 export interface UserChannelPermissions {
     id: ID;
@@ -11,3 +12,8 @@ export interface UserChannelPermissions {
  * Returns an array of Channels and permissions on those Channels for the given User.
  */
 export declare function getUserChannelsPermissions(user: User): UserChannelPermissions[];
+/**
+ * @description
+ * Returns an array of Channels and permissions on those Channels for the given Roles.
+ */
+export declare function getChannelPermissions(roles: Role[]): UserChannelPermissions[];

package/dist/service/helpers/utils/get-user-channels-permissions.js CHANGED Viewed

@@ -1,13 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserChannelsPermissions = void 0;
+exports.getChannelPermissions = exports.getUserChannelsPermissions = void 0;
 const unique_1 = require("@vendure/common/lib/unique");
 /**
  * Returns an array of Channels and permissions on those Channels for the given User.
  */
 function getUserChannelsPermissions(user) {
+    return getChannelPermissions(user.roles);
+}
+exports.getUserChannelsPermissions = getUserChannelsPermissions;
+/**
+ * @description
+ * Returns an array of Channels and permissions on those Channels for the given Roles.
+ */
+function getChannelPermissions(roles) {
     const channelsMap = {};
-    for (const role of user.roles) {
+    for (const role of roles) {
         for (const channel of role.channels) {
             if (!channelsMap[channel.code]) {
                 channelsMap[channel.code] = {
@@ -25,5 +33,5 @@ function getUserChannelsPermissions(user) {
     }
     return Object.values(channelsMap).sort((a, b) => (a.id < b.id ? -1 : 1));
 }
-exports.getUserChannelsPermissions = getUserChannelsPermissions;
+exports.getChannelPermissions = getChannelPermissions;
 //# sourceMappingURL=get-user-channels-permissions.js.map

package/dist/service/helpers/utils/get-user-channels-permissions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-user-channels-permissions.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/get-user-channels-permissions.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;~~AAWpD~~;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACjD,MAAM,WAAW,GAA+C,EAAE,CAAC;IAEnE,KAAK,MAAM,IAAI,IAAI,~~IAAI,CAAC,~~KAAK,EAAE;~~QAC3B~~,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;oBACxB,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YACD,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,eAAM,CAAC;gBAC3C,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW;gBACxC,GAAG,IAAI,CAAC,WAAW;aACtB,CAAC,CAAC;SACN;KACJ;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AArBD,~~gEAqBC~~"}
1	+ {"version":3,"file":"get-user-channels-permissions.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/get-user-channels-permissions.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;AAYpD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACjD,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AAFD,gEAEC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,KAAa;IAC/C,MAAM,WAAW,GAA+C,EAAE,CAAC;IAEnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;oBACxB,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YACD,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,eAAM,CAAC;gBAC3C,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW;gBACxC,GAAG,IAAI,CAAC,WAAW;aACtB,CAAC,CAAC;SACN;KACJ;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AArBD,sDAqBC"}

package/dist/service/services/administrator.service.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import { EventBus } from '../../event-bus';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { PasswordCipher } from '../helpers/password-cipher/password-cipher';
+import { RequestContextService } from '../helpers/request-context/request-context.service';
 import { RoleService } from './role.service';
 import { UserService } from './user.service';
 /**
@@ -27,7 +28,8 @@ export declare class AdministratorService {
     private roleService;
     private customFieldRelationService;
     private eventBus;
-    constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, passwordCipher: PasswordCipher, userService: UserService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
+    private requestContextService;
+    constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, passwordCipher: PasswordCipher, userService: UserService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, requestContextService: RequestContextService);
     /** @internal */
     initAdministrators(): Promise<void>;
     /**
@@ -55,6 +57,12 @@ export declare class AdministratorService {
      * Update an existing Administrator.
      */
     update(ctx: RequestContext, input: UpdateAdministratorInput): Promise<Administrator>;
+    /**
+     * @description
+     * Checks that the active user is allowed to grant the specified Roles when creating or
+     * updating an Administrator.
+     */
+    private checkActiveUserCanGrantRoles;
     /**
      * @description
      * Assigns a Role to the Administrator's User entity.

package/dist/service/services/administrator.service.js CHANGED Viewed

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdministratorService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
-const request_context_1 = require("../../api/common/request-context");
 const errors_1 = require("../../common/error/errors");
 const index_1 = require("../../common/index");
 const config_1 = require("../../config");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const administrator_entity_1 = require("../../entity/administrator/administrator.entity");
 const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
+const index_2 = require("../../entity/index");
 const user_entity_1 = require("../../entity/user/user.entity");
 const event_bus_1 = require("../../event-bus");
 const administrator_event_1 = require("../../event-bus/events/administrator-event");
@@ -26,6 +26,8 @@ const role_change_event_1 = require("../../event-bus/events/role-change-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const password_cipher_1 = require("../helpers/password-cipher/password-cipher");
+const request_context_service_1 = require("../helpers/request-context/request-context.service");
+const get_user_channels_permissions_1 = require("../helpers/utils/get-user-channels-permissions");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
 const role_service_1 = require("./role.service");
 const user_service_1 = require("./user.service");
@@ -36,7 +38,7 @@ const user_service_1 = require("./user.service");
  * @docsCategory services
  */
 let AdministratorService = class AdministratorService {
-    constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService, eventBus) {
+    constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService, eventBus, requestContextService) {
         this.connection = connection;
         this.configService = configService;
         this.listQueryBuilder = listQueryBuilder;
@@ -45,6 +47,7 @@ let AdministratorService = class AdministratorService {
         this.roleService = roleService;
         this.customFieldRelationService = customFieldRelationService;
         this.eventBus = eventBus;
+        this.requestContextService = requestContextService;
     }
     /** @internal */
     async initAdministrators() {
@@ -97,6 +100,7 @@ let AdministratorService = class AdministratorService {
      * Create a new Administrator.
      */
     async create(ctx, input) {
+        await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
         const administrator = new administrator_entity_1.Administrator(input);
         administrator.user = await this.userService.createAdminUser(ctx, input.emailAddress, input.password);
         let createdAdministrator = await this.connection
@@ -118,6 +122,9 @@ let AdministratorService = class AdministratorService {
         if (!administrator) {
             throw new errors_1.EntityNotFoundError('Administrator', input.id);
         }
+        if (input.roleIds) {
+            await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
+        }
         let updatedAdministrator = patch_entity_1.patchEntity(administrator, input);
         await this.connection.getRepository(ctx, administrator_entity_1.Administrator).save(administrator, { reload: false });
         if (input.emailAddress) {
@@ -156,6 +163,23 @@ let AdministratorService = class AdministratorService {
         this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, administrator, 'updated', input));
         return updatedAdministrator;
     }
+    /**
+     * @description
+     * Checks that the active user is allowed to grant the specified Roles when creating or
+     * updating an Administrator.
+     */
+    async checkActiveUserCanGrantRoles(ctx, roleIds) {
+        const roles = await this.connection
+            .getRepository(ctx, index_2.Role)
+            .findByIds(roleIds, { relations: ['channels'] });
+        const permissionsRequired = get_user_channels_permissions_1.getChannelPermissions(roles);
+        for (const channelPermissions of permissionsRequired) {
+            const activeUserHasRequiredPermissions = await this.roleService.userHasAllPermissionsOnChannel(ctx, channelPermissions.id, channelPermissions.permissions);
+            if (!activeUserHasRequiredPermissions) {
+                throw new errors_1.UserInputError('error.active-user-does-not-have-sufficient-permissions');
+            }
+        }
+    }
     /**
      * @description
      * Assigns a Role to the Administrator's User entity.
@@ -226,17 +250,23 @@ let AdministratorService = class AdministratorService {
             },
         });
         if (!superAdminUser) {
+            const ctx = await this.requestContextService.create({ apiType: 'admin' });
             const superAdminRole = await this.roleService.getSuperAdminRole();
-            const administrator = await this.create(request_context_1.RequestContext.empty(), {
+            const administrator = new administrator_entity_1.Administrator({
                 emailAddress: superadminCredentials.identifier,
-                password: superadminCredentials.password,
                 firstName: 'Super',
                 lastName: 'Admin',
-                roleIds: [superAdminRole.id],
             });
+            administrator.user = await this.userService.createAdminUser(ctx, superadminCredentials.identifier, superadminCredentials.password);
+            const createdAdministrator = await this.connection
+                .getRepository(ctx, administrator_entity_1.Administrator)
+                .save(administrator);
+            await this.assignRole(ctx, createdAdministrator.id, superAdminRole.id);
         }
         else {
-            const superAdministrator = await this.connection.rawConnection.getRepository(administrator_entity_1.Administrator).findOne({
+            const superAdministrator = await this.connection.rawConnection
+                .getRepository(administrator_entity_1.Administrator)
+                .findOne({
                 where: {
                     user: superAdminUser,
                 },
@@ -247,8 +277,7 @@ let AdministratorService = class AdministratorService {
                     firstName: 'Super',
                     lastName: 'Admin',
                 });
-                const createdAdministrator = await this.connection
-                    .rawConnection
+                const createdAdministrator = await this.connection.rawConnection
                     .getRepository(administrator_entity_1.Administrator)
                     .save(administrator);
                 createdAdministrator.user = superAdminUser;
@@ -274,7 +303,8 @@ AdministratorService = __decorate([
         user_service_1.UserService,
         role_service_1.RoleService,
         custom_field_relation_service_1.CustomFieldRelationService,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        request_context_service_1.RequestContextService])
 ], AdministratorService);
 exports.AdministratorService = AdministratorService;
 //# sourceMappingURL=administrator.service.js.map

package/dist/service/services/administrator.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAI6C;~~AAG7C~~,~~sEAAkE~~;~~AAElE~~,~~sDAAqF;AACrF,~~8CAAiD;AAEjD,yCAA6C;AAC7C,wFAAoF;AACpF,0FAAgF;AAChF,gIAAoH;AACpH,+DAAqD;AACrD,+CAA2C;AAC3C,oFAAgF;AAChF,gFAA2E;AAC3E,kHAA4G;AAC5G,yFAAoF;AACpF,gFAA4E;AAC5E,gEAA4D;AAE5D,iDAA6C;AAC7C,iDAA6C;AAE7C;;;;;GAKG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,aAA4B,EAC5B,gBAAkC,EAClC,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,0BAAsD,EACtD,QAAkB;~~QAPlB~~,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,aAAQ,GAAR,QAAQ,CAAU;~~IAC3B~~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~~cAAc~~,GAAG,MAAM,IAAI,CAAC,~~WAAW~~,CAAC,~~iBAAiB~~,EAAE,CAAC;~~YAClE~~,MAAM,~~aAAa~~,GAAG,MAAM,IAAI,CAAC,~~MAAM~~,CAAC,~~gCAAc~~,CAAC,~~KAAK~~,~~EAAE~~,~~EAAE~~;~~gBAC5D~~,YAAY,EAAE,qBAAqB,CAAC,UAAU;gBAC9C,QAAQ,EAAE,qBAAqB,CAAC,QAAQ;~~gBACxC~~,~~SAAS~~,~~EAAE~~,~~OAAO~~;~~gBAClB~~,~~QAAQ~~,EAAE,~~OAAO~~;~~gBACjB~~,~~OAAO~~,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC~~;aAC/B~~,CAAC~~,CAAC~~;~~SACN~~;aAAM;YACH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,~~CAAC,~~aAAa,CAAC,oCAAa,CAAC,~~CAAC,~~OAAO,CAAC;~~gBAChG~~,KAAK,EAAE;oBACH,IAAI,EAAE,cAAc;iBACvB;aACJ,CAAC,CAAC;~~YACH~~,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,aAAa,GAAG,IAAI,oCAAa,CAAC;oBACpC,YAAY,EAAE,qBAAqB,CAAC,UAAU;oBAC9C,SAAS,EAAE,OAAO;oBAClB,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAC;gBACH,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU~~;qBAC7C~~,aAAa;~~qBACb~~,aAAa,CAAC,oCAAa,CAAC;qBAC5B,IAAI,CAAC,aAAa,CAAC,CAAC;gBACzB,oBAAoB,CAAC,IAAI,GAAG,cAAc,CAAC;gBAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aAC/F;iBAAM,IAAI,kBAAkB,CAAC,SAAS,IAAI,IAAI,EAAE;gBAC7C,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAAC;gBACpC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aAC7F;YAED,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,EAAE;gBAClC,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC;gBAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAChF;SACJ;IACL,CAAC;CACJ,CAAA;~~AA5QY~~,oBAAoB;IADhC,mBAAU,EAAE;qCAGe,kDAAuB;QACpB,sBAAa;QACV,qCAAgB;QAClB,gCAAc;QACjB,0BAAW;QACX,0BAAW;QACI,0DAA0B;QAC5C,oBAAQ;~~GATrB~~,oBAAoB,~~CA4QhC~~;~~AA5QY~~,oDAAoB"}
1	+ {"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/role.service.d.ts CHANGED Viewed

@@ -49,15 +49,28 @@ export declare class RoleService {
     userHasPermissionOnChannel(ctx: RequestContext, channelId: ID, permission: Permission): Promise<boolean>;
     /**
      * @description
-     * Returns true if the User has any of the specified permission on that Channel
+     * Returns true if the User has any of the specified permissions on that Channel
      */
     userHasAnyPermissionsOnChannel(ctx: RequestContext, channelId: ID, permissions: Permission[]): Promise<boolean>;
+    /**
+     * @description
+     * Returns true if the User has all the specified permissions on that Channel
+     */
+    userHasAllPermissionsOnChannel(ctx: RequestContext, channelId: ID, permissions: Permission[]): Promise<boolean>;
+    private getActiveUserPermissionsOnChannel;
     create(ctx: RequestContext, input: CreateRoleInput): Promise<Role>;
     update(ctx: RequestContext, input: UpdateRoleInput): Promise<Role>;
     delete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
     assignRoleToChannel(ctx: RequestContext, roleId: ID, channelId: ID): Promise<void>;
     private getPermittedChannels;
     private checkPermissionsAreValid;
+    /**
+     * @description
+     * Checks that the active User has sufficient Permissions on the target Channels to create
+     * a Role with the given Permissions. The rule is that an Administrator may only grant
+     * Permissions that they themselves already possess.
+     */
+    private checkActiveUserHasSufficientPermissions;
     private getRoleByCode;
     /**
      * Ensure that the SuperAdmin role exists and that it has all possible Permissions.

package/dist/service/services/role.service.js CHANGED Viewed

@@ -105,11 +105,33 @@ let RoleService = class RoleService {
     }
     /**
      * @description
-     * Returns true if the User has any of the specified permission on that Channel
+     * Returns true if the User has any of the specified permissions on that Channel
      */
     async userHasAnyPermissionsOnChannel(ctx, channelId, permissions) {
+        const permissionsOnChannel = await this.getActiveUserPermissionsOnChannel(ctx, channelId);
+        for (const permission of permissions) {
+            if (permissionsOnChannel.includes(permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * @description
+     * Returns true if the User has all the specified permissions on that Channel
+     */
+    async userHasAllPermissionsOnChannel(ctx, channelId, permissions) {
+        const permissionsOnChannel = await this.getActiveUserPermissionsOnChannel(ctx, channelId);
+        for (const permission of permissions) {
+            if (!permissionsOnChannel.includes(permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    async getActiveUserPermissionsOnChannel(ctx, channelId) {
         if (ctx.activeUserId == null) {
-            return false;
+            return [];
         }
         const user = await this.connection.getEntityOrThrow(ctx, user_entity_1.User, ctx.activeUserId, {
             relations: ['roles', 'roles.channels'],
@@ -117,14 +139,9 @@ let RoleService = class RoleService {
         const userChannels = get_user_channels_permissions_1.getUserChannelsPermissions(user);
         const channel = userChannels.find(c => utils_1.idsAreEqual(c.id, channelId));
         if (!channel) {
-            return false;
+            return [];
         }
-        for (const permission of permissions) {
-            if (channel.permissions.includes(permission)) {
-                return true;
-            }
-        }
-        return false;
+        return channel.permissions;
     }
     async create(ctx, input) {
         this.checkPermissionsAreValid(input.permissions);
@@ -135,6 +152,7 @@ let RoleService = class RoleService {
         else {
             targetChannels = [ctx.channel];
         }
+        await this.checkActiveUserHasSufficientPermissions(ctx, targetChannels, input.permissions);
         const role = await this.createRoleForChannels(ctx, input, targetChannels);
         this.eventBus.publish(new role_event_1.RoleEvent(ctx, role, 'created', input));
         return role;
@@ -148,6 +166,12 @@ let RoleService = class RoleService {
         if (role.code === shared_constants_1.SUPER_ADMIN_ROLE_CODE || role.code === shared_constants_1.CUSTOMER_ROLE_CODE) {
             throw new errors_1.InternalServerError(`error.cannot-modify-role`, { roleCode: role.code });
         }
+        const targetChannels = input.channelIds
+            ? await this.getPermittedChannels(ctx, input.channelIds)
+            : undefined;
+        if (input.permissions) {
+            await this.checkActiveUserHasSufficientPermissions(ctx, targetChannels !== null && targetChannels !== void 0 ? targetChannels : role.channels, input.permissions);
+        }
         const updatedRole = patch_entity_1.patchEntity(role, {
             code: input.code,
             description: input.description,
@@ -155,8 +179,8 @@ let RoleService = class RoleService {
                 ? unique_1.unique([generated_types_1.Permission.Authenticated, ...input.permissions])
                 : undefined,
         });
-        if (input.channelIds && ctx.activeUserId) {
-            updatedRole.channels = await this.getPermittedChannels(ctx, input.channelIds);
+        if (targetChannels) {
+            updatedRole.channels = targetChannels;
         }
         await this.connection.getRepository(ctx, role_entity_1.Role).save(updatedRole, { reload: false });
         this.eventBus.publish(new role_event_1.RoleEvent(ctx, role, 'updated', input));
@@ -203,6 +227,26 @@ let RoleService = class RoleService {
             }
         }
     }
+    /**
+     * @description
+     * Checks that the active User has sufficient Permissions on the target Channels to create
+     * a Role with the given Permissions. The rule is that an Administrator may only grant
+     * Permissions that they themselves already possess.
+     */
+    async checkActiveUserHasSufficientPermissions(ctx, targetChannels, permissions) {
+        const permissionsRequired = get_user_channels_permissions_1.getChannelPermissions([
+            new role_entity_1.Role({
+                permissions: unique_1.unique([generated_types_1.Permission.Authenticated, ...permissions]),
+                channels: targetChannels,
+            }),
+        ]);
+        for (const channelPermissions of permissionsRequired) {
+            const activeUserHasRequiredPermissions = await this.userHasAllPermissionsOnChannel(ctx, channelPermissions.id, channelPermissions.permissions);
+            if (!activeUserHasRequiredPermissions) {
+                throw new errors_1.UserInputError('error.active-user-does-not-have-sufficient-permissions');
+            }
+        }
+    }
     getRoleByCode(ctx, code) {
         const repository = ctx
             ? this.connection.getRepository(ctx, role_entity_1.Role)

package/dist/service/services/role.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/service/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAM6C;AAC7C,2EAK8C;AAE9C,uDAAoD;AAEpD,sEAAkE;AAElE,sDAAmE;AACnE,sDAKmC;AAEnC,8CAA8D;AAC9D,gEAA4D;AAC5D,wFAAoF;AACpF,wEAA8D;AAC9D,+DAAqD;AACrD,+DAAqD;AACrD,+CAA2C;AAC3C,kEAA8D;AAC9D,yFAAoF;AACpF,~~kGAA4F~~;~~AAC5F~~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~~KAAK~~,CAAC;~~SAChB~~;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,GAAG,CAAC,YAAY,EAAE;YAC7E,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;SACzC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,0DAA0B,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAW,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,~~KAAK~~,CAAC;~~SAChB~~;QACD,~~KAAK~~,~~MAAM,UAAU,IAAI,WAAW,EAAE;YAClC,IAAI,~~OAAO,CAAC,WAAW,CAAC~~,QAAQ,CAAC,UAAU,CAAC,EAAE~~;~~gBAC1C~~,~~OAAO,IAAI,~~CAAC;~~aACf;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;~~IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAsB;QACpD,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,cAAc,GAAc,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;SAC3E;aAAM;YACH,cAAc,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAClC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAsB;QACpD,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,4BAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACnD;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,wCAAqB,IAAI,IAAI,CAAC,IAAI,KAAK,qCAAkB,EAAE;YACzE,MAAM,IAAI,4BAAmB,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACtF;QACD,MAAM,WAAW,GAAG,0BAAW,CAAC,IAAI,EAAE;YAClC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC1B,CAAC,CAAC,eAAM,CAAC,CAAC,4BAAU,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC1D,CAAC,CAAC,SAAS;SAClB,CAAC,CAAC;QACH,IAAI,~~KAAK~~,~~CAAC,UAAU,IAAI,GAAG,CAAC,YAAY,~~EAAE;~~YACtC~~,WAAW,CAAC,QAAQ,GAAG,~~MAAM~~,~~IAAI,~~CAAC~~,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC~~;~~SACjF~~;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAClE,OAAO,MAAM,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,EAAM;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,4BAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,wCAAqB,IAAI,IAAI,CAAC,IAAI,KAAK,qCAAkB,EAAE;YACzE,MAAM,IAAI,4BAAmB,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACtF;QACD,MAAM,WAAW,GAAG,IAAI,kBAAI,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,sBAAS,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QACtE,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,GAAmB,EAAE,MAAU,EAAE,SAAa;QACpE,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,UAAgB;QACpE,IAAI,iBAAiB,GAAc,EAAE,CAAC;QACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,SAAS,CAAC,CAAC;YAChF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACvD,GAAG,EACH,SAAS,EACT,4BAAU,CAAC,mBAAmB,CACjC,CAAC;YACF,IAAI,CAAC,aAAa,EAAE;gBAChB,MAAM,IAAI,uBAAc,EAAE,CAAC;aAC9B;YACD,iBAAiB,GAAG,CAAC,GAAG,iBAAiB,EAAE,OAAO,CAAC,CAAC;SACvD;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEO,wBAAwB,CAAC,WAAiC;QAC9D,IAAI,CAAC,WAAW,EAAE;YACd,OAAO;SACV;QACD,MAAM,wBAAwB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACpE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YAClC,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,KAAK,4BAAU,CAAC,UAAU,EAAE;gBACxF,MAAM,IAAI,uBAAc,CAAC,0BAA0B,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;aACxE;SACJ;IACL,CAAC;IAEO,aAAa,CAAC,GAA+B,EAAE,IAAY;QAC/D,MAAM,UAAU,GAAG,GAAG;YAClB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;YAC1C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC;QAExD,OAAO,UAAU,CAAC,OAAO,CAAC;YACtB,KAAK,EAAE,EAAE,IAAI,EAAE;SAClB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,0BAA0B;QACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjE,IAAI;YACA,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACtD,cAAc,CAAC,WAAW,GAAG,qBAAqB,CAAC;YACnD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACnG;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;YACrE,MAAM,IAAI,CAAC,qBAAqB,CAC5B,gCAAc,CAAC,KAAK,EAAE,EACtB;gBACI,IAAI,EAAE,wCAAqB;gBAC3B,WAAW,EAAE,+CAA4B;gBACzC,WAAW,EAAE,qBAAqB;aACrC,EACD,CAAC,cAAc,CAAC,CACnB,CAAC;SACL;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,wBAAwB;QAClC,IAAI;YACA,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;YACrE,MAAM,IAAI,CAAC,qBAAqB,CAC5B,gCAAc,CAAC,KAAK,EAAE,EACtB;gBACI,IAAI,EAAE,qCAAkB;gBACxB,WAAW,EAAE,4CAAyB;gBACtC,WAAW,EAAE,CAAC,4BAAU,CAAC,aAAa,CAAC;aAC1C,EACD,CAAC,cAAc,CAAC,CACnB,CAAC;SACL;IACL,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,+BAA+B;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7E,MAAM,qBAAqB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,IAAI,kBAAkB,CAAC,MAAM,EAAE;gBAC3B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnF,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtE;SACJ;IACL,CAAC;IAEO,qBAAqB,CAAC,GAAmB,EAAE,KAAsB,EAAE,QAAmB;QAC1F,MAAM,IAAI,GAAG,IAAI,kBAAI,CAAC;YAClB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,WAAW,EAAE,eAAM,CAAC,CAAC,4BAAU,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;SACxE,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAEO,2BAA2B;QAC/B,OAAO,qCAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,iBAAiB,CAAC;aAC7E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;aACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAkB,CAAC,CAAC;IACxC,CAAC;CACJ,CAAA;~~AA9RY~~,WAAW;IADvB,mBAAU,EAAE;qCAGe,kDAAuB;QACnB,gCAAc;QACZ,qCAAgB;QACnB,8BAAa;QAClB,oBAAQ;GANrB,WAAW,~~CA8RvB~~;~~AA9RY~~,kCAAW"}
1	+ {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/service/services/role.service.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@vendure/core",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "A modern, headless ecommerce framework",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "@nestjs/testing": "7.6.17",
     "@nestjs/typeorm": "7.1.5",
     "@types/fs-extra": "^9.0.1",
-    "@vendure/common": "^1.8.3",
+    "@vendure/common": "^1.8.4",
     "apollo-server-express": "2.24.1",
     "bcrypt": "^5.1.0",
     "body-parser": "^1.19.0",
@@ -101,5 +101,5 @@
     "sqlite3": "^5.0.0",
     "typescript": "4.3.5"
   },
-  "gitHead": "8dae251c770e0777a5a39c167999fa7639da6101"
+  "gitHead": "650930d3f9f93dc0768b61255df2df20775e560a"
 }