@webresto/graphql 1.3.7 → 1.3.8

package/src/graphql.ts

@@ -1,19 +1,19 @@
-import * as helper from '../lib/graphqlHelper';
-import getEmitter from "@webresto/core/libs/getEmitter";
+import * as helper from "../lib/graphqlHelper";
 import _ = require("lodash");
-import { additionalResolver } from './additionalResolvers';
+import { additionalResolver } from "./additionalResolvers";
+import *  as langParser from "accept-language-parser"
+import { ApolloServer } from "apollo-server-express";
+const fs = require("fs");
+const path = require("path");
+var i18nFactory = require('i18n-2');
 
-const { ApolloServer } = require('apollo-server-express');
-const fs = require('fs');
-const path = require('path');
-
-const { PubSub } = require('apollo-server');
+import { PubSub } from "apollo-server";
+import { GraphQLError, GraphQLFormattedError } from "graphql";
 const pubsub = new PubSub();
 sails.graphql = { pubsub };
-let server;
+let server: ApolloServer;
 
-const AdditionalResolvers: any = {
-}
+const AdditionalResolvers: any = {};
 
 export default {
   getPubsub: () => pubsub,
@@ -22,7 +22,7 @@ export default {
     _.merge(AdditionalResolvers, resolver);
   },
   init: async function () {
-    let resolversApiPath = path.resolve(__dirname, './resolvers');
+    let resolversApiPath = path.resolve(__dirname, "./resolvers");
     if (fs.existsSync(resolversApiPath)) {
       helper.addDirResolvers(resolversApiPath);
     }
@@ -34,9 +34,7 @@ export default {
     helper.addAllSailsModels();
 
     if (sails.config.restographql?.whiteListAutoGen)
-      helper.setWhiteList(
-        sails.config.restographql.whiteListAutoGen
-      );
+      helper.setWhiteList(sails.config.restographql.whiteListAutoGen);
 
     if (sails.config.restographql?.blackList)
       helper.addToBlackList(sails.config.restographql.blackList);
@@ -45,13 +43,12 @@ export default {
     _.merge(AdditionalResolvers, additionalResolver);
 
     helper.addType(`
-
     input Customer {
-      phone: Phone
+      phone: InputPhone
       mail: String
       name: String!
     }
-    input Phone {
+    input InputPhone {
       code: String!
       number: String!
       additionalNumber: String
@@ -70,11 +67,13 @@ export default {
       doorphone: String
     }
     type Message {
+      id: String
       title: String
       type: String
       message: String
     }
     type Action {
+      id: String
       type: String
       data: Json
     }
@@ -83,20 +82,66 @@ export default {
       message: Message
       action: Action
     }
+    type Response {
+      message: Message
+      action: Action
+    }
     type GetOrderResponse {
       order: Order
       customData: Json
     }
-    type Restrictions {
-      workTime: Json
-      periodPossibleForOrder: Json
-      timezone: Json
-      deliveryDescription: Json
-      minDeliveryTime: Json
+
+    type UserCustomField {
+      id: String
+      type: String
+      label: String
+      enum: [String]
+      description: String
+      required: Boolean
+      regex: String
     }
-    `);
 
 
+    type Phone {
+      code: String
+      number: String
+      additionalNumber: String
+    }    
+    type CaptchaJob {
+      id: String
+      task: String
+    }
+    type PromotionState {
+      type: String
+      message: String
+      state: Json
+    }
+
+    """Solved captcha"""
+    input Captcha {
+      "Captcha job ID"
+      id: String!
+      "Resolved captcha"
+      solution: String!
+    }
+
+    """Country"""
+    type Country {
+      phoneCode: String
+      iso: String
+      name: String
+      nativeCountryName: String
+      language: [String]
+      currency: String
+      currencySymbol: String
+      currencyISO: String
+      currencyUnit: String
+      currencyDenomination: Int
+      phoneMask: [String]
+      flag: String
+    }
+    `);
+
     // helper.addToBlackList(["createdAt", "updatedAt"]);
 
     // required root types for moduling schema
@@ -110,64 +155,169 @@ export default {
       type Subscription {
         _root: String
       }`);
-  
-      /**
-      * Discount fields global support
-      */
-      helper.addCustomField("Dish", "discountAmount: Float")
-      helper.addCustomField("Dish", "discountType: String")
-      helper.addCustomField("Dish", "oldPrice: Float")
-      helper.addCustomField("Group", "discount: String")
+
+    /**
+     * Discount fields global support
+     */
+    helper.addCustomField("Dish", "discountAmount: Float");
+    helper.addCustomField("Dish", "discountType: String");
+
+    /**
+     * @deprecated ??? 
+     */
+    helper.addCustomField("Dish", "oldPrice: Float");
+    
+    helper.addCustomField("Dish", "salePrice: Float");
+    helper.addCustomField("Group", "discount: String");
+
+    /**
+     * Types of complex order fields
+     */
+    helper.addType(`#graphql
+      type OrderDeliveryState {
+        "Time it will take for delivery"
+        deliveryTimeMinutes: Int
+        "If disabled, then delivery is not allowed and will be processed"
+        allowed: Boolean
+        "Cost of delivery"
+        cost: Float
+        "ID of the service that will be on the delivery receipt"
+        item: String
+        "Server message for current delivery"
+        message: String
+      }`
+    );
+    
+
+    helper.addToReplaceList("Order.delivery", "delivery: OrderDeliveryState");
+
+
 
     const { typeDefs, resolvers } = helper.getSchema();
 
-    getEmitter().on('core-order-after-count', 'graphql', function (order) {
+    emitter.on("core-order-after-count", "graphql", function (order) {
       pubsub.publish("order-changed", order);
     });
-    getEmitter().on("send-message", "graphql", function ({ orderId, message }) {
+    emitter.on("send-message", "graphql", function ({ orderId, message }) {
       pubsub.publish("message", { orderId, message });
     });
-    getEmitter().on("core-dish-after-update", "graphql", function (record) {
+    emitter.on("core-dish-after-update", "graphql", function (record) {
       pubsub.publish("dish-changed", record);
     });
-    getEmitter().on("core-maintenance-enabled", "graphql", function (record) {
+    emitter.on("core-maintenance-enabled", "graphql", function (record) {
       pubsub.publish("maintenance", record);
     });
-    getEmitter().on("core-maintenance-disabled", "graphql", function () {
+    emitter.on("core-maintenance-disabled", "graphql", function () {
       pubsub.publish("maintenance", null);
     });
-    
-    let apolloServer
+
+    let apolloServer: ApolloServer;
     try {
       apolloServer = new ApolloServer({
         typeDefs,
+        introspection: true,
+        playground: true,
         resolvers: [resolvers, AdditionalResolvers],
         subscriptions: {
           onConnect: (connectionParams, webSocket) => {
-            let exContext = {}
-              if (connectionParams) {
-                if (!connectionParams['authorization'] && connectionParams['Authorization'])
-                  connectionParams['authorization'] = connectionParams['Authorization'];
-                  
-                  exContext['connectionParams'] = connectionParams
-                }
-                exContext['pubsub'] = pubsub;
-                return exContext;
-              },
+            let exContext = {};
+
+            if (connectionParams) {
+
+              /**
+               * Authorization
+               */ 
+              if (!connectionParams["authorization"] && connectionParams["Authorization"]) {
+                connectionParams["authorization"] = connectionParams["Authorization"];
+              }
+
+              if (connectionParams["x-device-id"] || connectionParams["X-Device-Id"]) {
+                connectionParams["deviceId"] = connectionParams["x-device-id"] ? connectionParams["x-device-id"] : connectionParams["X-Device-Id"];
+              }
+              
+              exContext["connectionParams"] = connectionParams;
+
+              /**
+               * Accept-Language
+               */
+
+              connectionParams["locale"] = sails.config.i18n.defaultLocale
+              const acceptLanguge = connectionParams["Accept-Language"] ?? connectionParams["accept-language"] ?? false 
+              if(acceptLanguge){
+                connectionParams["locale"] = langParser.parse(acceptLanguge)[0]?.code ?? sails.config.i18n.defaultLocale
+              }
+              const i18n = new i18nFactory({...sails.config.i18n, directory: sails.config.i18n.localesDirectory, extension: ".json"})
+              i18n.setLocale(connectionParams["locale"]);
+              exContext["i18n"] = i18n;
+
+            }
+            exContext["pubsub"] = pubsub;
+            return exContext;
+          },
+        },
+        formatError: (error: GraphQLError) => {
+          const graphQLFormattedError: GraphQLFormattedError = {
+            message: `${error.path}: ${error.message}`,
+            ...process.env.NODE_ENV !== "production" && {
+              locations: error.extensions.exception.stacktrace, 
+              path: error.path
             },
-            context: async ({ req , connection}) => {
-              if (connection) {
-                return connection.context;
-              } else {
-                return { ...req };
+          }
+          return graphQLFormattedError;
+        },
+        context: ({ req, connection }) => {
+          if (connection && connection.context) {
+            return connection.context;
+          } else {
+            const headers = {};
+            if(req?.rawHeaders) {
+              for (let i = 0; i < req.rawHeaders.length; i += 2) {
+                const name = req.rawHeaders[i];
+                const value = req.rawHeaders[i + 1];
+                headers[name.toLowerCase()] = value;
               }
             }
-          });
+            if (headers["x-device-id"] || headers["X-Device-Id"]) {
+              headers["deviceId"] = headers["x-device-id"] ? headers["x-device-id"] : headers["X-Device-Id"];
+            }
+
+            if (!headers["authorization"] && headers["Authorization"]) {
+              headers["authorization"] = headers["Authorization"];
+            }
+
+            // set context locale
+            headers["locale"] = sails.config.i18n.defaultLocale
+            const acceptLanguge = headers["Accept-Language"] ?? headers["accept-language"] ?? false 
+            if(acceptLanguge){
+              headers["locale"] = (langParser.parse(acceptLanguge))[0]?.code ?? sails.config.i18n.defaultLocale
+            }
+
+            const i18n = new i18nFactory({...sails.config.i18n, directory: sails.config.i18n.localesDirectory, extension: ".json"})
+            i18n.setLocale(headers["locale"]);
+            return { ...req, connectionParams: headers, i18n: i18n };
+          }
+        },
+      });
     } catch (error) {
-      console.error("GraphQL start error: ", error)
-    }
+      if (error.locations && error.locations[0].line) {
+        typeDefs.split("\n").forEach((item, i) => {
+          if (Math.abs(error.locations[0].line - i) < 10) {
+            console.log(i, `|`, item);
+            if (error.locations[0].line - 1 === i) {
+              console.log("_______________");
+            }
+          }
+        });
+        console.log(
+          `ERROR LINE: ${error.locations[0].line} `,
+          typeDefs.split("\n", -1)[error.locations[0].line - 1]
+        );
+      }
 
+      console.error(JSON.stringify(error));
+      throw error;
+    }
     server = apolloServer;
     return apolloServer;
-  }
-}
+  },
+};

package/src/resolvers/bonusProgram.d.ts

@@ -0,0 +1,32 @@
+import UserBonusProgram from "@webresto/core/models/UserBonusProgram";
+declare const _default: {
+    Query: {
+        bonusProgram: {
+            def: string;
+            fn: (parent: any, args: any, context: any) => Promise<import("@webresto/core/models/BonusProgram").default[]>;
+        };
+    };
+    Mutation: {
+        userRegistrationInBonusProgram: {
+            def: string;
+            fn: (parent: any, payload: {
+                bonusProgramId: string;
+            }, context: {
+                connectionParams: {
+                    authorization: string;
+                };
+            }) => Promise<UserBonusProgram>;
+        };
+        userDeleteInBonusProgram: {
+            def: string;
+            fn: (parent: any, payload: {
+                bonusProgramId: string;
+            }, context: {
+                connectionParams: {
+                    authorization: string;
+                };
+            }) => Promise<boolean>;
+        };
+    };
+};
+export default _default;

package/src/resolvers/bonusProgram.js

@@ -0,0 +1,65 @@
+"use strict";
+// export interface SpendBonus {
+//   bonusProgramId: string
+//   amount: number
+//   adapter: string
+//   bonusProgramName: string
+// }
+Object.defineProperty(exports, "__esModule", { value: true });
+const jwt_1 = require("../../lib/jwt");
+exports.default = {
+    Query: {
+        bonusProgram: {
+            def: 'bonusProgramAlived(orderId: String): [BonusProgram]',
+            fn: async function (parent, args, context) {
+                const orderId = args.orderId;
+                try {
+                    if (orderId) {
+                        const order = await Order.findOne({ id: orderId });
+                        if (!order)
+                            throw `order not found`;
+                    }
+                    const data = await BonusProgram.getAvailable();
+                    await emitter.emit('graphql-return-bonus-program', orderId, data);
+                    return data;
+                }
+                catch (e) {
+                    sails.log.error(e);
+                    throw `${JSON.stringify(e)}`;
+                }
+            }
+        }
+    },
+    Mutation: {
+        // Authentication required
+        userRegistrationInBonusProgram: {
+            def: `#graphql
+        userRegistrationInBonusProgram(
+          bonusProgramId: String!
+        ): UserBonusProgram`,
+            fn: async (parent, payload, context) => {
+                const auth = await jwt_1.JWTAuth.verify(context.connectionParams.authorization);
+                let adapter = await BonusProgram.getAdapter(payload.bonusProgramId);
+                return await UserBonusProgram.registration(auth.userId, adapter.id);
+            }
+        },
+        // Authentication required
+        userDeleteInBonusProgram: {
+            def: `#graphql
+        userDeleteInBonusProgram(
+          bonusProgramId: String!
+        ): Boolean`,
+            fn: async (parent, payload, context) => {
+                const auth = await jwt_1.JWTAuth.verify(context.connectionParams.authorization);
+                let adapter = await BonusProgram.getAdapter(payload.bonusProgramId);
+                try {
+                    await UserBonusProgram.delete(auth.userId, adapter.id);
+                    return true;
+                }
+                catch (error) {
+                    throw `Error deleting user in bonus program`;
+                }
+            }
+        }
+    }
+};

package/src/resolvers/bonusProgram.ts

@@ -0,0 +1,79 @@
+// export interface SpendBonus {
+//   bonusProgramId: string
+//   amount: number
+//   adapter: string
+//   bonusProgramName: string
+// }
+
+import { JWTAuth } from "../../lib/jwt";
+import UserBonusProgram from "@webresto/core/models/UserBonusProgram";
+
+export default {
+    Query: {
+      bonusProgram: {
+            def: 'bonusProgramAlived(orderId: String): [BonusProgram]',
+            fn: async function (parent, args, context) {
+              const orderId = args.orderId;
+              try {
+                if (orderId) {
+                  const order = await Order.findOne({id: orderId});
+                  if(!order) throw `order not found`
+                }
+
+                const data = await BonusProgram.getAvailable();
+                await emitter.emit('graphql-return-bonus-program', orderId, data);
+                return data;
+              } catch (e) {
+                sails.log.error(e); 
+                throw `${JSON.stringify(e)}`
+              }
+            }
+        }
+    },
+    Mutation: {
+      // Authentication required
+      userRegistrationInBonusProgram: {
+        def: `#graphql
+        userRegistrationInBonusProgram(
+          bonusProgramId: String!
+        ): UserBonusProgram`,
+        fn: async (
+          parent: any,
+          payload: { bonusProgramId: string },
+          context: { connectionParams: { authorization: string } }
+        ): Promise<UserBonusProgram> => {
+
+          const auth = await JWTAuth.verify(
+            context.connectionParams.authorization
+          );
+          let adapter = await BonusProgram.getAdapter(payload.bonusProgramId);
+          
+          return await UserBonusProgram.registration(auth.userId, adapter.id);
+        }
+      },
+      // Authentication required
+      userDeleteInBonusProgram: {
+        def: `#graphql
+        userDeleteInBonusProgram(
+          bonusProgramId: String!
+        ): Boolean`,
+        fn: async (
+          parent: any,
+          payload: { bonusProgramId: string },
+          context: { connectionParams: { authorization: string } }
+        ): Promise<boolean> => {
+
+          const auth = await JWTAuth.verify(
+            context.connectionParams.authorization
+          );
+          let adapter = await BonusProgram.getAdapter(payload.bonusProgramId);
+          try {
+            await UserBonusProgram.delete(auth.userId, adapter.id);
+            return true
+          } catch (error) {
+            throw `Error deleting user in bonus program`
+          }
+        }
+      }
+    }
+}

package/src/resolvers/captcha.d.ts

@@ -0,0 +1,11 @@
+declare const _default: {
+    Query: {
+        captchaGetJob: {
+            def: string;
+            fn: (parent: any, args: {
+                label: string;
+            }, context: any, info: any) => Promise<import("@webresto/core/adapters/captcha/CaptchaAdapter").CaptchaJob>;
+        };
+    };
+};
+export default _default;

package/src/resolvers/captcha.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("@webresto/core/adapters/index");
+exports.default = {
+    Query: {
+        captchaGetJob: {
+            def: 'captchaGetJob(label: String): CaptchaJob',
+            fn: async (parent, args, context, info) => {
+                try {
+                    return (await index_1.Captcha.getAdapter()).getJob(args.label);
+                }
+                catch (error) {
+                    sails.log.error(error);
+                    throw error;
+                }
+            }
+        }
+    }
+};

package/src/resolvers/captcha.ts

@@ -0,0 +1,16 @@
+import { Captcha } from "@webresto/core/adapters/index"
+export default {
+  Query: {
+    captchaGetJob: {
+      def: 'captchaGetJob(label: String): CaptchaJob',
+      fn: async (parent: any, args: { label: string } , context: any, info: any) => {
+        try {
+          return (await Captcha.getAdapter()).getJob(args.label)
+        } catch (error) {
+          sails.log.error(error)
+          throw error
+        }
+      }
+    }
+  }
+}

package/src/resolvers/checkout.d.ts

@@ -1,36 +1,55 @@
+import { Action, Message } from "../../types/primitives";
+import Order from "@webresto/core/models/Order";
+type CheckResponse = {
+    order?: Order;
+    message: Message;
+    action?: Action;
+};
+import Address from "@webresto/core/interfaces/Address";
+import Customer from "@webresto/core/interfaces/Customer";
+import { SpendBonus } from "@webresto/core/interfaces/SpendBonus";
+interface InputOrderCheckout {
+    orderId: string;
+    paymentMethodId: string;
+    selfService?: boolean;
+    pickupPointId?: string;
+    address?: Address;
+    locationId: string;
+    customer: Customer;
+    date?: string;
+    personsCount?: number;
+    comment: string;
+    spendBonus: SpendBonus;
+    customData: {
+        [key: string]: string | number;
+    };
+}
 declare const _default: {
     Mutation: {
         checkOrder: {
             def: string;
-            fn: (parent: any, args: any, context: any) => Promise<void | {
-                message: any;
-                order: import("@webresto/core/models/Order").default;
-            } | {
-                message: {
-                    type: string;
-                    title: string;
-                    message: string;
-                };
-                order?: undefined;
-            }>;
+            fn: (parent: any, args: {
+                orderCheckout: InputOrderCheckout;
+            }, context: any) => Promise<CheckResponse>;
         };
         sendOrder: {
             def: string;
             fn: (parent: any, args: any, context: any) => Promise<{
-                order: import("@webresto/core/models/Order").default;
+                order: Order;
                 action: {
+                    deviceId: any;
                     type: string;
                     data: {
-                        redirectLink: string;
+                        link: string;
                     };
                 };
                 message?: undefined;
             } | {
-                order: import("@webresto/core/models/Order").default;
+                order: Order;
                 message: {
                     type: string;
-                    title: string;
-                    message: string;
+                    title: any;
+                    message: any;
                 };
                 action?: undefined;
             }>;