@webresto/graphql 1.3.7 → 1.3.8

package/lib/jwt.d.ts

@@ -0,0 +1,10 @@
+type AuthData = {
+    userId: string;
+    deviceId: string;
+    sessionId: string;
+};
+export declare class JWTAuth {
+    static sign(authData: AuthData): string;
+    static verify(token: string): Promise<AuthData>;
+}
+export {};

package/lib/jwt.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JWTAuth = void 0;
+const jwt = require("jsonwebtoken");
+class JWTAuth {
+    static sign(authData) {
+        return jwt.sign({
+            data: authData
+        }, process.env.JWT_SECRET, { expiresIn: parseInt(process.env.JWT_TOKEN_EXPIRES_IN) ?? 15 * 24 * 60 * 60 });
+    }
+    static async verify(token) {
+        if (!token) {
+            throw `Verify JWT token is: ${token}`;
+        }
+        let decoded;
+        try {
+            let jwtData = (jwt.verify(token, process.env.JWT_SECRET));
+            decoded = jwtData.data;
+        }
+        catch (err) {
+            sails.log.error(`JWT verify error: `, err);
+            throw err;
+        }
+        if (decoded.userId && decoded.deviceId && decoded.sessionId) {
+            if (await User.findOne({ id: decoded.userId })) {
+                let device = await UserDevice.findOne({ where: { id: decoded.deviceId, user: decoded.userId, sessionId: decoded.sessionId } });
+                if (!device || device.isLogined !== true) {
+                    throw `Logined device not found`;
+                }
+                else {
+                    return decoded;
+                }
+            }
+            else {
+                throw `no user with id ${decoded.userId}`;
+            }
+        }
+        else {
+            throw `JWT decoded user or device not found`;
+        }
+    }
+}
+exports.JWTAuth = JWTAuth;

package/lib/jwt.ts

@@ -0,0 +1,61 @@
+import User from "@webresto/core/models/User"
+import UserDevice from "@webresto/core/models/UserDevice"
+
+import * as jwt from 'jsonwebtoken'
+
+
+
+// GEN SECRET
+type AuthData = {
+  userId: string
+  deviceId: string
+  sessionId: string
+}
+
+type JWTData = {
+  data: AuthData
+  iat: number
+  exp: number
+}
+
+
+export class JWTAuth {
+  public static sign(authData: AuthData): string {
+    return jwt.sign({
+      data: authData
+    }, process.env.JWT_SECRET, { expiresIn: parseInt(process.env.JWT_TOKEN_EXPIRES_IN) ?? 15 * 24 * 60 * 60 });
+    
+  }
+  
+  public static async verify(token: string): Promise<AuthData>{
+
+    if (!token) {
+      throw `Verify JWT token is: ${token}`
+    }
+    
+    let decoded: AuthData;
+    try {
+       let jwtData = (jwt.verify(token, process.env.JWT_SECRET)) as JWTData
+        decoded = jwtData.data
+    } catch(err) {
+      sails.log.error(`JWT verify error: `, err)
+      throw err
+    }
+
+    if(decoded.userId && decoded.deviceId && decoded.sessionId) {
+      if (await User.findOne({id: decoded.userId})) {
+
+        let device = await UserDevice.findOne({where: {id: decoded.deviceId, user: decoded.userId, sessionId: decoded.sessionId}});
+        if(!device || device.isLogined !== true) {
+          throw `Logined device not found`
+        } else {
+          return decoded;
+        }
+      } else {
+        throw `no user with id ${decoded.userId}`
+      }
+    } else {
+      throw `JWT decoded user or device not found`
+    }
+  }
+}

package/package.json

@@ -2,29 +2,36 @@
   "author": {
     "name": "Webresto"
   },
-  "bundleDependencies": false,
+  "bundleDependencies": [],
   "dependencies": {
+    "accept-language-parser": "^1.5.0",
     "apollo-fetch": "^0.7.0",
-    "apollo-server": "^2.25.2",
+    "apollo-server": "^2.26.1",
     "dataloader": "^2.0.0",
+    "fix-esm": "^1.0.1",
     "graphql": "^15.5.0",
+    "jsonwebtoken": "^9.0.0",
     "waterline-criteria": "^2.0.0"
   },
   "devDependencies": {
     "@42pub/typed-sails": "^1.0.0",
+    "@apollo/client": "^3.7.3",
+    "@types/accept-language-parser": "^1.5.3",
     "@types/bluebird": "^3.5.32",
     "@types/bluebird-global": "^3.5.12",
     "@types/body-parser": "^1.19.0",
     "@types/chai": "^4.2.11",
     "@types/express": "^4.17.7",
     "@types/faker": "^4.1.12",
+    "@types/jsonwebtoken": "^9.0.0",
     "@types/lodash": "^4.14.157",
     "@types/mocha": "^8.0.2",
     "@types/node": "^14.14.35",
-    "@types/uuid": "^8.0.0",
     "@types/waterline": "^0.13.4",
-    "@webresto/core": "^1.0.0",
+    "@webresto/core": "^1.3.27-alpha",
     "chai": "^4.2.0",
+    "cross-fetch": "^3.1.5",
+    "crypto-puzzle": "^4.0.0",
     "dotenv": "^16.0.0",
     "faker": "^4.1.0",
     "mocha": "^8.1.1",
@@ -56,9 +63,9 @@
   },
   "scripts": {
     "gendoc": "apidoc -o apidoc/ && apidoc-markdown2 -p apidoc -o docs/api.md",
-    "test": "mocha -r ts-node/register test/bootstrap.ts './test/{,!(fixture)/**}/*.test.ts' --exit",
+    "test": "mocha -r ts-node/register test/bootstrap.ts './test/{,!(fixture)/**}/*.test.ts' --exit --grep=${PATTERN}",
     "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.3.7"
+  "version": "1.3.8"
 }

package/src/additionalResolvers.d.ts

@@ -1,25 +1,88 @@
 export declare const additionalResolver: {
     GroupModifier: {
-        group: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        modifierId: (parent: {
+            modifierId?: string;
+            id?: string; /** here id means rmsID */
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
+        group: (parent: {
+            modifierId?: string;
+            id?: string; /** here id means rmsID */
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
     };
     Modifier: {
-        dish: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        modifierId: (parent: {
+            modifierId?: string;
+            id?: string; /** here id means rmsID */
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
+        dish: (parent: {
+            modifierId?: string;
+            id?: string; /** here id means rmsID */
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
     };
     OrderModifier: {
-        dish: (parent: any, args: any, context: any, info: any) => Promise<any>;
-        group: (parent: any, args: any) => Promise<any>;
+        dish: (parent: {
+            id: string;
+            modifierId: string;
+        }, args: any, context: any, info: any) => Promise<any>;
+        group: (parent: {
+            id: string;
+            groupId: string;
+        }, args: any) => Promise<any>;
     };
     Dish: {
-        parentGroup: (parent: any, args: any, context: any, info: any) => Promise<any>;
-        images: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        parentGroup: (parent: {
+            parentGroup: any;
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
+        images: (parent: {
+            id: any;
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
     };
     Group: {
-        parentGroup: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        parentGroup: (parent: {
+            parentGroup: any;
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
     };
     Order: {
-        dishes: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        dishes: (parent: {
+            dishes: any;
+            id: any;
+        }, args: any, context: any, info: any) => Promise<any>;
     };
     OrderDish: {
-        dish: (parent: any, args: any, context: any, info: any) => Promise<any>;
+        dish: (parent: {
+            dish: any;
+        }, args: any, context: {
+            dataloaders: WeakMap<object, any>;
+        }, info: {
+            fieldNodes: any;
+        }) => Promise<any>;
     };
 };

package/src/additionalResolvers.js

@@ -4,8 +4,29 @@ exports.additionalResolver = void 0;
 const DataLoader = require('dataloader');
 exports.additionalResolver = {
     GroupModifier: {
+        modifierId: async (parent, args, context, info) => {
+            if (parent.modifierId)
+                return parent.modifierId;
+            if (!context.dataloaders)
+                context.dataloaders = new WeakMap();
+            const dataloaders = context.dataloaders;
+            let dl = dataloaders.get(info.fieldNodes);
+            if (!dl) {
+                dl = new DataLoader(async (id) => {
+                    const rows = await Group.find({
+                        rmsId: id, isDeleted: false
+                    });
+                    const sortedInIdsOrder = id.map((id) => rows.find(x => {
+                        return x.rmsId === id;
+                    }));
+                    return sortedInIdsOrder;
+                });
+                dataloaders.set(info.fieldNodes, dl);
+            }
+            return (await dl.load(parent.id)).id;
+        },
         group: async (parent, args, context, info) => {
-            if (!parent.modifierId)
+            if (!parent.modifierId && !parent.id)
                 return;
             if (!context.dataloaders)
                 context.dataloaders = new WeakMap();
@@ -13,43 +34,85 @@ exports.additionalResolver = {
             let dl = dataloaders.get(info.fieldNodes);
             if (!dl) {
                 dl = new DataLoader(async (ids) => {
-                    const rows = await Group.find({ id: ids });
-                    const sortedInIdsOrder = ids.map(id => rows.find(x => x.id === id));
+                    const rows = await Group.find({
+                        where: {
+                            or: [{ id: ids, isDeleted: false }, { rmsId: ids, isDeleted: false }]
+                        }
+                    });
+                    const sortedInIdsOrder = ids.map((id) => rows.find(x => x.id === id));
                     return sortedInIdsOrder;
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
-            return dl.load(parent.modifierId);
-        },
+            return await dl.load(parent.modifierId ? parent.modifierId : parent.id);
+        }
     },
     Modifier: {
+        modifierId: async (parent, args, context, info) => {
+            if (parent.modifierId)
+                return parent.modifierId;
+            if (!context.dataloaders)
+                context.dataloaders = new WeakMap();
+            const dataloaders = context.dataloaders;
+            let dl = dataloaders.get(info.fieldNodes);
+            if (!dl) {
+                dl = new DataLoader(async (id) => {
+                    const rows = await Dish.find({
+                        rmsId: id, balance: { "!=": 0 }, isDeleted: false
+                    });
+                    const sortedInIdsOrder = id.map((id) => rows.find(x => {
+                        return x.rmsId === id;
+                    }));
+                    return sortedInIdsOrder;
+                });
+                dataloaders.set(info.fieldNodes, dl);
+            }
+            return (await dl.load(parent.id)).id;
+        },
         dish: async (parent, args, context, info) => {
-            if (!parent.modifierId)
+            if (!parent.modifierId && !parent.id)
                 return;
             if (!context.dataloaders)
                 context.dataloaders = new WeakMap();
             const dataloaders = context.dataloaders;
             let dl = dataloaders.get(info.fieldNodes);
             if (!dl) {
-                dl = new DataLoader(async (ids) => {
-                    const rows = await Dish.find({ id: ids, balance: { "!=": 0 }, isDeleted: false });
-                    const sortedInIdsOrder = ids.map(id => rows.find(x => x.id === id));
+                dl = new DataLoader(async (id) => {
+                    const rows = await Dish.find({ where: { or: [
+                                { id: id, balance: { "!=": 0 }, isDeleted: false },
+                                { rmsId: id, balance: { "!=": 0 }, isDeleted: false }
+                            ] }
+                    });
+                    const sortedInIdsOrder = id.map((id) => rows.find(x => {
+                        return x.id === id ? x.id === id : x.rmsId === id ? x.rmsId === id : false;
+                    }));
                     return sortedInIdsOrder;
                 });
-                // ложим инстанс дата-лоадера в WeakMap для повторного использования
                 dataloaders.set(info.fieldNodes, dl);
             }
-            // юзаем метод `load` из нашего дата-лоадера
-            return dl.load(parent.modifierId);
-            // return await Dish.findOne({id: parent.modifierId}).populateAll();
+            return await dl.load(parent.modifierId ? parent.modifierId : parent.id);
         }
     },
     OrderModifier: {
         dish: async (parent, args, context, info) => {
-            return (await Dish.find({ id: parent.id, balance: { "!=": 0 }, isDeleted: false }).populateAll())[0];
+            if (!parent.id && !parent.modifierId)
+                return null;
+            return (await Dish.find({ where: { or: [
+                        { id: parent.id, balance: { "!=": 0 }, isDeleted: false },
+                        { rmsId: parent.id, balance: { "!=": 0 }, isDeleted: false }
+                    ] }
+                // @ts-ignore //TODO: Deprecated populateAll 
+            }).populateAll())[0];
         },
         group: async (parent, args) => {
-            return (await Group.find({ id: parent.groupId, isDeleted: false }).populateAll())[0];
+            if (!parent.id && !parent.groupId)
+                return null;
+            return (await Group.find({ where: {
+                    or: [{ id: parent.groupId, isDeleted: false }, { rmsId: parent.id, isDeleted: false }]
+                }
+            }
+            // @ts-ignore //TODO: Deprecated populateAll 
+            ).populateAll())[0];
         }
     },
     Dish: {
@@ -65,14 +128,20 @@ exports.additionalResolver = {
             }
             let dl = dataloaders.get(info.fieldNodes);
             if (!dl) {
-                dl = new DataLoader(async (id) => {
-                    return await Group.find(id);
+                dl = new DataLoader(async (ids) => {
+                    // Waterline can return data not by ids array sorting
+                    return (await Group.find(ids)).sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id));
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
             return await dl.load(parent.parentGroup);
         },
         images: async (parent, args, context, info) => {
+            const sortImages = (images) => {
+                return images.sort((a, b) => {
+                    return (+new Date(b.uploadDate) - +new Date(a.uploadDate));
+                });
+            };
             if (!parent.id)
                 return;
             if (!context.dataloaders)
@@ -82,12 +151,12 @@ exports.additionalResolver = {
             if (!dl) {
                 dl = new DataLoader(async (ids) => {
                     const rows = await Dish.find({ id: ids }).populate('images');
-                    const images = ids.map(id => { var _a; return (_a = rows.find(x => x.id === id)) === null || _a === void 0 ? void 0 : _a.images; });
+                    const images = ids.map((id) => rows.find(x => x.id === id)?.images);
                     return images;
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
-            return await dl.load(parent.id);
+            return sortImages(await dl.load(parent.id));
         }
     },
     Group: {
@@ -103,8 +172,8 @@ exports.additionalResolver = {
             }
             let dl = dataloaders.get(info.fieldNodes);
             if (!dl) {
-                dl = new DataLoader(async (id) => {
-                    return await Group.find(id);
+                dl = new DataLoader(async (ids) => {
+                    return (await Group.find(ids)).sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id));
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
@@ -131,12 +200,12 @@ exports.additionalResolver = {
             }
             let dl = dataloaders.get(info.fieldNodes);
             if (!dl) {
-                dl = new DataLoader(async (dishId) => {
-                    return await Dish.find({ id: dishId }).sort('id ASC');
+                dl = new DataLoader(async (ids) => {
+                    return (await Dish.find(ids)).sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id));
                 });
                 dataloaders.set(info.fieldNodes, dl);
             }
             return await dl.load(parent.dish);
         },
-    },
+    }
 };