@restorecommerce/facade 0.5.5 → 1.0.0

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.5.7...@restorecommerce/facade@1.0.0) (2022-08-25)
+
+
+### Features
+
+* move to fully typed grpc client and server ([ec9be2d](https://github.com/restorecommerce/libs/commit/ec9be2daff0823e9ba440a2845b7b1a7f2d74b50))
+* move to fully typed grpc client and server ([aeee2f2](https://github.com/restorecommerce/libs/commit/aeee2f2b7ca470223d7bc42fd7cafd4bb8387796))
+
+
+### Reverts
+
+* Revert "BREAKING CHANGE: move to fully typed grpc client and server" ([2d584a7](https://github.com/restorecommerce/libs/commit/2d584a709632ae608f595a2c836deabd34f671d9))
+
+
+### BREAKING CHANGES
+
+* move to fully typed grpc client and server
+
+
+
+
+
+## [0.5.7](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.5.6...@restorecommerce/facade@0.5.7) (2022-08-10)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
+## [0.5.6](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.5.5...@restorecommerce/facade@0.5.6) (2022-07-07)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
 ## [0.5.5](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.5.4...@restorecommerce/facade@0.5.5) (2022-06-28)
 
 **Note:** Version bump only for package @restorecommerce/facade

package/dist/gql/index.d.ts

@@ -1,4 +1 @@
 export * from './types/index';
-export * from './helpers/index';
-export * from './helpers/resolver';
-export * from './helpers/schema';

package/dist/gql/index.js

@@ -15,6 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types/index"), exports);
-__exportStar(require("./helpers/index"), exports);
-__exportStar(require("./helpers/resolver"), exports);
-__exportStar(require("./helpers/schema"), exports);

package/dist/gql/protos/graphql.d.ts

@@ -29,4 +29,5 @@ export declare const getAndGenerateSchema: <TSource, TContext>(service: ServiceD
 export declare const getAndGenerateResolvers: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>, SRV = any, R = ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, NS extends keyof CTX = any>(service: ServiceDescriptorProto, namespace: NS, cfg: ServiceConfig, meta: ProtoMetadata, subspace?: string | undefined, serviceKey?: string | undefined) => { [key in keyof SRV]: R; };
 export declare const generateSubServiceSchemas: (subServices: ProtoMetadata[], config: SubSpaceServiceConfig, namespace: string, prefix: string) => GraphQLSchema;
 export declare const generateSubServiceResolvers: <T, M extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, M>>(subServices: ProtoMetadata[], config: SubSpaceServiceConfig, namespace: string) => T;
+export declare function camelCase(s: string): string;
 export {};

package/dist/gql/protos/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSubServiceResolvers = exports.generateSubServiceSchemas = exports.getAndGenerateResolvers = exports.getAndGenerateSchema = exports.getWhitelistBlacklistConfig = exports.generateSchema = exports.registerResolverSchema = exports.generateResolver = exports.registerResolverFunction = exports.getGQLResolverFunctions = exports.postProcessGQLValue = exports.preprocessGQLInput = exports.getGQLSchemas = exports.getGQLSchema = void 0;
+exports.camelCase = exports.generateSubServiceResolvers = exports.generateSubServiceSchemas = exports.getAndGenerateResolvers = exports.getAndGenerateSchema = exports.getWhitelistBlacklistConfig = exports.generateSchema = exports.registerResolverSchema = exports.generateResolver = exports.registerResolverFunction = exports.getGQLResolverFunctions = exports.postProcessGQLValue = exports.preprocessGQLInput = exports.getGQLSchemas = exports.getGQLSchema = void 0;
 const graphql_1 = require("graphql");
 const definition_1 = require("graphql/type/definition");
 const types_1 = require("./types");
@@ -228,7 +228,8 @@ const getGQLResolverFunctions = (service, key, serviceKey, cfg) => {
                         realMethod = 'Upsert';
                     }
                 }
-                const rawResult = await service[realMethod](req);
+                const methodFunc = service[camelCase(realMethod)] || service[realMethod];
+                const rawResult = await methodFunc(req);
                 const result = (0, exports.postProcessGQLValue)(rawResult, outputTyping.output);
                 const grpcClientConfig = cfg.client;
                 const bufferFields = (0, utils_1.getKeys)(grpcClientConfig === null || grpcClientConfig === void 0 ? void 0 : grpcClientConfig.bufferFields);
@@ -678,7 +679,8 @@ const generateSubServiceResolvers = (subServices, config, namespace) => {
                                         if (authToken && authToken.startsWith('Bearer ')) {
                                             req.subject.token = authToken.split(' ')[1];
                                         }
-                                        const result = await service[resolver.targetMethod](req);
+                                        const methodFunc = service[camelCase(resolver.targetMethod)] || service[resolver.targetMethod];
+                                        const result = await methodFunc(req);
                                         if (result && result.items && result.items.length) {
                                             if (Array.isArray(parent[fieldJsonName])) {
                                                 return result.items.map((item) => item.payload);
@@ -718,3 +720,7 @@ const snakeToCamel = (s) => {
 const capitalize = (s) => {
     return s.substring(0, 1).toUpperCase() + s.substring(1);
 };
+function camelCase(s) {
+    return s.substring(0, 1).toLowerCase() + s.substring(1);
+}
+exports.camelCase = camelCase;

package/dist/gql/protos/index.d.ts

@@ -1,4 +1,3 @@
 export * from './types';
 export * from './registry';
-export * from './protos';
 export * from './graphql';

package/dist/gql/protos/index.js

@@ -16,5 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./registry"), exports);
-__exportStar(require("./protos"), exports);
 __exportStar(require("./graphql"), exports);

package/dist/gql/protos/types.d.ts

@@ -66,7 +66,9 @@ export interface MethodConfig {
     methods?: BlackListWhiteListConfig;
 }
 export interface ServiceConfig {
-    client: GrpcClientConfig;
+    client: Omit<GrpcClientConfig, 'logger'> & {
+        address: string;
+    };
     [key: string]: any;
 }
 export interface SubSpaceServiceConfig extends ServiceConfig {

package/dist/modules/access-control/grpc/index.d.ts

@@ -1,14 +1,13 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service as access_controlService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/access_control";
-import { Service as policyService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy";
-import { Service as ruleService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/rule";
-import { Service as policy_setService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy_set";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient as access_controlClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/access_control';
+import { ServiceClient as policyClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy';
+import { ServiceClient as ruleClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/rule';
+import { ServiceClient as policy_setClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy_set';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class AccessControlSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    access_control: access_controlService;
-    policy: policyService;
-    rule: ruleService;
-    policy_set: policy_setService;
+    readonly access_control: access_controlClient;
+    readonly policy: policyClient;
+    readonly rule: ruleClient;
+    readonly policy_set: policy_setClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/access-control/grpc/index.js

@@ -6,14 +6,13 @@ const access_control_1 = require("@restorecommerce/rc-grpc-clients/dist/generate
 const policy_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy");
 const rule_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/rule");
 const policy_set_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/policy_set");
-const protos_1 = require("../../../gql/protos");
 class AccessControlSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.access_control = (0, protos_1.getGRPCService)(this, access_control_1.protobufPackage, access_control_1.protoMetadata.fileDescriptor.service[0]);
-        this.policy = (0, protos_1.getGRPCService)(this, policy_1.protobufPackage, policy_1.protoMetadata.fileDescriptor.service[0]);
-        this.rule = (0, protos_1.getGRPCService)(this, rule_1.protobufPackage, rule_1.protoMetadata.fileDescriptor.service[0]);
-        this.policy_set = (0, protos_1.getGRPCService)(this, policy_set_1.protobufPackage, policy_set_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.access_control = this.createClient(cfg, access_control_1.ServiceDefinition, this.channel);
+        this.policy = this.createClient(cfg, policy_1.ServiceDefinition, this.channel);
+        this.rule = this.createClient(cfg, rule_1.ServiceDefinition, this.channel);
+        this.policy_set = this.createClient(cfg, policy_set_1.ServiceDefinition, this.channel);
     }
 }
 exports.AccessControlSrvGrpcClient = AccessControlSrvGrpcClient;

package/dist/modules/access-control/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.accessControlModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const accessControl = {
-        client: new grpc_1.AccessControlSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.AccessControlSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,

package/dist/modules/catalog/grpc/index.d.ts

@@ -1,16 +1,15 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service as productService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product";
-import { Service as product_prototypeService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product_prototype";
-import { Service as product_categoryService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product_category";
-import { Service as price_groupService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/price_group";
-import { Service as manufacturerService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/manufacturer";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient as productClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product';
+import { ServiceClient as product_prototypeClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product_prototype';
+import { ServiceClient as product_categoryClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product_category';
+import { ServiceClient as price_groupClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/price_group';
+import { ServiceClient as manufacturerClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/manufacturer';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class CatalogSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    product: productService;
-    product_prototype: product_prototypeService;
-    product_category: product_categoryService;
-    price_group: price_groupService;
-    manufacturer: manufacturerService;
+    readonly product: productClient;
+    readonly product_prototype: product_prototypeClient;
+    readonly product_category: product_categoryClient;
+    readonly price_group: price_groupClient;
+    readonly manufacturer: manufacturerClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/catalog/grpc/index.js

@@ -7,15 +7,14 @@ const product_prototype_1 = require("@restorecommerce/rc-grpc-clients/dist/gener
 const product_category_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/product_category");
 const price_group_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/price_group");
 const manufacturer_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/manufacturer");
-const protos_1 = require("../../../gql/protos");
 class CatalogSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.product = (0, protos_1.getGRPCService)(this, product_1.protobufPackage, product_1.protoMetadata.fileDescriptor.service[0]);
-        this.product_prototype = (0, protos_1.getGRPCService)(this, product_prototype_1.protobufPackage, product_prototype_1.protoMetadata.fileDescriptor.service[0]);
-        this.product_category = (0, protos_1.getGRPCService)(this, product_category_1.protobufPackage, product_category_1.protoMetadata.fileDescriptor.service[0]);
-        this.price_group = (0, protos_1.getGRPCService)(this, price_group_1.protobufPackage, price_group_1.protoMetadata.fileDescriptor.service[0]);
-        this.manufacturer = (0, protos_1.getGRPCService)(this, manufacturer_1.protobufPackage, manufacturer_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.product = this.createClient(cfg, product_1.ServiceDefinition, this.channel);
+        this.product_prototype = this.createClient(cfg, product_prototype_1.ServiceDefinition, this.channel);
+        this.product_category = this.createClient(cfg, product_category_1.ServiceDefinition, this.channel);
+        this.price_group = this.createClient(cfg, price_group_1.ServiceDefinition, this.channel);
+        this.manufacturer = this.createClient(cfg, manufacturer_1.ServiceDefinition, this.channel);
     }
 }
 exports.CatalogSrvGrpcClient = CatalogSrvGrpcClient;

package/dist/modules/catalog/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.catalogModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const catalog = {
-        client: new grpc_1.CatalogSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.CatalogSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,

package/dist/modules/fulfillment/grpc/index.d.ts

@@ -1,10 +1,9 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service as fulfillmentService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment";
-import { Service as fulfillment_courierService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment_courier";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient as fulfillmentClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment';
+import { ServiceClient as fulfillment_courierClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment_courier';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class FulfillmentSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    fulfillment: fulfillmentService;
-    fulfillment_courier: fulfillment_courierService;
+    readonly fulfillment: fulfillmentClient;
+    readonly fulfillment_courier: fulfillment_courierClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/fulfillment/grpc/index.js

@@ -4,12 +4,11 @@ exports.FulfillmentSrvGrpcClient = void 0;
 const rc_grpc_clients_1 = require("@restorecommerce/rc-grpc-clients");
 const fulfillment_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment");
 const fulfillment_courier_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/fulfillment_courier");
-const protos_1 = require("../../../gql/protos");
 class FulfillmentSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.fulfillment = (0, protos_1.getGRPCService)(this, fulfillment_1.protobufPackage, fulfillment_1.protoMetadata.fileDescriptor.service[0]);
-        this.fulfillment_courier = (0, protos_1.getGRPCService)(this, fulfillment_courier_1.protobufPackage, fulfillment_courier_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.fulfillment = this.createClient(cfg, fulfillment_1.ServiceDefinition, this.channel);
+        this.fulfillment_courier = this.createClient(cfg, fulfillment_courier_1.ServiceDefinition, this.channel);
     }
 }
 exports.FulfillmentSrvGrpcClient = FulfillmentSrvGrpcClient;

package/dist/modules/fulfillment/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.fulfillmentModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const fulfillment = {
-        client: new grpc_1.FulfillmentSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.FulfillmentSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,

package/dist/modules/identity/grpc/index.d.ts

@@ -1,16 +1,15 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service as userService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
-import { Service as roleService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role";
-import { Service as authentication_logService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log";
-import { Service as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
-import { Service as oauthService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient as userClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user';
+import { ServiceClient as roleClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role';
+import { ServiceClient as authentication_logClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
+import { ServiceClient as tokenClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token';
+import { ServiceClient as oauthClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class IdentitySrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    user: userService;
-    role: roleService;
-    authentication_log: authentication_logService;
-    token: tokenService;
-    oauth: oauthService;
+    readonly user: userClient;
+    readonly role: roleClient;
+    readonly authentication_log: authentication_logClient;
+    readonly token: tokenClient;
+    readonly oauth: oauthClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/identity/grpc/index.js

@@ -7,15 +7,14 @@ const role_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/resto
 const authentication_log_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log");
 const token_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token");
 const oauth_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth");
-const protos_1 = require("../../../gql/protos");
 class IdentitySrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.user = (0, protos_1.getGRPCService)(this, user_1.protobufPackage, user_1.protoMetadata.fileDescriptor.service[0]);
-        this.role = (0, protos_1.getGRPCService)(this, role_1.protobufPackage, role_1.protoMetadata.fileDescriptor.service[0]);
-        this.authentication_log = (0, protos_1.getGRPCService)(this, authentication_log_1.protobufPackage, authentication_log_1.protoMetadata.fileDescriptor.service[0]);
-        this.token = (0, protos_1.getGRPCService)(this, token_1.protobufPackage, token_1.protoMetadata.fileDescriptor.service[0]);
-        this.oauth = (0, protos_1.getGRPCService)(this, oauth_1.protobufPackage, oauth_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.user = this.createClient(cfg, user_1.ServiceDefinition, this.channel);
+        this.role = this.createClient(cfg, role_1.ServiceDefinition, this.channel);
+        this.authentication_log = this.createClient(cfg, authentication_log_1.ServiceDefinition, this.channel);
+        this.token = this.createClient(cfg, token_1.ServiceDefinition, this.channel);
+        this.oauth = this.createClient(cfg, oauth_1.ServiceDefinition, this.channel);
     }
 }
 exports.IdentitySrvGrpcClient = IdentitySrvGrpcClient;

package/dist/modules/identity/index.js

@@ -9,7 +9,10 @@ const grpc_1 = require("./grpc");
 const oauth_1 = require("./oauth/oauth");
 const mount = eval('require("koa-mount")');
 exports.identityModule = (0, utils_1.createFacadeModuleFactory)('identity', (facade, config) => {
-    const identitySrvClient = new grpc_1.IdentitySrvGrpcClient(config.identitySrvClientConfig, facade.logger);
+    const identitySrvClient = new grpc_1.IdentitySrvGrpcClient(config.config.client.address, {
+        ...config.config.client,
+        logger: facade.logger,
+    });
     if (!!config.apiKey) {
         const apiKey = (0, api_key_1.setupApiKey)({
             logger: facade.logger,

package/dist/modules/identity/oauth/oauth.js

@@ -36,7 +36,7 @@ const createOAuth = () => {
             return next();
         }
         const ids = ctx.identitySrvClient;
-        const user = await ids.user.FindByToken({
+        const user = await ids.user.findByToken({
             token: token
         });
         if (!user || !user.payload) {
@@ -50,7 +50,7 @@ const createOAuth = () => {
     router.post('/oauth2-register', async (ctx, next) => {
         const ids = ctx.identitySrvClient;
         const body = ctx.request.body;
-        const user = await ids.user.Register(user_1.RegisterRequest.fromPartial({
+        const user = await ids.user.register(user_1.RegisterRequest.fromPartial({
             email: body.email,
             name: body.username,
             firstName: body.first_name,
@@ -74,7 +74,7 @@ const createOAuth = () => {
     });
     router.get('/oauth2/:service', async (ctx, next) => {
         const ids = ctx.identitySrvClient;
-        const user = await ids.oauth.ExchangeCode({
+        const user = await ids.oauth.exchangeCode({
             service: ctx.params.service,
             code: ctx.request.query['code'],
             state: ctx.request.query['state']

package/dist/modules/identity/oidc/adapter.d.ts

@@ -1,4 +1,4 @@
 import { Logger } from 'winston';
 import { Adapter, AdapterConstructor } from 'oidc-provider';
-import { Service as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
+import { ServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
 export declare function createIdentityServiceAdapterClass(remoteTokenService: tokenService, logger: Logger, localTokenServiceFactory?: (type: string) => Adapter): AdapterConstructor;

package/dist/modules/identity/oidc/interfaces.d.ts

@@ -1,7 +1,7 @@
 import { Adapter, errors, Provider } from 'oidc-provider';
 import { IdentityContext } from '../interfaces';
-import { Service as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
-import { Service as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
+import { ServiceClient as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
+import { ServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
 import { User } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
 export interface OIDCHbsTemplates {
     login?: string;

package/dist/modules/identity/oidc/password-grant.js

@@ -135,7 +135,7 @@ const registerPasswordGrantType = (config) => {
                 activity: 'login',
                 tokenName: token_name
             });
-            await config.authLogService.Create(authentication_log_1.AuthenticationLogList.fromPartial({
+            await config.authLogService.create(authentication_log_1.AuthenticationLogList.fromPartial({
                 items: [authLogItem],
                 subject: auth_1.Subject.fromPartial({ token, scope })
             }));

package/dist/modules/identity/oidc/user.d.ts

@@ -1,5 +1,5 @@
 import { OIDCBodyLoginFn, AuthUser, OIDCLoginFn, OIDCBodyLoginCredentials } from './interfaces';
-import { Service as userService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
+import { ServiceClient as userService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
 export declare const loginUserBody: OIDCBodyLoginFn;
 export declare const loginUserCredentials: OIDCBodyLoginCredentials;
 export declare const loginUser: OIDCLoginFn;

package/dist/modules/identity/oidc/user.js

@@ -67,7 +67,7 @@ const loginUser = async (ctx, identifier, password, remember) => {
 };
 exports.loginUser = loginUser;
 async function findUserById(service, id) {
-    const result = await service.Find(user_1.FindRequest.fromPartial({
+    const result = await service.find(user_1.FindRequest.fromPartial({
         id,
     }));
     if (!(result === null || result === void 0 ? void 0 : result.items) || result.items.length === 0) {

package/dist/modules/indexing/grpc/index.d.ts

@@ -1,8 +1,7 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/search";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/search';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class IndexingSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    search: Service;
+    readonly search: ServiceClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/indexing/grpc/index.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexingSrvGrpcClient = void 0;
 const rc_grpc_clients_1 = require("@restorecommerce/rc-grpc-clients");
 const search_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/search");
-const protos_1 = require("../../../gql/protos");
 class IndexingSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.search = (0, protos_1.getGRPCService)(this, search_1.protobufPackage, search_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.search = this.createClient(cfg, search_1.ServiceDefinition, this.channel);
     }
 }
 exports.IndexingSrvGrpcClient = IndexingSrvGrpcClient;

package/dist/modules/indexing/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.indexingModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const indexing = {
-        client: new grpc_1.IndexingSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.IndexingSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,

package/dist/modules/invoicing/grpc/index.d.ts

@@ -1,8 +1,7 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/invoice";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/invoice';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class InvoicingSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    invoice: Service;
+    readonly invoice: ServiceClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/invoicing/grpc/index.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoicingSrvGrpcClient = void 0;
 const rc_grpc_clients_1 = require("@restorecommerce/rc-grpc-clients");
 const invoice_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/invoice");
-const protos_1 = require("../../../gql/protos");
 class InvoicingSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.invoice = (0, protos_1.getGRPCService)(this, invoice_1.protobufPackage, invoice_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.invoice = this.createClient(cfg, invoice_1.ServiceDefinition, this.channel);
     }
 }
 exports.InvoicingSrvGrpcClient = InvoicingSrvGrpcClient;

package/dist/modules/invoicing/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.invoicingModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const invoicing = {
-        client: new grpc_1.InvoicingSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.InvoicingSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,

package/dist/modules/notification/grpc/index.d.ts

@@ -1,8 +1,7 @@
-import { RestoreCommerceGrpcClient } from "@restorecommerce/rc-grpc-clients";
-import { Service } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/notification";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
-import { Logger } from "winston";
+import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
+import { ServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/notification';
+import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class NotificationSrvGrpcClient extends RestoreCommerceGrpcClient {
-    constructor(cfg: GrpcClientConfig, logger: Logger);
-    service: Service;
+    readonly service: ServiceClient;
+    constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/notification/grpc/index.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationSrvGrpcClient = void 0;
 const rc_grpc_clients_1 = require("@restorecommerce/rc-grpc-clients");
 const notification_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/notification");
-const protos_1 = require("../../../gql/protos");
 class NotificationSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
-    constructor(cfg, logger) {
-        super(cfg, logger);
-        this.service = (0, protos_1.getGRPCService)(this, notification_1.protobufPackage, notification_1.protoMetadata.fileDescriptor.service[0]);
+    constructor(address, cfg) {
+        super(address, cfg);
+        this.service = this.createClient(cfg, notification_1.ServiceDefinition, this.channel);
     }
 }
 exports.NotificationSrvGrpcClient = NotificationSrvGrpcClient;

package/dist/modules/notification/index.js

@@ -7,7 +7,10 @@ const grpc_1 = require("./grpc");
 const utils_1 = require("../../utils");
 exports.notificationModule = (0, utils_1.createFacadeModuleFactory)(interfaces_1.namespace, (facade, config) => {
     const notification = {
-        client: new grpc_1.NotificationSrvGrpcClient(config.config.client, facade.logger)
+        client: new grpc_1.NotificationSrvGrpcClient(config.config.client.address, {
+            ...config.config.client,
+            logger: facade.logger,
+        })
     };
     facade.addApolloService({
         name: interfaces_1.namespace,