@webresto/graphql 1.4.2 → 1.4.3

package/lib/afterHook.js

@@ -14,12 +14,19 @@ async function default_1() {
             cache = null;
         });
         sails.on('lifted', async function () {
-            const graphServer = await graphql_1.default.init();
-            // inject middleware into express app
-            sails.hooks.http.app.use(graphServer.getMiddleware());
-            let layer = sails.hooks.http.app._router.stack.slice(-1)[0];
-            sails.hooks.http.app._router.stack.splice(1, 0, layer);
-            graphServer.installSubscriptionHandlers(sails.hooks.http.server);
+            try {
+                const graphServer = await graphql_1.default.init();
+                // inject middleware into express app
+                sails.hooks.http.app.use(graphServer.getMiddleware());
+                let layer = sails.hooks.http.app._router.stack.slice(-1)[0];
+                sails.hooks.http.app._router.stack.splice(1, 0, layer);
+                graphServer.installSubscriptionHandlers(sails.hooks.http.server);
+                sails.emit('graphql-middleware:loaded');
+            }
+            catch (error) {
+                sails.emit('graphql-middleware:error');
+                sails.log.error(error);
+            }
         });
         if (await Settings.get("JWT_SECRET") === undefined) {
             //@ts-ignore

package/lib/afterHook.ts

@@ -11,13 +11,19 @@ export default async function () {
       cache = null;
     });
     sails.on('lifted', async function (){
-      const graphServer = await graphql.init();
-
-      // inject middleware into express app
-      sails.hooks.http.app.use(graphServer.getMiddleware());
-      let layer = sails.hooks.http.app._router.stack.slice(-1)[0]
-      sails.hooks.http.app._router.stack.splice(1, 0, layer)
-      graphServer.installSubscriptionHandlers(sails.hooks.http.server);
+      try {
+        const graphServer = await graphql.init();
+  
+        // inject middleware into express app
+        sails.hooks.http.app.use(graphServer.getMiddleware());
+        let layer = sails.hooks.http.app._router.stack.slice(-1)[0]
+        sails.hooks.http.app._router.stack.splice(1, 0, layer)
+        graphServer.installSubscriptionHandlers(sails.hooks.http.server);
+        sails.emit('graphql-middleware:loaded');
+      } catch (error) {
+        sails.emit('graphql-middleware:error');
+        sails.log.error(error);      
+      }
     })
 
     if (await Settings.get("JWT_SECRET") === undefined) {

package/lib/helper/checkDeviceId.d.ts

@@ -0,0 +1 @@
+export default function checkDeviceId(context: any): void;

package/lib/helper/checkDeviceId.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function checkDeviceId(context) {
+    if (!context.connectionParams.deviceId) {
+        throw `Missed deviceId`;
+    }
+}
+exports.default = checkDeviceId;

package/lib/helper/checkDeviceId.ts

@@ -0,0 +1,5 @@
+export default function checkDeviceId(context: any): void {
+  if (!context.connectionParams.deviceId) {
+    throw `Missed deviceId`;
+  }
+}

package/package.json

@@ -68,5 +68,5 @@
     "test:js": "mocha test/bootstrap.js './test/{,!(fixture)/**}/*.test.js' --exit",
     "test:init": "cd ./test/fixture && npm i --no-package-lock --prefix ./ && cd -"
   },
-  "version": "1.4.2"
+  "version": "1.4.3"
 }

package/src/graphql.js

@@ -252,13 +252,12 @@ exports.default = {
                 },
                 formatError: (error) => {
                     const graphQLFormattedError = {
-                        message: `${error.path}: ${error.message}`,
-                        ...process.env.NODE_ENV !== "production" && {
-                            locations: error.extensions.exception.stacktrace,
-                            path: error.path
-                        },
+                        message: error.message,
+                        locations: process.env.NODE_ENV !== "production" ? error.locations ?? error.extensions.exception.stacktrace ?? null : null,
+                        path: error.path
                     };
-                    sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
+                    sails.log.error('GraphQL Error:', graphQLFormattedError);
+                    sails.log.error(error.locations ?? error.extensions.exception.stacktrace);
                     return graphQLFormattedError;
                 },
                 context: ({ req, connection }) => {

package/src/graphql.ts

@@ -255,15 +255,15 @@ export default {
             return exContext;
           },
         },
-        formatError: (error: GraphQLError) => {
+
+        formatError: (error) => {
           const graphQLFormattedError: GraphQLFormattedError = {
-            message: `${error.path}: ${error.message}`,
-            ...process.env.NODE_ENV !== "production" && {
-              locations: error.extensions.exception.stacktrace, 
+              message: error.message,
+              locations: process.env.NODE_ENV !== "production" ? error.locations ?? error.extensions.exception.stacktrace ?? null : null,
               path: error.path
-            },
-          }
-          sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
+          };
+          sails.log.error('GraphQL Error:', graphQLFormattedError);
+          sails.log.error(error.locations ?? error.extensions.exception.stacktrace)
           return graphQLFormattedError;
         },
         context: ({ req, connection }) => {

package/src/resolvers/checkout.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const eventHelper = __importStar(require("../../lib/eventHelper"));
 const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 const jwt_1 = require("../../lib/jwt");
+const checkDeviceId_1 = __importDefault(require("../../lib/helper/checkDeviceId"));
 graphqlHelper_1.default.addType(`#graphql    
   input InputOrderCheckout {
     orderId: String! 
@@ -60,9 +61,7 @@ exports.default = {
         checkOrder(orderCheckout: InputOrderCheckout): CheckResponse`,
             fn: async function (parent, args, context) {
                 let data = args.orderCheckout;
-                if (!context.connectionParams.deviceId) {
-                    throw `Missed deviceId`;
-                }
+                (0, checkDeviceId_1.default)(context);
                 // if (data.date) {
                 //     let date = moment(data.date)
                 //     if(!date.isValid()){
@@ -84,6 +83,7 @@ exports.default = {
                             message: context.i18n.__("Order with id %s not found", data.orderId),
                         });
                     }
+                    let address = null;
                     //@ts-ignore
                     if (data.selfService) {
                         isSelfService = true;
@@ -93,6 +93,19 @@ exports.default = {
                         order.pickupPoint = null;
                         if (!data.address && !data.locationId)
                             throw `Address is required for non self service orders`;
+                        address = {
+                            city: address.city || await Settings.use("city"),
+                            street: address.street,
+                            ...address.streetId && { streetId: address.streetId },
+                            home: address.home,
+                            ...address.housing && { housing: address.housing },
+                            ...address.apartment && { apartment: address.apartment },
+                            ...address.index && { index: address.index },
+                            ...address.entrance && { entrance: address.entrance },
+                            ...address.floor && { floor: address.floor },
+                            ...address.apartment && { apartment: address.apartment },
+                            ...address.comment && { comment: address.comment },
+                        };
                     }
                     if (order.state === "ORDER") {
                         message = eventHelper.sendMessage({
@@ -112,29 +125,18 @@ exports.default = {
                             });
                         }
                     }
-                    if (data.locationId) {
-                        var address = await UserLocation.findOne({ id: data.locationId });
-                        if (!address)
-                            throw `locationId not found`;
-                    }
-                    else {
-                        if (data.address) {
-                            var address = data.address;
+                    if (!isSelfService) {
+                        if (data.locationId) {
+                            address = await UserLocation.findOne({ id: data.locationId });
+                            if (!address)
+                                throw `locationId not found`;
+                        }
+                        else {
+                            if (data.address) {
+                                address = data.address;
+                            }
                         }
                     }
-                    address = {
-                        city: address.city || await Settings.use("city"),
-                        street: address.street,
-                        ...address.streetId && { streetId: address.streetId },
-                        home: address.home,
-                        ...address.housing && { housing: address.housing },
-                        ...address.apartment && { apartment: address.apartment },
-                        ...address.index && { index: address.index },
-                        ...address.entrance && { entrance: address.entrance },
-                        ...address.floor && { floor: address.floor },
-                        ...address.apartment && { apartment: address.apartment },
-                        ...address.comment && { comment: address.comment },
-                    };
                     order.personsCount = data.personsCount ? data.personsCount + "" : "";
                     if (data.comment)
                         order.comment = data.comment;
@@ -150,7 +152,7 @@ exports.default = {
                     if (context && context.connectionParams.authorization) {
                         userId = (await jwt_1.JWTAuth.verify(context.connectionParams.authorization)).userId;
                     }
-                    await Order.check({ id: order.id }, data.customer, isSelfService, data.address, data.paymentMethodId, userId, data.spendBonus !== undefined && userId !== null ? data.spendBonus : null);
+                    await Order.check({ id: order.id }, data.customer, isSelfService, isSelfService ? undefined : data.address, data.paymentMethodId, userId, data.spendBonus !== undefined && userId !== null ? data.spendBonus : null);
                     order = await Order.findOne(data.orderId);
                     if (order.state === "CHECKOUT" && shouldSendSucessMessage) {
                         message = {
@@ -239,9 +241,7 @@ exports.default = {
         sendOrder: {
             def: "sendOrder(orderId: String!): CheckResponse",
             fn: async function (parent, args, context) {
-                if (!context.connectionParams.deviceId) {
-                    throw `Missed deviceId`;
-                }
+                (0, checkDeviceId_1.default)(context);
                 let data = args;
                 var order = await Order.findOne({ id: data.orderId });
                 if (!order) {

package/src/resolvers/checkout.ts

@@ -13,21 +13,22 @@ import Address from "@webresto/core/interfaces/Address";
 import Customer from "@webresto/core/interfaces/Customer";
 import { SpendBonus } from "@webresto/core/interfaces/SpendBonus";
 import { JWTAuth } from "../../lib/jwt";
+import checkDeviceId from "../../lib/helper/checkDeviceId";
 
 
 interface InputOrderCheckout {
-  orderId: string 
-  paymentMethodId: string 
+  orderId: string
+  paymentMethodId: string
   selfService?: boolean
-  pickupPointId?: string 
+  pickupPointId?: string
   address?: Address
   locationId: string
-  customer: Customer 
+  customer: Customer
   date?: string
   personsCount?: number
   comment: string
   spendBonus: SpendBonus
-  customData:{[key: string]: string | number}
+  customData: { [key: string]: string | number }
 }
 
 graphqlHelper.addType(`#graphql    
@@ -66,9 +67,8 @@ export default {
       fn: async function (parent, args: { orderCheckout: InputOrderCheckout }, context): Promise<CheckResponse> {
         let data = args.orderCheckout;
 
-        if (!context.connectionParams.deviceId) {
-          throw `Missed deviceId`
-        }
+        checkDeviceId(context);
+
 
         // if (data.date) {
         //     let date = moment(data.date)
@@ -95,13 +95,30 @@ export default {
             });
           }
 
+          let address: Address = null;
+
           //@ts-ignore
           if (data.selfService) {
             isSelfService = true;
             order.pickupPoint = data.pickupPointId;
           } else {
             order.pickupPoint = null;
-            if(!data.address && !data.locationId) throw `Address is required for non self service orders`
+            if (!data.address && !data.locationId) throw `Address is required for non self service orders`
+
+            address = {
+              city: address.city || (await Settings.use("city") as string),
+              street: address.street,
+              ...address.streetId && { streetId: address.streetId },
+              home: address.home,
+              ...address.housing && { housing: address.housing },
+              ...address.apartment && { apartment: address.apartment },
+              ...address.index && { index: address.index },
+              ...address.entrance && { entrance: address.entrance },
+              ...address.floor && { floor: address.floor },
+              ...address.apartment && { apartment: address.apartment },
+              ...address.comment && { comment: address.comment },
+            }
+            
           }
 
           if (order.state === "ORDER") {
@@ -124,31 +141,18 @@ export default {
             }
           }
 
-
-          if (data.locationId) {
-            var address: Address = await UserLocation.findOne({id: data.locationId}) as Address;
-            if (!address) throw `locationId not found`
-          } else {
-            if (data.address) {
-              var address: Address = data.address;
+          if(!isSelfService){
+            if (data.locationId) {
+              address = await UserLocation.findOne({ id: data.locationId }) as Address;
+              if (!address) throw `locationId not found`
+            } else {
+              if (data.address) {
+                address = data.address;
+              }
             }
           }
-          
-          address = {
-            city: address.city || (await Settings.use("city") as string),
-            street: address.street,
-            ...address.streetId && {streetId: address.streetId},
-            home: address.home,
-            ...address.housing && {housing: address.housing},
-            ...address.apartment && {apartment: address.apartment},
-            ...address.index && {index: address.index},
-            ...address.entrance && {entrance: address.entrance},
-            ...address.floor && {floor: address.floor},
-            ...address.apartment && {apartment: address.apartment},
-            ...address.comment && {comment: address.comment},
-          }
 
-          order.personsCount =  data.personsCount ? data.personsCount+"" : "";
+          order.personsCount = data.personsCount ? data.personsCount + "" : "";
           if (data.comment) order.comment = data.comment;
 
           order.date = data.date;
@@ -167,17 +171,17 @@ export default {
           }
 
           await Order.check(
-            {id: order.id},
+            { id: order.id },
             data.customer,
             isSelfService,
-            data.address,
+            isSelfService ? undefined : data.address,
             data.paymentMethodId,
             userId,
             data.spendBonus !== undefined && userId !== null ? data.spendBonus : null
           );
 
           order = await Order.findOne(data.orderId);
-          
+
           if (order.state === "CHECKOUT" && shouldSendSucessMessage) {
             message = {
               deviceId: context.connectionParams.deviceId,
@@ -201,13 +205,13 @@ export default {
             }
           }
 
-          if(message){
+          if (message) {
             eventHelper.sendMessage(message);
           }
 
-          return { 
-            order: order, 
-           ...message && { message: message } 
+          return {
+            order: order,
+            ...message && { message: message }
           };
         } catch (e) {
           let message = {
@@ -232,11 +236,11 @@ export default {
           } else if (e.code === 8) {
             message.message = context.i18n.__("The payment system is not available");
           } else if (e.code === 11) {
-            message.message = context.i18n.__(order.delivery.message) ;
+            message.message = context.i18n.__(order.delivery.message);
           } else if (e.code === 10) {
             message.message = context.i18n.__("The date of execution of the order is not true");
           } else if (e.code === 15) {
-              message.message = context.i18n.__("Ordering for a date in the past is not possible");
+            message.message = context.i18n.__("Ordering for a date in the past is not possible");
           } else {
             message.message = e.error
               ? e.error
@@ -246,9 +250,9 @@ export default {
           order = await Order.findOne(data.orderId);
           sails.log.error(e)
           eventHelper.sendMessage(message);
-          return { 
+          return {
             order: order,
-            message: message 
+            message: message
           };
         }
       },
@@ -256,65 +260,63 @@ export default {
     sendOrder: {
       def: "sendOrder(orderId: String!): CheckResponse",
       fn: async function (parent, args, context) {
-        if (!context.connectionParams.deviceId) {
-            throw `Missed deviceId`;
-        }
+        checkDeviceId(context);
         let data = args;
-        
+
         var order = await Order.findOne({ id: data.orderId });
         if (!order) {
-            const errorMessage = context.i18n.__(`Order with id %s not found`, data.orderId);
-            eventHelper.sendMessage({
-                deviceId: context.connectionParams.deviceId,
-                type: "error",
-                title: context.i18n.__("Order not found"),
-                message: errorMessage,
-            });
-            sails.log.error(`${errorMessage}`);
-            throw new Error(errorMessage);
+          const errorMessage = context.i18n.__(`Order with id %s not found`, data.orderId);
+          eventHelper.sendMessage({
+            deviceId: context.connectionParams.deviceId,
+            type: "error",
+            title: context.i18n.__("Order not found"),
+            message: errorMessage,
+          });
+          sails.log.error(`${errorMessage}`);
+          throw new Error(errorMessage);
         }
         if (!order.isPaymentPromise) {
-            try {
-                let paymentResponse = await Order.payment({ id: order.id });
-                const action = {
-                    deviceId: context.connectionParams.deviceId,
-                    type: "Redirect",
-                    data: {
-                        link: paymentResponse.redirectLink,
-                    },
-                };
-                eventHelper.sendAction(action);
-                order = await Order.populate({ id: order.id });
-                return { order: order, action: action };
-            }
-            catch (e) {
-                eventHelper.sendMessage({
-                    deviceId: context.connectionParams.deviceId,
-                    type: "error",
-                    title: context.i18n.__("Error"),
-                    message: context.i18n.__("The payment of the payment has ended unsuccessfully"),
-                });
-                const error = `External payment: ${e}`
-                sails.log.error(error);
-                throw new Error(error);
-            }
+          try {
+            let paymentResponse = await Order.payment({ id: order.id });
+            const action = {
+              deviceId: context.connectionParams.deviceId,
+              type: "Redirect",
+              data: {
+                link: paymentResponse.redirectLink,
+              },
+            };
+            eventHelper.sendAction(action);
+            order = await Order.populate({ id: order.id });
+            return { order: order, action: action };
+          }
+          catch (e) {
+            eventHelper.sendMessage({
+              deviceId: context.connectionParams.deviceId,
+              type: "error",
+              title: context.i18n.__("Error"),
+              message: context.i18n.__("The payment of the payment has ended unsuccessfully"),
+            });
+            const error = `External payment: ${e}`
+            sails.log.error(error);
+            throw new Error(error);
+          }
         }
 
         try {
-            await Order.order({ id: order.id });
-            order = await Order.findOne({ id: data.orderId });
-            const message = {
-                type: "info",
-                title: context.i18n.__("Successfully"),
-                message: context.i18n.__("Your order is accepted for processing"),
-            };
-            // eventHelper.sendMessage(message);
-            return { order: order, message: message };
+          await Order.order({ id: order.id });
+          order = await Order.findOne({ id: data.orderId });
+          const message = {
+            type: "info",
+            title: context.i18n.__("Successfully"),
+            message: context.i18n.__("Your order is accepted for processing"),
+          };
+          // eventHelper.sendMessage(message);
+          return { order: order, message: message };
         }
         catch (e) {
-            const error = `Order finalize error:, ${e}`
-            sails.log.error(error);
-            throw new Error(error);
+          const error = `Order finalize error:, ${e}`
+          sails.log.error(error);
+          throw new Error(error);
         }
       },
     },

package/src/resolvers/order.js

@@ -9,6 +9,7 @@ const graphqlHelper_1 = require("@webresto/graphql/lib/graphqlHelper");
 (0, graphqlHelper_1.addToReplaceList)("Order.promotionState", "promotionState: [PromotionState]");
 (0, graphqlHelper_1.addToReplaceList)("Order.pickupPoint", "pickupPoint: PickupPoint");
 const graphqlHelper_2 = __importDefault(require("../../lib/graphqlHelper"));
+const checkDeviceId_1 = __importDefault(require("../../lib/helper/checkDeviceId"));
 graphqlHelper_2.default.addType(`#graphql    
   input InputOrderUpdate {
     id: String!
@@ -330,9 +331,7 @@ exports.default = {
 };
 // Generate new cart
 async function getNewCart(context, orderId) {
-    if (!context.connectionParams.deviceId) {
-        throw `Missed deviceId`;
-    }
+    (0, checkDeviceId_1.default)(context);
     let userId = null;
     if (context && context.connectionParams.authorization) {
         userId = (await jwt_1.JWTAuth.verify(context.connectionParams.authorization)).userId;

package/src/resolvers/order.ts

@@ -7,6 +7,7 @@ import { addToReplaceList } from "@webresto/graphql/lib/graphqlHelper";
 addToReplaceList("Order.promotionState", "promotionState: [PromotionState]");
 addToReplaceList("Order.pickupPoint", "pickupPoint: PickupPoint");
 import graphqlHelper from "../../lib/graphqlHelper";
+import checkDeviceId from "../../lib/helper/checkDeviceId";
 
 graphqlHelper.addType(`#graphql    
   input InputOrderUpdate {
@@ -410,9 +411,8 @@ export default {
 // Generate new cart
 async function getNewCart(context?: any, orderId?: string) {
 
-  if (!context.connectionParams.deviceId) {
-    throw `Missed deviceId`
-  }
+  checkDeviceId(context);
+
 
   let userId = null;
   if (context && context.connectionParams.authorization) {

package/src/resolvers/subscriptions.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const apollo_server_1 = require("apollo-server");
+const checkDeviceId_1 = __importDefault(require("../../lib/helper/checkDeviceId"));
 exports.default = {
     Subscription: {
         order: {
@@ -13,9 +17,7 @@ exports.default = {
                     if (args.deviceId) {
                         context.connectionParams.deviceId = args.deviceId;
                     }
-                    if (!context.connectionParams.deviceId) {
-                        throw `Missed deviceId`;
-                    }
+                    (0, checkDeviceId_1.default)(context);
                     return context.pubsub.asyncIterator('order-changed');
                 }, (payload, query, context, info) => {
                     return payload.deviceId === context.connectionParams.deviceId;
@@ -36,9 +38,7 @@ exports.default = {
                     if (args.deviceId) {
                         context.connectionParams.deviceId = args.deviceId;
                     }
-                    if (!context.connectionParams.deviceId) {
-                        throw `Missed deviceId`;
-                    }
+                    (0, checkDeviceId_1.default)(context);
                     return context.pubsub.asyncIterator('message');
                 }, (payload, query, context, info) => {
                     console.log(payload.deviceId, context.connectionParams.deviceId);
@@ -59,9 +59,7 @@ exports.default = {
                     if (args.deviceId) {
                         context.connectionParams.deviceId = args.deviceId;
                     }
-                    if (!context.connectionParams.deviceId) {
-                        throw `Missed deviceId`;
-                    }
+                    (0, checkDeviceId_1.default)(context);
                     return context.pubsub.asyncIterator('action');
                 }, (payload, query, context, info) => {
                     console.log(payload.deviceId, context.connectionParams.deviceId);

package/src/resolvers/subscriptions.ts

@@ -1,4 +1,5 @@
 import { withFilter } from 'apollo-server';
+import checkDeviceId from '../../lib/helper/checkDeviceId';
 
 export default {
   Subscription: {
@@ -10,13 +11,12 @@ export default {
       fn: {
         subscribe: withFilter(
           (rootValue, args, context, info) => {
-            if(args.deviceId) {
+            if (args.deviceId) {
               context.connectionParams.deviceId = args.deviceId;
             }
 
-            if (!context.connectionParams.deviceId) {
-              throw `Missed deviceId`
-            }
+            checkDeviceId(context);
+
 
             return context.pubsub.asyncIterator('order-changed')
           },
@@ -40,13 +40,12 @@ export default {
         subscribe: withFilter(
           (rootValue, args, context, info) => {
 
-            if(args.deviceId) {
+            if (args.deviceId) {
               context.connectionParams.deviceId = args.deviceId;
             }
 
-            if (!context.connectionParams.deviceId) {
-              throw `Missed deviceId`
-            }
+            checkDeviceId(context);
+
 
             return context.pubsub.asyncIterator('message')
           },
@@ -68,13 +67,12 @@ export default {
       fn: {
         subscribe: withFilter(
           (rootValue, args, context, info) => {
-            if(args.deviceId) {
+            if (args.deviceId) {
               context.connectionParams.deviceId = args.deviceId;
             }
-            
-            if (!context.connectionParams.deviceId) {
-              throw `Missed deviceId`
-            }
+
+            checkDeviceId(context);
+
 
             return context.pubsub.asyncIterator('action')
           },

package/src/resolvers/user.js

@@ -8,6 +8,7 @@ const jwt_1 = require("../../lib/jwt");
 const adapters_1 = require("@webresto/core/adapters");
 let captchaAdapter = adapters_1.Captcha.getAdapter();
 const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
+const checkDeviceId_1 = __importDefault(require("../../lib/helper/checkDeviceId"));
 graphqlHelper_1.default.addType(`#graphql    
   type UserResponse {
     user: User
@@ -67,9 +68,7 @@ exports.default = {
                 if (!payload.otp && !payload.password) {
                     throw `or Password or OTP required`;
                 }
-                if (!context.connectionParams.deviceId) {
-                    throw `Missed deviceId`;
-                }
+                (0, checkDeviceId_1.default)(context);
                 // Check phone TODO: move in User
                 if ((await Settings.get("LOGIN_FIELD")) === undefined ||
                     (await Settings.get("LOGIN_FIELD")) === "phone") {
@@ -133,9 +132,7 @@ exports.default = {
         captcha: Captcha! 
       ): UserResponse`,
             fn: async (parent, payload, context) => {
-                if (!context.connectionParams.deviceId) {
-                    throw `Missed deviceId`;
-                }
+                (0, checkDeviceId_1.default)(context);
                 // Check password policy
                 let passwordPolicy = (await Settings.get("PASSWORD_POLICY"));
                 if (!passwordPolicy)
@@ -214,9 +211,7 @@ exports.default = {
         captcha: Captcha!
       ): UserResponse`,
             fn: async (parent, payload, context, info) => {
-                if (!context.connectionParams.deviceId) {
-                    throw `Missed deviceId`;
-                }
+                (0, checkDeviceId_1.default)(context);
                 try {
                     if (!(await captchaAdapter).check(payload.captcha, `registration:${payload.login}`))
                         throw `bad captcha`;

package/src/resolvers/user.ts

@@ -8,6 +8,7 @@ import { Message, Action, Response } from "../../types/primitives";
 let captchaAdapter = Captcha.getAdapter();
 
 import graphqlHelper from "../../lib/graphqlHelper";
+import checkDeviceId from "../../lib/helper/checkDeviceId";
 
 // define UserResponse
 interface UserResponse extends Response {
@@ -117,9 +118,8 @@ export default {
           throw `or Password or OTP required`;
         }
 
-        if (!context.connectionParams.deviceId) {
-          throw `Missed deviceId`;
-        }
+        checkDeviceId(context);
+
 
         // Check phone TODO: move in User
         if (
@@ -210,9 +210,8 @@ export default {
         context: any
       ): Promise<UserResponse> => {
 
-        if (!context.connectionParams.deviceId) {
-          throw `Missed deviceId`
-        }
+        checkDeviceId(context);
+
 
         // Check password policy
         let passwordPolicy = (await Settings.get("PASSWORD_POLICY")) as
@@ -317,9 +316,8 @@ export default {
         context: any,
         info: any
       ): Promise<UserResponse> => {
-        if (!context.connectionParams.deviceId) {
-          throw `Missed deviceId`
-        }
+        checkDeviceId(context);
+
 
         try {
           if (
@@ -443,7 +441,7 @@ export default {
         payload: { deviceId: any },
         context: { connectionParams: { authorization: string }, i18n: any }
       ): Promise<Response> => {
-        
+
         const auth = await JWTAuth.verify(
           context.connectionParams.authorization
         );
@@ -562,8 +560,8 @@ export default {
           context.connectionParams.authorization
         );
 
-        let user = await User.updateOne({id: auth.userId}, payload.user)
-        
+        let user = await User.updateOne({ id: auth.userId }, payload.user)
+
         let message: Message = {
           deviceId: null,
           title: context.i18n.__("Success"),
@@ -607,7 +605,7 @@ export default {
           type: "info",
           message: context.i18n.__("The user will be deleted"),
         };
-        
+
         let action: Action = null
         // Here should be Emmiter for midificate Action And Message