@restorecommerce/facade 0.3.13 → 0.3.16

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.16](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.15...@restorecommerce/facade@0.3.16) (2022-04-07)
+
+
+### Bug Fixes
+
+* **facade:** blacklist and whitelist config for sub service name space level ([6d737d6](https://github.com/restorecommerce/libs/commit/6d737d62a5395890e506a3fb76aa31f9e127d38e))
+* **facade:** mask register resolver schema for blacklisted config ([8478590](https://github.com/restorecommerce/libs/commit/8478590bd994eedd3023a8e0f7f347a33f2019f1))
+
+
+
+
+
+## [0.3.15](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.14...@restorecommerce/facade@0.3.15) (2022-04-05)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
+## [0.3.14](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.13...@restorecommerce/facade@0.3.14) (2022-04-01)
+
+
+### Bug Fixes
+
+* **facade:** fix to convert google.protobuf.timestamp to DateTime scalar type and convert it to JS Date object for create / update operation. ([ced5ecf](https://github.com/restorecommerce/libs/commit/ced5ecfae25eb928691a6a17eb32683ae9650a68))
+* **facade:** renamed preprocess and postprocess GQL function name ([ef0f5f0](https://github.com/restorecommerce/libs/commit/ef0f5f02dcd605067b6399d4afa525248ce64417))
+
+
+
+
+
 ## [0.3.13](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.12...@restorecommerce/facade@0.3.13) (2022-03-29)
 
 **Note:** Version bump only for package @restorecommerce/facade

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

@@ -2,27 +2,26 @@ import { GraphQLInputField, GraphQLOutputType, GraphQLResolveInfo, GraphQLSchema
 import { GraphQLEnumType, GraphQLFieldConfig, GraphQLFieldConfigMap, GraphQLInputObjectType, GraphQLInputType } from "graphql/type/definition";
 import { ServiceConfig, SubService, SubSpaceServiceConfig } from "./types";
 import { MethodDescriptorProto, ServiceDescriptorProto } from "ts-proto-descriptors";
-import { GrpcClientConfig } from "@restorecommerce/grpc-client";
 export declare const getGQLSchema: <TSource, TContext>(method: MethodDescriptorProto) => GraphQLFieldConfig<TSource, TContext, any>;
 export declare const getGQLSchemas: <TSource, TContext>(service: ServiceDescriptorProto) => GraphQLFieldConfigMap<TSource, TContext>;
-export declare const recursiveUploadToBuffer: (data: any, model: GraphQLInputObjectType | GraphQLEnumType | GraphQLInputField | GraphQLInputType) => Promise<any>;
-export declare const recursiveBufferToValue: (data: any, model: GraphQLOutputType) => any;
+export declare const preprocessGQLInput: (data: any, model: GraphQLInputObjectType | GraphQLEnumType | GraphQLInputField | GraphQLInputType) => Promise<any>;
+export declare const postProcessGQLValue: (data: any, model: GraphQLOutputType) => any;
 export declare type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
 declare type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof Context, T extends Record<string, any>> = {
     [V in Key]: {
         client: T;
     };
 };
-export declare const getGQLResolverFunctions: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>, SRV = any, R = ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, B extends keyof T = any, NS extends keyof CTX = any>(service: ServiceDescriptorProto, key: NS, serviceKey: B, grpcClientConfig: GrpcClientConfig) => { [key in keyof SRV]: R; };
+export declare const getGQLResolverFunctions: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>, SRV = any, R = ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, B extends keyof T = any, NS extends keyof CTX = any>(service: ServiceDescriptorProto, key: NS, serviceKey: B, cfg: ServiceConfig) => { [key in keyof SRV]: R; };
 export declare const registerResolverFunction: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>>(namespace: string, name: string, func: ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, mutation?: boolean, subspace?: string | undefined, service?: ServiceDescriptorProto | undefined) => void;
 export declare const generateResolver: (...namespaces: string[]) => any;
 declare type SchemaBaseOrSub = ThunkObjMap<GraphQLFieldConfig<any, any>> | Map<string, ThunkObjMap<GraphQLFieldConfig<any, any>>>;
-export declare const registerResolverSchema: (namespace: string, name: string, schema: SchemaBaseOrSub, mutation?: boolean, subspace?: string | undefined) => void;
+export declare const registerResolverSchema: (namespace: string, name: string, schema: SchemaBaseOrSub, mutation: boolean | undefined, subspace: string | undefined, config: ServiceConfig) => void;
 export declare const generateSchema: (setup: {
     prefix: string;
     namespace: string;
 }[]) => GraphQLSchema;
-export declare const getWhitelistBlacklistConfig: (metaService: ServiceDescriptorProto, queries: string[], config: ServiceConfig) => {
+export declare const getWhitelistBlacklistConfig: (metaService: ServiceDescriptorProto, queries: string[], config: ServiceConfig, entity: string) => {
     queries: Set<string>;
     mutations: Set<string>;
 };

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.recursiveBufferToValue = exports.recursiveUploadToBuffer = exports.getGQLSchemas = exports.getGQLSchema = void 0;
+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");
@@ -57,7 +57,7 @@ const getGQLSchemas = (service) => {
     }, {});
 };
 exports.getGQLSchemas = getGQLSchemas;
-const recursiveUploadToBuffer = async (data, model) => {
+const preprocessGQLInput = async (data, model) => {
     if (model instanceof definition_1.GraphQLEnumType) {
         return data;
     }
@@ -80,17 +80,22 @@ const recursiveUploadToBuffer = async (data, model) => {
             const fields = model.getFields();
             for (let key of Object.keys(fields)) {
                 if (data && key in data) {
-                    data[key] = await (0, exports.recursiveUploadToBuffer)(data[key], fields[key].type);
+                    data[key] = await (0, exports.preprocessGQLInput)(data[key], fields[key].type);
                 }
             }
         }
     }
+    if (model instanceof definition_1.GraphQLScalarType) {
+        if (model.name === 'IDateTime') {
+            return new Date(data);
+        }
+    }
     if (model instanceof graphql_1.GraphQLNonNull) {
-        return await (0, exports.recursiveUploadToBuffer)(data, model.ofType);
+        return await (0, exports.preprocessGQLInput)(data, model.ofType);
     }
     if (model instanceof graphql_1.GraphQLList) {
         for (let i = 0; i < data.length; i++) {
-            data[i] = await (0, exports.recursiveUploadToBuffer)(data[i], model.ofType);
+            data[i] = await (0, exports.preprocessGQLInput)(data[i], model.ofType);
         }
     }
     if (model instanceof definition_1.GraphQLScalarType) {
@@ -111,8 +116,8 @@ const recursiveUploadToBuffer = async (data, model) => {
     }
     return data;
 };
-exports.recursiveUploadToBuffer = recursiveUploadToBuffer;
-const recursiveBufferToValue = (data, model) => {
+exports.preprocessGQLInput = preprocessGQLInput;
+const postProcessGQLValue = (data, model) => {
     if (model instanceof definition_1.GraphQLEnumType) {
         return data;
     }
@@ -129,27 +134,34 @@ const recursiveBufferToValue = (data, model) => {
             const fields = model.getFields();
             for (let key of Object.keys(fields)) {
                 if (data && key in data) {
-                    data[key] = (0, exports.recursiveBufferToValue)(data[key], fields[key].type);
+                    data[key] = (0, exports.postProcessGQLValue)(data[key], fields[key].type);
                 }
             }
         }
     }
     if (model instanceof graphql_1.GraphQLNonNull) {
-        return (0, exports.recursiveBufferToValue)(data, model.ofType);
+        return (0, exports.postProcessGQLValue)(data, model.ofType);
     }
     if (model instanceof graphql_1.GraphQLList) {
         for (let i = 0; i < data.length; i++) {
-            data[i] = (0, exports.recursiveBufferToValue)(data[i], model.ofType);
+            data[i] = (0, exports.postProcessGQLValue)(data[i], model.ofType);
         }
     }
     return data;
 };
-exports.recursiveBufferToValue = recursiveBufferToValue;
-const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) => {
+exports.postProcessGQLValue = postProcessGQLValue;
+const getGQLResolverFunctions = (service, key, serviceKey, cfg) => {
     if (!service.method) {
         return {};
     }
     return service.method.reduce((obj, method) => {
+        var _a, _b, _c, _d;
+        if ((_b = (_a = cfg[serviceKey]) === null || _a === void 0 ? void 0 : _a.methods) === null || _b === void 0 ? void 0 : _b.blacklist) {
+            const blacklistMethods = (_d = (_c = cfg[serviceKey]) === null || _c === void 0 ? void 0 : _c.methods) === null || _d === void 0 ? void 0 : _d.blacklist;
+            if (blacklistMethods.includes(method.name)) {
+                return {};
+            }
+        }
         const typing = (0, registry_1.getTyping)(method.inputType);
         const outputTyping = (0, registry_1.getTyping)(method.outputType);
         if (!typing) {
@@ -182,7 +194,7 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
             const client = context[key].client;
             const service = client[serviceKey];
             try {
-                const converted = await (0, exports.recursiveUploadToBuffer)(args.input, typing.input);
+                const converted = await (0, exports.preprocessGQLInput)(args.input, typing.input);
                 const scope = (_a = args === null || args === void 0 ? void 0 : args.input) === null || _a === void 0 ? void 0 : _a.scope;
                 let req = typing.processor.fromPartial(converted);
                 // convert enum strings to integers
@@ -214,7 +226,8 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
                     }
                 }
                 const rawResult = await service[realMethod](req);
-                const result = (0, exports.recursiveBufferToValue)(rawResult, outputTyping.output);
+                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);
                 if (result instanceof stream.Readable) {
                     let operationStatus = { code: 0, message: '' };
@@ -378,10 +391,16 @@ const generateResolver = (...namespaces) => {
 };
 exports.generateResolver = generateResolver;
 const namespaceResolverSchemaRegistry = new Map();
-const registerResolverSchema = (namespace, name, schema, mutation = false, subspace = undefined) => {
+const registerResolverSchema = (namespace, name, schema, mutation = false, subspace = undefined, config) => {
     if (!namespaceResolverSchemaRegistry.has(namespace)) {
         namespaceResolverSchemaRegistry.set(namespace, new Map());
     }
+    if (subspace && config[subspace]) {
+        const blacklistMethods = config[subspace].methods.blacklist;
+        if (blacklistMethods.includes(name)) {
+            return;
+        }
+    }
     if (!namespaceResolverSchemaRegistry.get(namespace).has(mutation)) {
         namespaceResolverSchemaRegistry.get(namespace).set(mutation, new Map());
     }
@@ -477,12 +496,13 @@ const generateSchema = (setup) => {
     return new graphql_1.GraphQLSchema(config);
 };
 exports.generateSchema = generateSchema;
-const getWhitelistBlacklistConfig = (metaService, queries, config) => {
+const getWhitelistBlacklistConfig = (metaService, queries, config, entity) => {
+    var _a, _b, _c, _d;
     const mut = new Set(metaService.method.map(m => m.name).filter(key => queries.indexOf(key) < 0));
     const que = new Set(metaService.method.map(m => m.name).filter(key => queries.indexOf(key) >= 0));
-    if (config.methods) {
-        if (config.methods.whitelist) {
-            const whitelist = new Set(config.methods.whitelist);
+    if (config[entity]) {
+        if ((_b = (_a = config[entity]) === null || _a === void 0 ? void 0 : _a.methods) === null || _b === void 0 ? void 0 : _b.whitelist) {
+            const whitelist = new Set(config[entity].methods.whitelist);
             mut.forEach(key => {
                 if (whitelist.has(key)) {
                     whitelist.delete(key);
@@ -504,8 +524,8 @@ const getWhitelistBlacklistConfig = (metaService, queries, config) => {
                 console.error('Whitelist contains undefined methods:', whitelist);
             }
         }
-        else if (config.methods.blacklist) {
-            const blacklist = new Set(config.methods.blacklist);
+        else if ((_d = (_c = config[entity]) === null || _c === void 0 ? void 0 : _c.methods) === null || _d === void 0 ? void 0 : _d.blacklist) {
+            const blacklist = new Set(config[entity].methods.blacklist);
             mut.forEach(key => {
                 if (blacklist.has(key)) {
                     blacklist.delete(key);
@@ -534,17 +554,17 @@ const getWhitelistBlacklistConfig = (metaService, queries, config) => {
 };
 exports.getWhitelistBlacklistConfig = getWhitelistBlacklistConfig;
 const getAndGenerateSchema = (service, namespace, prefix, cfg, queryList) => {
-    const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(service, queryList, cfg);
+    const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(service, queryList, cfg, service.name);
     const schemas = (0, exports.getGQLSchemas)(service);
     Object.keys(schemas).forEach(key => {
-        (0, exports.registerResolverSchema)(namespace, key, schemas[key], !queries.has(key) && mutations.has(key));
+        (0, exports.registerResolverSchema)(namespace, key, schemas[key], !queries.has(key) && mutations.has(key), undefined, cfg);
     });
     return (0, exports.generateSchema)([{ prefix, namespace }]);
 };
 exports.getAndGenerateSchema = getAndGenerateSchema;
 const getAndGenerateResolvers = (service, namespace, cfg, queryList, subspace = undefined, serviceKey = undefined) => {
-    const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(service, queryList, cfg);
-    const func = (0, exports.getGQLResolverFunctions)(service, namespace, serviceKey || subspace || namespace, cfg.client);
+    const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(service, queryList, cfg, service.name);
+    const func = (0, exports.getGQLResolverFunctions)(service, namespace, serviceKey || subspace || namespace, cfg);
     Object.keys(func).forEach(k => {
         (0, exports.registerResolverFunction)(namespace, k, func[k], !queries.has(k) && mutations.has(k), subspace, service);
     });
@@ -553,10 +573,10 @@ const getAndGenerateResolvers = (service, namespace, cfg, queryList, subspace =
 exports.getAndGenerateResolvers = getAndGenerateResolvers;
 const generateSubServiceSchemas = (subServices, config, namespace, prefix) => {
     subServices.forEach((sub) => {
-        const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(sub.service, sub.queries, config);
+        const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(sub.service, sub.queries, config, sub.name);
         const schemas = (0, exports.getGQLSchemas)(sub.service);
         Object.keys(schemas).forEach(key => {
-            (0, exports.registerResolverSchema)(config.root ? sub.name : namespace, key, schemas[key], !queries.has(key) && mutations.has(key), config.root ? undefined : sub.name);
+            (0, exports.registerResolverSchema)(config.root ? sub.name : namespace, key, schemas[key], !queries.has(key) && mutations.has(key), config.root ? undefined : sub.name, config);
         });
     });
     if (config.root) {
@@ -570,8 +590,8 @@ const generateSubServiceSchemas = (subServices, config, namespace, prefix) => {
 exports.generateSubServiceSchemas = generateSubServiceSchemas;
 const generateSubServiceResolvers = (subServices, config, namespace) => {
     subServices.forEach((sub) => {
-        const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(sub.service, sub.queries, config);
-        const func = (0, exports.getGQLResolverFunctions)(sub.service, namespace, sub.name || namespace, config.client);
+        const { mutations, queries } = (0, exports.getWhitelistBlacklistConfig)(sub.service, sub.queries, config, sub.name);
+        const func = (0, exports.getGQLResolverFunctions)(sub.service, namespace, sub.name || namespace, config);
         Object.keys(func).forEach(k => {
             const regNamespace = config.root ? sub.name : namespace;
             const regSubspace = config.root ? undefined : sub.name;

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

@@ -1,10 +1,10 @@
 import { GraphQLEnumTypeConfig, GraphQLInputObjectTypeConfig, GraphQLObjectType, GraphQLObjectTypeConfig } from "graphql";
-import { GraphQLEnumType, GraphQLInputObjectType } from "graphql/type/definition";
+import { GraphQLEnumType, GraphQLInputObjectType, GraphQLScalarType } from "graphql/type/definition";
 import { ProtoMetadata } from "./types";
 import { DescriptorProto, EnumDescriptorProto, MethodDescriptorProto } from "ts-proto-descriptors";
 export interface TypingData {
-    output: GraphQLObjectType | GraphQLEnumType;
-    input: GraphQLInputObjectType | GraphQLEnumType;
+    output: GraphQLObjectType | GraphQLEnumType | GraphQLScalarType;
+    input: GraphQLInputObjectType | GraphQLEnumType | GraphQLScalarType;
     meta: DescriptorProto | EnumDescriptorProto;
     processor?: any;
 }

package/dist/gql/protos/registry.js

@@ -33,7 +33,22 @@ exports.IGoogleProtobufAny = new definition_1.GraphQLInputObjectType({
     name: 'IGoogleProtobufAny',
     fields: protobufAnyFields
 });
+const DateTime = new definition_1.GraphQLScalarType({
+    name: 'DateTime',
+    description: `A date-time string at UTC, such as 2007-12-03T10:15:30Z, 
+                compliant with the date-time format outlined in section 5.6 of 
+                the RFC 3339 profile of the ISO 8601 standard for representation
+                of dates and times using the Gregorian calendar.`,
+});
+const IDateTime = new definition_1.GraphQLScalarType({
+    name: 'IDateTime',
+    description: `A date-time string at UTC, such as 2007-12-03T10:15:30Z, 
+                compliant with the date-time format outlined in section 5.6 of 
+                the RFC 3339 profile of the ISO 8601 standard for representation
+                of dates and times using the Gregorian calendar.`,
+});
 const googleProtobufAnyName = '.google.protobuf.Any';
+const googleProtobufTimestampName = '.google.protobuf.Timestamp';
 const Mutate = ['Create', 'Update', 'Upsert'];
 const CRUD_TRAVERSAL_OP_NAMES = ['Cretae', 'Update', 'Upsert', 'Delete', 'Read', 'Traversal'];
 const TodoScalar = new definition_1.GraphQLScalarType({
@@ -164,6 +179,14 @@ const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
             meta: message
         });
     }
+    if (type === googleProtobufTimestampName) {
+        typeNameAndNameSpaceMapping.set(DateTime.name, type);
+        exports.registeredTypings.set(type, {
+            output: DateTime,
+            input: IDateTime,
+            meta: message
+        });
+    }
     if (exports.registeredTypings.has(type)) {
         // TODO Log debug "Typings for object are already registered"
         return;
@@ -280,6 +303,14 @@ const resolveMeta = (key, field, rootObjType, objName, input) => {
                 result = GoogleProtobufAny;
                 break;
             }
+            if (objType === googleProtobufTimestampName) {
+                if (input) {
+                    result = IDateTime;
+                    break;
+                }
+                result = DateTime;
+                break;
+            }
             if (!exports.registeredTypings.has(objType)) {
                 throw new Error("Typing '" + objType + "' not registered for key '" + key + "' in object: " + objName);
             }

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

@@ -8,13 +8,16 @@ export interface ProtoMetadata {
     };
     dependencies?: ProtoMetadata[];
 }
-export interface MethodConfig {
+export interface BlackListWhiteListConfig {
     whitelist?: string[];
     blacklist?: string[];
 }
+export interface MethodConfig {
+    methods?: BlackListWhiteListConfig;
+}
 export interface ServiceConfig {
     client: GrpcClientConfig;
-    methods?: MethodConfig;
+    [key: string]: any;
 }
 export interface SubSpaceServiceConfig extends ServiceConfig {
     root: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.3.13",
+  "version": "0.3.16",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "@restorecommerce/grpc-client": "^0.3.1",
     "@restorecommerce/kafka-client": "^0.3.1",
     "@restorecommerce/logger": "^0.12.1",
-    "@restorecommerce/rc-grpc-clients": "^0.4.4",
+    "@restorecommerce/rc-grpc-clients": "^0.4.5",
     "@restorecommerce/service-config": "^0.4.25",
     "apollo-server-core": "^3.6.3",
     "apollo-server-koa": "^3.6.3",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "971b655c0ca23f4d0a2ad9d4d8a697df575d4bf2"
+  "gitHead": "781c23f4dbe746909e90366dc22bfbfd97a7e10a"
 }