@pinelab/vendure-plugin-customer-managed-groups 1.0.2 → 1.2.0

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 1.2.0 (2024-03-06)
+
+- Made available customer group management functions on admin api
+
+# 1.1.0 (2023-10-24)
+
+- Updated vendure to 2.1.1

package/README.md

@@ -13,7 +13,7 @@ This plugin allows customers to manage their own groups, called Customer Managed
 Add the plugin to your config:
 
 ```ts
-import { CustomerManagedGroupsPlugin } from 'vendure-plugin-customer-managed-group';
+import { CustomerManagedGroupsPlugin } from '@pinelab/vendure-plugin-customer-managed-group';
 plugins: [CustomerManagedGroupsPlugin];
 ```
 
@@ -121,3 +121,7 @@ extend type Query {
   myCustomerManagedGroup: CustomerManagedGroup
 }
 ```
+
+### Contributions
+
+Thanks [@mschipperheyn](https://github.com/mschipperheyn) for his contributions on this plugin.

package/dist/api/admin-graphql.d.ts

@@ -0,0 +1 @@
+export declare const adminSchema: import("graphql").DocumentNode;

package/dist/api/admin-graphql.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adminSchema = void 0;
+const graphql_tag_1 = require("graphql-tag");
+const common_graphql_1 = require("./common-graphql");
+exports.adminSchema = (0, graphql_tag_1.gql) `
+  ${common_graphql_1.commonSchema}
+
+  extend type Mutation {
+    """
+    Create an empty group with the specified customer as Administrator
+    """
+    createCustomerManagedGroup(customerId: ID!): CustomerManagedGroup!
+  }
+
+  extend type Query {
+    ordersForCustomerManagedGroup(customerManagedGroupId: ID!): OrderList!
+  }
+`;

package/dist/api/common-graphql.d.ts

@@ -0,0 +1 @@
+export declare const commonSchema: import("graphql").DocumentNode;

package/dist/api/common-graphql.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commonSchema = void 0;
+const graphql_tag_1 = require("graphql-tag");
+// This is just to enable static codegen, without starting a server
+const scalars = (0, graphql_tag_1.gql) `
+  scalar DateTime
+  scalar OrderList
+  scalar LanguageCode
+  scalar JSON
+`;
+exports.commonSchema = (0, graphql_tag_1.gql) `
+  type CustomerManagedGroupMember {
+    customerId: ID!
+    title: String
+    addresses: [CustomerManagedGroupAddress!]
+    firstName: String!
+    lastName: String!
+    emailAddress: String!
+    isGroupAdministrator: Boolean!
+    customFields: JSON
+  }
+
+  type CustomerManagedGroupAddress {
+    id: ID!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    fullName: String
+    company: String
+    streetLine1: String!
+    streetLine2: String
+    city: String
+    province: String
+    postalCode: String
+    country: CustomerManagedGroupCountry!
+    phoneNumber: String
+    defaultShippingAddress: Boolean
+    defaultBillingAddress: Boolean
+  }
+
+  type CustomerManagedGroupCountry {
+    id: ID!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    code: String!
+    name: String!
+    enabled: Boolean!
+    translations: [CustomerManagedGroupCountryTranslation!]!
+  }
+
+  type CustomerManagedGroupCountryTranslation {
+    id: ID!
+    languageCode: LanguageCode!
+    name: String!
+  }
+
+  type CustomerManagedGroup {
+    id: ID!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    name: String!
+    customers: [CustomerManagedGroupMember!]!
+  }
+
+  extend type Mutation {
+    makeCustomerAdminOfCustomerManagedGroup(
+      groupId: ID!
+      customerId: ID!
+    ): CustomerManagedGroup!
+  }
+`;

package/dist/{api-extensions.d.ts → api/customer-managed-groups.resolver.d.ts}

@@ -1,8 +1,15 @@
 import { ID, Order, PaginatedList, RequestContext } from '@vendure/core';
 import { CustomerManagedGroupsService } from './customer-managed-groups.service';
-import { AddCustomerToMyCustomerManagedGroupInput, CustomerManagedGroup, CustomerManagedGroupMember, UpdateCustomerManagedGroupMemberInput } from './generated/graphql';
-export declare const shopSchema: import("graphql").DocumentNode;
-export declare class CustomerManagedGroupsResolver {
+import { CustomerManagedGroup, MutationCreateCustomerManagedGroupArgs, MutationMakeCustomerAdminOfCustomerManagedGroupArgs, QueryOrdersForCustomerManagedGroupArgs } from './generated/admin-graphql';
+import { AddCustomerToMyCustomerManagedGroupInput, CustomerManagedGroupMember, UpdateCustomerManagedGroupMemberInput } from './generated/shop-graphql';
+export declare class CustomerManagedGroupsAdminResolver {
+    private service;
+    constructor(service: CustomerManagedGroupsService);
+    ordersForCustomerManagedGroup(ctx: RequestContext, args: QueryOrdersForCustomerManagedGroupArgs): Promise<PaginatedList<Order>>;
+    createCustomerManagedGroup(ctx: RequestContext, args: MutationCreateCustomerManagedGroupArgs): Promise<CustomerManagedGroup | undefined>;
+    makeCustomerAdminOfCustomerManagedGroup(ctx: RequestContext, args: MutationMakeCustomerAdminOfCustomerManagedGroupArgs): Promise<CustomerManagedGroup>;
+}
+export declare class CustomerManagedGroupsShopResolver {
     private service;
     constructor(service: CustomerManagedGroupsService);
     ordersForMyCustomerManagedGroup(ctx: RequestContext): Promise<PaginatedList<Order>>;

package/dist/api/customer-managed-groups.resolver.js

@@ -0,0 +1,167 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomerManagedGroupsShopResolver = exports.CustomerManagedGroupsAdminResolver = void 0;
+const graphql_1 = require("@nestjs/graphql");
+const core_1 = require("@vendure/core");
+const customer_managed_groups_service_1 = require("./customer-managed-groups.service");
+let CustomerManagedGroupsAdminResolver = class CustomerManagedGroupsAdminResolver {
+    constructor(service) {
+        this.service = service;
+    }
+    ordersForCustomerManagedGroup(ctx, args) {
+        return this.service.getOrdersForCustomer(ctx, args.customerManagedGroupId);
+    }
+    createCustomerManagedGroup(ctx, args) {
+        return this.service.createCustomerManagedGroup(ctx, args.customerId);
+    }
+    makeCustomerAdminOfCustomerManagedGroup(ctx, args) {
+        return this.service.makeAdminOfGroup(ctx, args.groupId, args.customerId, true);
+    }
+};
+__decorate([
+    (0, graphql_1.Query)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsAdminResolver.prototype, "ordersForCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsAdminResolver.prototype, "createCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsAdminResolver.prototype, "makeCustomerAdminOfCustomerManagedGroup", null);
+CustomerManagedGroupsAdminResolver = __decorate([
+    (0, graphql_1.Resolver)(),
+    __metadata("design:paramtypes", [customer_managed_groups_service_1.CustomerManagedGroupsService])
+], CustomerManagedGroupsAdminResolver);
+exports.CustomerManagedGroupsAdminResolver = CustomerManagedGroupsAdminResolver;
+let CustomerManagedGroupsShopResolver = class CustomerManagedGroupsShopResolver {
+    constructor(service) {
+        this.service = service;
+    }
+    ordersForMyCustomerManagedGroup(ctx) {
+        return this.service.getOrdersForCustomer(ctx);
+    }
+    activeCustomerManagedGroupMember(ctx) {
+        return this.service.getActiveMember(ctx);
+    }
+    myCustomerManagedGroup(ctx) {
+        return this.service.myCustomerManagedGroup(ctx);
+    }
+    createCustomerManagedGroup(ctx) {
+        return this.service.createCustomerManagedGroup(ctx);
+    }
+    makeCustomerAdminOfCustomerManagedGroup(ctx, groupId, customerId) {
+        return this.service.makeAdminOfGroup(ctx, groupId, customerId);
+    }
+    addCustomerToMyCustomerManagedGroup(ctx, input) {
+        return this.service.addToGroup(ctx, input);
+    }
+    updateCustomerManagedGroupMember(ctx, input) {
+        return this.service.updateGroupMember(ctx, input);
+    }
+    removeCustomerFromMyCustomerManagedGroup(ctx, customerId) {
+        return this.service.removeFromGroup(ctx, customerId);
+    }
+};
+__decorate([
+    (0, graphql_1.Query)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "ordersForMyCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Query)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "activeCustomerManagedGroupMember", null);
+__decorate([
+    (0, graphql_1.Query)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "myCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "createCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)('groupId')),
+    __param(2, (0, graphql_1.Args)('customerId')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "makeCustomerAdminOfCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)('input')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "addCustomerToMyCustomerManagedGroup", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)('input')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "updateCustomerManagedGroupMember", null);
+__decorate([
+    (0, graphql_1.Mutation)(),
+    (0, core_1.Allow)(core_1.Permission.Authenticated),
+    __param(0, (0, core_1.Ctx)()),
+    __param(1, (0, graphql_1.Args)('customerId')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
+    __metadata("design:returntype", Promise)
+], CustomerManagedGroupsShopResolver.prototype, "removeCustomerFromMyCustomerManagedGroup", null);
+CustomerManagedGroupsShopResolver = __decorate([
+    (0, graphql_1.Resolver)(),
+    __metadata("design:paramtypes", [customer_managed_groups_service_1.CustomerManagedGroupsService])
+], CustomerManagedGroupsShopResolver);
+exports.CustomerManagedGroupsShopResolver = CustomerManagedGroupsShopResolver;

package/dist/{customer-managed-groups.service.d.ts → api/customer-managed-groups.service.d.ts}

@@ -1,6 +1,7 @@
 import { Customer, CustomerGroupService, CustomerService, EntityHydrator, ID, Order, OrderService, PaginatedList, RequestContext, TransactionalConnection } from '@vendure/core';
 import { CustomerGroupWithCustomFields, CustomerWithCustomFields } from './custom-fields';
-import { AddCustomerToMyCustomerManagedGroupInput, CustomerManagedGroup, CustomerManagedGroupMember, UpdateCustomerManagedGroupMemberInput } from './generated/graphql';
+import { AddCustomerToMyCustomerManagedGroupInput, UpdateCustomerManagedGroupMemberInput } from './generated/shop-graphql';
+import { CustomerManagedGroup, CustomerManagedGroupMember } from './generated/admin-graphql';
 export declare class CustomerManagedGroupsService {
     private orderService;
     private customerService;
@@ -8,7 +9,7 @@ export declare class CustomerManagedGroupsService {
     private hydrator;
     private transactionalConnection;
     constructor(orderService: OrderService, customerService: CustomerService, customerGroupService: CustomerGroupService, hydrator: EntityHydrator, transactionalConnection: TransactionalConnection);
-    getOrdersForCustomer(ctx: RequestContext): Promise<PaginatedList<Order>>;
+    getOrdersForCustomer(ctx: RequestContext, customerId?: ID): Promise<PaginatedList<Order>>;
     addToGroup(ctx: RequestContext, { emailAddress: inviteeEmailAddress, isGroupAdmin: inviteeIsAdmin, }: AddCustomerToMyCustomerManagedGroupInput): Promise<CustomerManagedGroup>;
     removeFromGroup(ctx: RequestContext, customerIdToRemove: ID): Promise<CustomerManagedGroup>;
     getOrThrowCustomerByUserId(ctx: RequestContext, userId: ID): Promise<CustomerWithCustomFields>;
@@ -17,6 +18,10 @@ export declare class CustomerManagedGroupsService {
      * Get userId from RequestContext or throw a ForbiddenError if not logged in
      */
     getOrThrowUserId(ctx: RequestContext): ID;
+    /**
+     * Get customer from customerId
+     */
+    getOrThrowCustomer(ctx: RequestContext, customerId: ID): Promise<Customer>;
     throwIfNotAdministratorOfGroup(userId: ID, group: CustomerGroupWithCustomFields): void;
     isAdministratorOfGroup(userId: ID, group: CustomerGroupWithCustomFields): boolean;
     getCustomerManagedGroup(customer: CustomerWithCustomFields): CustomerGroupWithCustomFields | undefined;
@@ -26,7 +31,7 @@ export declare class CustomerManagedGroupsService {
     getActiveMember(ctx: RequestContext): Promise<CustomerManagedGroupMember | undefined>;
     myCustomerManagedGroup(ctx: RequestContext): Promise<CustomerManagedGroup | undefined>;
     myCustomerManagedGroupWithCustomFields(ctx: RequestContext): Promise<CustomerGroupWithCustomFields | undefined>;
-    createCustomerManagedGroup(ctx: RequestContext): Promise<CustomerManagedGroup>;
+    createCustomerManagedGroup(ctx: RequestContext, customerId?: ID): Promise<CustomerManagedGroup>;
     /**
      *
      * @param ctx Internal function to create a customer managed group based
@@ -37,5 +42,5 @@ export declare class CustomerManagedGroupsService {
     mapToCustomerManagedGroup(group: CustomerGroupWithCustomFields): CustomerManagedGroup;
     mapToCustomerManagedGroupMember(customer: Customer, isGroupAdministrator: boolean): CustomerManagedGroupMember;
     updateGroupMember(ctx: RequestContext, input: UpdateCustomerManagedGroupMemberInput): Promise<CustomerManagedGroup>;
-    makeAdminOfGroup(ctx: RequestContext, groupId: ID, customerId: ID): Promise<CustomerManagedGroup>;
+    makeAdminOfGroup(ctx: RequestContext, groupId: ID, customerId: ID, isAdmin?: boolean): Promise<CustomerManagedGroup>;
 }

package/dist/{customer-managed-groups.service.js → api/customer-managed-groups.service.js}

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomerManagedGroupsService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@vendure/core");
-const constants_1 = require("./constants");
+const constants_1 = require("../constants");
 let CustomerManagedGroupsService = class CustomerManagedGroupsService {
     constructor(orderService, customerService, customerGroupService, hydrator, transactionalConnection) {
         this.orderService = orderService;
@@ -21,14 +21,20 @@ let CustomerManagedGroupsService = class CustomerManagedGroupsService {
         this.hydrator = hydrator;
         this.transactionalConnection = transactionalConnection;
     }
-    async getOrdersForCustomer(ctx) {
-        const userId = this.getOrThrowUserId(ctx);
-        const customer = await this.getOrThrowCustomerByUserId(ctx, userId);
+    async getOrdersForCustomer(ctx, customerId) {
+        let customer;
+        if (customerId) {
+            customer = await this.getOrThrowCustomer(ctx, customerId);
+        }
+        else {
+            const userId = this.getOrThrowUserId(ctx);
+            customer = await this.getOrThrowCustomerByUserId(ctx, userId);
+        }
         const customerManagedGroup = this.getCustomerManagedGroup(customer);
         if (!customerManagedGroup) {
             throw new core_1.UserInputError(`You are not in a customer managed group`);
         }
-        const isAdmin = this.isAdministratorOfGroup(userId, customerManagedGroup);
+        const isAdmin = this.isAdministratorOfGroup(customer.user.id, customerManagedGroup);
         const orders = [];
         // If not admin, only fetch orders for the current user
         const customers = isAdmin ? customerManagedGroup.customers : [customer];
@@ -136,7 +142,7 @@ let CustomerManagedGroupsService = class CustomerManagedGroupsService {
         const customerWithGroupsData = await customerRepo
             .createQueryBuilder('customer')
             .leftJoin('customer.channels', 'customer_channel')
-            .leftJoin('customer.user', 'user')
+            .leftJoinAndSelect('customer.user', 'user')
             .leftJoinAndSelect('customer.addresses', 'customerAddress')
             .leftJoinAndSelect('customerAddress.country', 'customerCountry')
             .leftJoinAndSelect('customer.groups', 'groups')
@@ -179,6 +185,22 @@ let CustomerManagedGroupsService = class CustomerManagedGroupsService {
         }
         return ctx.activeUserId;
     }
+    /**
+     * Get customer from customerId
+     */
+    async getOrThrowCustomer(ctx, customerId) {
+        const customer = await this.customerService.findOne(ctx, customerId, [
+            'user',
+            'groups',
+            'groups.customers',
+            'groups.customFields.groupAdmins',
+            'groups.customFields.groupAdmins.user',
+        ]);
+        if (!customer) {
+            throw new core_1.EntityNotFoundError('Customer', customerId);
+        }
+        return customer;
+    }
     throwIfNotAdministratorOfGroup(userId, group) {
         if (!this.isAdministratorOfGroup(userId, group)) {
             throw new core_1.UserInputError('You are not administrator of your group');
@@ -222,14 +244,20 @@ let CustomerManagedGroupsService = class CustomerManagedGroupsService {
         }
         return customerManagedGroup;
     }
-    async createCustomerManagedGroup(ctx) {
-        const userId = this.getOrThrowUserId(ctx);
-        const currentCustomer = await this.getOrThrowCustomerByUserId(ctx, userId);
-        let customerManagedGroup = this.getCustomerManagedGroup(currentCustomer);
+    async createCustomerManagedGroup(ctx, customerId) {
+        let customer;
+        if (customerId) {
+            customer = await this.getOrThrowCustomer(ctx, customerId);
+        }
+        else {
+            const userId = this.getOrThrowUserId(ctx);
+            customer = await this.getOrThrowCustomerByUserId(ctx, userId);
+        }
+        let customerManagedGroup = this.getCustomerManagedGroup(customer);
         if (customerManagedGroup) {
             throw new core_1.UserInputError(`You are already in a customer managed group`);
         }
-        customerManagedGroup = await this.createGroup(ctx, currentCustomer);
+        customerManagedGroup = await this.createGroup(ctx, customer);
         await this.hydrator.hydrate(ctx, customerManagedGroup, {
             relations: ['customers'],
         });
@@ -338,14 +366,15 @@ let CustomerManagedGroupsService = class CustomerManagedGroupsService {
         }
         return newGroupData;
     }
-    async makeAdminOfGroup(ctx, groupId, customerId) {
+    async makeAdminOfGroup(ctx, groupId, customerId, isAdmin) {
         const customerGroup = await this.customerGroupService.findOne(ctx, groupId, ['customers', 'customers.user']);
         if (!customerGroup ||
             !customerGroup.customFields ||
             !customerGroup.customFields.isCustomerManaged) {
             throw new core_1.UserInputError(`No customer managed group with id ${groupId} exists`);
         }
-        if (!customerGroup.customFields.groupAdmins.find((admin) => admin.user?.id === ctx.activeUserId)) {
+        if (!isAdmin &&
+            !customerGroup.customFields.groupAdmins.find((admin) => admin.user?.id === ctx.activeUserId)) {
             throw new core_1.UserInputError(`You are not admin of this customer managed group`);
         }
         const customerInQuestion = await customerGroup.customers.find((c) => c.id === customerId);

package/dist/api/generated/admin-graphql.d.ts

@@ -0,0 +1,97 @@
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends {
+    [key: string]: unknown;
+}> = {
+    [K in keyof T]: T[K];
+};
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]?: Maybe<T[SubKey]>;
+};
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]: Maybe<T[SubKey]>;
+};
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+    ID: string | number;
+    String: string;
+    Boolean: boolean;
+    Int: number;
+    Float: number;
+    DateTime: any;
+    JSON: any;
+    LanguageCode: any;
+    OrderList: any;
+};
+export type CustomerManagedGroup = {
+    __typename?: 'CustomerManagedGroup';
+    createdAt: Scalars['DateTime'];
+    customers: Array<CustomerManagedGroupMember>;
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    updatedAt: Scalars['DateTime'];
+};
+export type CustomerManagedGroupAddress = {
+    __typename?: 'CustomerManagedGroupAddress';
+    city?: Maybe<Scalars['String']>;
+    company?: Maybe<Scalars['String']>;
+    country: CustomerManagedGroupCountry;
+    createdAt: Scalars['DateTime'];
+    defaultBillingAddress?: Maybe<Scalars['Boolean']>;
+    defaultShippingAddress?: Maybe<Scalars['Boolean']>;
+    fullName?: Maybe<Scalars['String']>;
+    id: Scalars['ID'];
+    phoneNumber?: Maybe<Scalars['String']>;
+    postalCode?: Maybe<Scalars['String']>;
+    province?: Maybe<Scalars['String']>;
+    streetLine1: Scalars['String'];
+    streetLine2?: Maybe<Scalars['String']>;
+    updatedAt: Scalars['DateTime'];
+};
+export type CustomerManagedGroupCountry = {
+    __typename?: 'CustomerManagedGroupCountry';
+    code: Scalars['String'];
+    createdAt: Scalars['DateTime'];
+    enabled: Scalars['Boolean'];
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    translations: Array<CustomerManagedGroupCountryTranslation>;
+    updatedAt: Scalars['DateTime'];
+};
+export type CustomerManagedGroupCountryTranslation = {
+    __typename?: 'CustomerManagedGroupCountryTranslation';
+    id: Scalars['ID'];
+    languageCode: Scalars['LanguageCode'];
+    name: Scalars['String'];
+};
+export type CustomerManagedGroupMember = {
+    __typename?: 'CustomerManagedGroupMember';
+    addresses?: Maybe<Array<CustomerManagedGroupAddress>>;
+    customFields?: Maybe<Scalars['JSON']>;
+    customerId: Scalars['ID'];
+    emailAddress: Scalars['String'];
+    firstName: Scalars['String'];
+    isGroupAdministrator: Scalars['Boolean'];
+    lastName: Scalars['String'];
+    title?: Maybe<Scalars['String']>;
+};
+export type Mutation = {
+    __typename?: 'Mutation';
+    /** Create an empty group with the specified customer as Administrator */
+    createCustomerManagedGroup: CustomerManagedGroup;
+    makeCustomerAdminOfCustomerManagedGroup: CustomerManagedGroup;
+};
+export type MutationCreateCustomerManagedGroupArgs = {
+    customerId: Scalars['ID'];
+};
+export type MutationMakeCustomerAdminOfCustomerManagedGroupArgs = {
+    customerId: Scalars['ID'];
+    groupId: Scalars['ID'];
+};
+export type Query = {
+    __typename?: 'Query';
+    ordersForCustomerManagedGroup: Scalars['OrderList'];
+};
+export type QueryOrdersForCustomerManagedGroupArgs = {
+    customerManagedGroupId: Scalars['ID'];
+};

package/dist/{generated/graphql.d.ts → api/generated/shop-graphql.d.ts}

@@ -13,7 +13,7 @@ export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
 };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-    ID: number | string;
+    ID: string | number;
     String: string;
     Boolean: boolean;
     Int: number;

package/dist/api/generated/shop-graphql.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/api/shop-graphql.d.ts

@@ -0,0 +1 @@
+export declare const shopSchema: import("graphql").DocumentNode;

package/dist/api/shop-graphql.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shopSchema = void 0;
+const graphql_tag_1 = require("graphql-tag");
+const common_graphql_1 = require("./common-graphql");
+exports.shopSchema = (0, graphql_tag_1.gql) `
+  ${common_graphql_1.commonSchema}
+
+  input AddCustomerToMyCustomerManagedGroupInput {
+    emailAddress: String!
+    isGroupAdmin: Boolean
+  }
+
+  input UpdateCustomerManagedGroupMemberInput {
+    title: String
+    firstName: String
+    lastName: String
+    emailAddress: String
+    addresses: [CustomerManagedGroupAddressInput!]
+    customerId: ID!
+    customFields: JSON
+  }
+
+  """
+  When no ID is given, a new address will be created
+  """
+  input CustomerManagedGroupAddressInput {
+    id: ID
+    fullName: String
+    company: String
+    streetLine1: String
+    streetLine2: String
+    city: String
+    province: String
+    postalCode: String
+    countryCode: String
+    phoneNumber: String
+    defaultShippingAddress: Boolean
+    defaultBillingAddress: Boolean
+  }
+
+  extend type Mutation {
+    """
+    Creates a group with the current logged in user as administrator of the group
+    """
+    addCustomerToMyCustomerManagedGroup(
+      input: AddCustomerToMyCustomerManagedGroupInput
+    ): CustomerManagedGroup!
+
+    """
+    Create an empty group with the current user as Administrator
+    """
+    createCustomerManagedGroup: CustomerManagedGroup!
+
+    removeCustomerFromMyCustomerManagedGroup(
+      customerId: ID!
+    ): CustomerManagedGroup!
+
+    """
+    Update a member of one's group
+    """
+    updateCustomerManagedGroupMember(
+      input: UpdateCustomerManagedGroupMemberInput!
+    ): CustomerManagedGroup!
+  }
+
+  extend type Query {
+    """
+    Fetch placed orders for each member of the group
+    """
+    ordersForMyCustomerManagedGroup: OrderList!
+
+    """
+    Fetch the current logged in group member
+    """
+    activeCustomerManagedGroupMember: CustomerManagedGroupMember
+
+    myCustomerManagedGroup: CustomerManagedGroup
+  }
+`;

package/dist/customer-managed-groups.plugin.d.ts

@@ -1,7 +1,4 @@
 import { AdminUiExtension } from '@vendure/ui-devkit/compiler';
-export interface ExampleOptions {
-    enabled: boolean;
-}
 export declare class CustomerManagedGroupsPlugin {
     static ui: AdminUiExtension;
 }

package/dist/customer-managed-groups.plugin.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomerManagedGroupsPlugin = void 0;
 const core_1 = require("@vendure/core");
 const path_1 = __importDefault(require("path"));
-const api_extensions_1 = require("./api-extensions");
-const custom_fields_1 = require("./custom-fields");
-const customer_managed_groups_service_1 = require("./customer-managed-groups.service");
+const shop_graphql_1 = require("./api/shop-graphql");
+const admin_graphql_1 = require("./api/admin-graphql");
+const custom_fields_1 = require("./api/custom-fields");
+const customer_managed_groups_service_1 = require("./api/customer-managed-groups.service");
+const customer_managed_groups_resolver_1 = require("./api/customer-managed-groups.resolver");
 let CustomerManagedGroupsPlugin = class CustomerManagedGroupsPlugin {
 };
 CustomerManagedGroupsPlugin.ui = {
@@ -31,9 +33,13 @@ CustomerManagedGroupsPlugin = __decorate([
     (0, core_1.VendurePlugin)({
         imports: [core_1.PluginCommonModule],
         providers: [customer_managed_groups_service_1.CustomerManagedGroupsService],
+        adminApiExtensions: {
+            resolvers: [customer_managed_groups_resolver_1.CustomerManagedGroupsAdminResolver],
+            schema: admin_graphql_1.adminSchema,
+        },
         shopApiExtensions: {
-            resolvers: [api_extensions_1.CustomerManagedGroupsResolver],
-            schema: api_extensions_1.shopSchema,
+            resolvers: [customer_managed_groups_resolver_1.CustomerManagedGroupsShopResolver],
+            schema: shop_graphql_1.shopSchema,
         },
         configuration: (config) => {
             config.customFields = {

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './customer-managed-groups.plugin';
-export * from './customer-managed-groups.service';
-export * from './api-extensions';
-export * from './custom-fields';
+export * from './api/customer-managed-groups.service';
+export * from './api/shop-graphql';
+export * from './api/admin-graphql';
+export * from './api/custom-fields';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./customer-managed-groups.plugin"), exports);
-__exportStar(require("./customer-managed-groups.service"), exports);
-__exportStar(require("./api-extensions"), exports);
-__exportStar(require("./custom-fields"), exports);
+__exportStar(require("./api/customer-managed-groups.service"), exports);
+__exportStar(require("./api/shop-graphql"), exports);
+__exportStar(require("./api/admin-graphql"), exports);
+__exportStar(require("./api/custom-fields"), exports);

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@pinelab/vendure-plugin-customer-managed-groups",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "This plugin allows customer groups to have 'Group admins', that are allowed to fetch placed orders for everyone in the group.",
+  "icon": "account-group",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",
   "repository": "https://github.com/Pinelab-studio/pinelab-vendure-plugins",
@@ -17,12 +18,13 @@
   "types": "dist/index.d.ts",
   "files": [
     "dist",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "scripts": {
     "start": "yarn ts-node test/dev-server.ts",
     "build": "rimraf dist && yarn graphql-codegen && tsc",
     "test": "vitest run"
   },
-  "gitHead": "8f332e7c6bd03bc5fc410ee5a614a6edad36f221"
+  "gitHead": "6d6a0d90258221ca3331996e6fc9a0990b8d5bfc"
 }

package/dist/api-extensions.js

@@ -1,256 +0,0 @@
-"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);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomerManagedGroupsResolver = exports.shopSchema = void 0;
-const graphql_1 = require("@nestjs/graphql");
-const core_1 = require("@vendure/core");
-const graphql_tag_1 = require("graphql-tag");
-const customer_managed_groups_service_1 = require("./customer-managed-groups.service");
-// This is just to enable static codegen, without starting a server
-const scalars = (0, graphql_tag_1.gql) `
-  scalar DateTime
-  scalar OrderList
-  scalar LanguageCode
-  scalar JSON
-`;
-exports.shopSchema = (0, graphql_tag_1.gql) `
-  input AddCustomerToMyCustomerManagedGroupInput {
-    emailAddress: String!
-    isGroupAdmin: Boolean
-  }
-
-  input UpdateCustomerManagedGroupMemberInput {
-    title: String
-    firstName: String
-    lastName: String
-    emailAddress: String
-    addresses: [CustomerManagedGroupAddressInput!]
-    customerId: ID!
-    customFields: JSON
-  }
-
-  """
-  When no ID is given, a new address will be created
-  """
-  input CustomerManagedGroupAddressInput {
-    id: ID
-    fullName: String
-    company: String
-    streetLine1: String
-    streetLine2: String
-    city: String
-    province: String
-    postalCode: String
-    countryCode: String
-    phoneNumber: String
-    defaultShippingAddress: Boolean
-    defaultBillingAddress: Boolean
-  }
-
-  type CustomerManagedGroupMember {
-    customerId: ID!
-    title: String
-    addresses: [CustomerManagedGroupAddress!]
-    firstName: String!
-    lastName: String!
-    emailAddress: String!
-    isGroupAdministrator: Boolean!
-    customFields: JSON
-  }
-
-  type CustomerManagedGroupAddress {
-    id: ID!
-    createdAt: DateTime!
-    updatedAt: DateTime!
-    fullName: String
-    company: String
-    streetLine1: String!
-    streetLine2: String
-    city: String
-    province: String
-    postalCode: String
-    country: CustomerManagedGroupCountry!
-    phoneNumber: String
-    defaultShippingAddress: Boolean
-    defaultBillingAddress: Boolean
-  }
-
-  type CustomerManagedGroupCountry {
-    id: ID!
-    createdAt: DateTime!
-    updatedAt: DateTime!
-    code: String!
-    name: String!
-    enabled: Boolean!
-    translations: [CustomerManagedGroupCountryTranslation!]!
-  }
-
-  type CustomerManagedGroupCountryTranslation {
-    id: ID!
-    languageCode: LanguageCode!
-    name: String!
-  }
-
-  type CustomerManagedGroup {
-    id: ID!
-    createdAt: DateTime!
-    updatedAt: DateTime!
-    name: String!
-    customers: [CustomerManagedGroupMember!]!
-  }
-
-  extend type Mutation {
-    """
-    Creates a group with the current logged in user as administrator of the group
-    """
-    addCustomerToMyCustomerManagedGroup(
-      input: AddCustomerToMyCustomerManagedGroupInput
-    ): CustomerManagedGroup!
-    """
-    Create an empty group with the current user as Administrator
-    """
-    createCustomerManagedGroup: CustomerManagedGroup!
-
-    removeCustomerFromMyCustomerManagedGroup(
-      customerId: ID!
-    ): CustomerManagedGroup!
-
-    """
-    Update a member of one's group
-    """
-    updateCustomerManagedGroupMember(
-      input: UpdateCustomerManagedGroupMemberInput!
-    ): CustomerManagedGroup!
-    makeCustomerAdminOfCustomerManagedGroup(
-      groupId: ID!
-      customerId: ID!
-    ): CustomerManagedGroup!
-  }
-
-  extend type Query {
-    """
-    Fetch placed orders for each member of the group
-    """
-    ordersForMyCustomerManagedGroup: OrderList!
-    """
-    Fetch the current logged in group member
-    """
-    activeCustomerManagedGroupMember: CustomerManagedGroupMember
-
-    myCustomerManagedGroup: CustomerManagedGroup
-  }
-`;
-let CustomerManagedGroupsResolver = class CustomerManagedGroupsResolver {
-    constructor(service) {
-        this.service = service;
-    }
-    async ordersForMyCustomerManagedGroup(ctx) {
-        return this.service.getOrdersForCustomer(ctx);
-    }
-    async activeCustomerManagedGroupMember(ctx) {
-        return this.service.getActiveMember(ctx);
-    }
-    async myCustomerManagedGroup(ctx) {
-        return this.service.myCustomerManagedGroup(ctx);
-    }
-    async createCustomerManagedGroup(ctx) {
-        return this.service.createCustomerManagedGroup(ctx);
-    }
-    async makeCustomerAdminOfCustomerManagedGroup(ctx, groupId, customerId) {
-        return this.service.makeAdminOfGroup(ctx, groupId, customerId);
-    }
-    async addCustomerToMyCustomerManagedGroup(ctx, input) {
-        return this.service.addToGroup(ctx, input);
-    }
-    async updateCustomerManagedGroupMember(ctx, input) {
-        return this.service.updateGroupMember(ctx, input);
-    }
-    async removeCustomerFromMyCustomerManagedGroup(ctx, customerId) {
-        return this.service.removeFromGroup(ctx, customerId);
-    }
-};
-__decorate([
-    (0, graphql_1.Query)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "ordersForMyCustomerManagedGroup", null);
-__decorate([
-    (0, graphql_1.Query)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "activeCustomerManagedGroupMember", null);
-__decorate([
-    (0, graphql_1.Query)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "myCustomerManagedGroup", null);
-__decorate([
-    (0, graphql_1.Mutation)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "createCustomerManagedGroup", null);
-__decorate([
-    (0, graphql_1.Mutation)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __param(1, (0, graphql_1.Args)('groupId')),
-    __param(2, (0, graphql_1.Args)('customerId')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "makeCustomerAdminOfCustomerManagedGroup", null);
-__decorate([
-    (0, graphql_1.Mutation)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __param(1, (0, graphql_1.Args)('input')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "addCustomerToMyCustomerManagedGroup", null);
-__decorate([
-    (0, graphql_1.Mutation)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __param(1, (0, graphql_1.Args)('input')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "updateCustomerManagedGroupMember", null);
-__decorate([
-    (0, graphql_1.Mutation)(),
-    (0, core_1.Allow)(core_1.Permission.Authenticated),
-    __param(0, (0, core_1.Ctx)()),
-    __param(1, (0, graphql_1.Args)('customerId')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, Object]),
-    __metadata("design:returntype", Promise)
-], CustomerManagedGroupsResolver.prototype, "removeCustomerFromMyCustomerManagedGroup", null);
-CustomerManagedGroupsResolver = __decorate([
-    (0, graphql_1.Resolver)(),
-    __metadata("design:paramtypes", [customer_managed_groups_service_1.CustomerManagedGroupsService])
-], CustomerManagedGroupsResolver);
-exports.CustomerManagedGroupsResolver = CustomerManagedGroupsResolver;