From 3a69225d86ada4be6f0447a3c7933630b9670013 Mon Sep 17 00:00:00 2001 From: najlase Date: Sun, 2 May 2021 21:47:54 +0100 Subject: [PATCH 01/19] init --- .gitignore | 33 ++ package-lock.json | 876 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 24 ++ 3 files changed, 933 insertions(+) create mode 100644 .gitignore create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..7d6826ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# Logs +logs +*.log + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directory +# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- +node_modules + +# Debug log from npm +npm-debug.log + +# OSX hidden files +.DS_Store diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..0e01b68b --- /dev/null +++ b/package-lock.json @@ -0,0 +1,876 @@ +{ + "name": "assignment-1", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "requires": { + "defer-to-connect": "^1.0.1" + } + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "ansi-align": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", + "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", + "requires": { + "string-width": "^3.0.0" + }, + "dependencies": { + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "boxen": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", + "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", + "requires": { + "ansi-align": "^3.0.0", + "camelcase": "^5.3.1", + "chalk": "^3.0.0", + "cli-boxes": "^2.2.0", + "string-width": "^4.1.0", + "term-size": "^2.1.0", + "type-fest": "^0.8.1", + "widest-line": "^3.1.0" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" + }, + "dependencies": { + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + } + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.3.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + }, + "cli-boxes": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "requires": { + "mimic-response": "^1.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "requires": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + } + }, + "crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" + }, + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "requires": { + "mimic-response": "^1.0.0" + } + }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + }, + "dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "requires": { + "is-obj": "^2.0.0" + } + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "escape-goat": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", + "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "global-dirs": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz", + "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==", + "requires": { + "ini": "1.3.7" + } + }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "requires": { + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + } + }, + "graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "has-yarn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", + "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" + }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=" + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "ini": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==" + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "requires": { + "ci-info": "^2.0.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-installed-globally": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", + "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "requires": { + "global-dirs": "^2.0.1", + "is-path-inside": "^3.0.1" + } + }, + "is-npm": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", + "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-yarn-global": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", + "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" + }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + }, + "keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "requires": { + "json-buffer": "3.0.0" + } + }, + "latest-version": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", + "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", + "requires": { + "package-json": "^6.3.0" + } + }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "nodemon": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz", + "integrity": "sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==", + "requires": { + "chokidar": "^3.2.2", + "debug": "^3.2.6", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.0.4", + "pstree.remy": "^1.1.7", + "semver": "^5.7.1", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.3", + "update-notifier": "^4.1.0" + } + }, + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", + "requires": { + "abbrev": "1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "p-cancelable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + }, + "package-json": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", + "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", + "requires": { + "got": "^9.6.0", + "registry-auth-token": "^4.0.0", + "registry-url": "^5.0.0", + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "picomatch": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==" + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + }, + "pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "pupa": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", + "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", + "requires": { + "escape-goat": "^2.0.0" + } + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + } + }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "requires": { + "picomatch": "^2.2.1" + } + }, + "registry-auth-token": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", + "requires": { + "rc": "^1.2.8" + } + }, + "registry-url": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", + "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", + "requires": { + "rc": "^1.2.8" + } + }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "requires": { + "lowercase-keys": "^1.0.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "semver-diff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", + "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", + "requires": { + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + }, + "term-size": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", + "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==" + }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "requires": { + "nopt": "~1.0.10" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } + }, + "undefsafe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz", + "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==", + "requires": { + "debug": "^2.2.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "requires": { + "crypto-random-string": "^2.0.0" + } + }, + "update-notifier": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", + "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", + "requires": { + "boxen": "^4.2.0", + "chalk": "^3.0.0", + "configstore": "^5.0.1", + "has-yarn": "^2.1.0", + "import-lazy": "^2.1.0", + "is-ci": "^2.0.0", + "is-installed-globally": "^0.3.1", + "is-npm": "^4.0.0", + "is-yarn-global": "^0.3.0", + "latest-version": "^5.0.0", + "pupa": "^2.0.1", + "semver-diff": "^3.1.1", + "xdg-basedir": "^4.0.0" + } + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "requires": { + "prepend-http": "^2.0.0" + } + }, + "widest-line": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", + "requires": { + "string-width": "^4.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..13769311 --- /dev/null +++ b/package.json @@ -0,0 +1,24 @@ +{ + "name": "assignment-1", + "version": "1.0.0", + "description": "In this Assignment You need to code your own server using ExpressJS.", + "main": "index.js", + "scripts": { + "start": "node index.js", + "start-dev": "nodemon", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/MedTech-CS425/Assignment-1.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/MedTech-CS425/Assignment-1/issues" + }, + "homepage": "https://github.com/MedTech-CS425/Assignment-1#readme", + "dependencies": { + "nodemon": "^2.0.7" + } +} From 0a92bfdb13dd894f2674f8dd7506099d8940e146 Mon Sep 17 00:00:00 2001 From: najlase Date: Sun, 2 May 2021 22:31:30 +0100 Subject: [PATCH 02/19] swagger --- index.js | 11 ++ package-lock.json | 487 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 5 +- 3 files changed, 502 insertions(+), 1 deletion(-) create mode 100644 index.js diff --git a/index.js b/index.js new file mode 100644 index 00000000..f37bbfb0 --- /dev/null +++ b/index.js @@ -0,0 +1,11 @@ +var express = require('express'); +var app = express(); +app.use(express.json()); +var swaggerUi = require('swagger-ui-express'); +var YAML = require('yamljs'); +const swaggerDocument = YAML.load('./api.yml'); +app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument)); + +app.listen(3000, ()=>{ + console.log("Listening on Port 3000"); +}) diff --git a/package-lock.json b/package-lock.json index 0e01b68b..a23f6142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,15 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -64,6 +73,19 @@ "picomatch": "^2.0.4" } }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -74,6 +96,38 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "boxen": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", @@ -106,6 +160,11 @@ "fill-range": "^7.0.1" } }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, "cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -228,6 +287,29 @@ "xdg-basedir": "^4.0.0" } }, + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", @@ -259,6 +341,16 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, "dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -272,11 +364,21 @@ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -290,6 +392,68 @@ "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -298,6 +462,50 @@ "to-regex-range": "^5.0.1" } }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -312,6 +520,19 @@ "pump": "^3.0.0" } }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -366,6 +587,33 @@ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", @@ -381,11 +629,30 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, "ini": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==" }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -500,6 +767,39 @@ } } }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==" + }, + "mime-types": { + "version": "2.1.30", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", + "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "requires": { + "mime-db": "1.47.0" + } + }, "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", @@ -523,6 +823,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, "nodemon": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz", @@ -558,6 +863,14 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -589,6 +902,21 @@ } } }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, "picomatch": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", @@ -599,6 +927,15 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, + "proxy-addr": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.1" + } + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -621,6 +958,27 @@ "escape-goat": "^2.0.0" } }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -664,6 +1022,16 @@ "lowercase-keys": "^1.0.0" } }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -684,11 +1052,79 @@ } } }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } + } + }, + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", @@ -745,6 +1181,19 @@ "has-flag": "^3.0.0" } }, + "swagger-ui-dist": { + "version": "3.48.0", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.48.0.tgz", + "integrity": "sha512-UgpKIQW5RAb4nYRG8B615blmQzct0DNuvtX4904Fe2aMWAVfWeKHKl4kwzFXuBJgr2WYWTwM1PnhZ+qqkLrpPg==" + }, + "swagger-ui-express": { + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.1.6.tgz", + "integrity": "sha512-Xs2BGGudvDBtL7RXcYtNvHsFtP1DBFPMJFRxHe5ez/VG/rzVOEjazJOOSc/kSCyxreCTKfJrII6MJlL9a6t8vw==", + "requires": { + "swagger-ui-dist": "^3.18.1" + } + }, "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -763,6 +1212,11 @@ "is-number": "^7.0.0" } }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", @@ -776,6 +1230,15 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -815,6 +1278,11 @@ "crypto-random-string": "^2.0.0" } }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, "update-notifier": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", @@ -843,6 +1311,16 @@ "prepend-http": "^2.0.0" } }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, "widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -871,6 +1349,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" + }, + "yamljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz", + "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==", + "requires": { + "argparse": "^1.0.7", + "glob": "^7.0.5" + } } } } diff --git a/package.json b/package.json index 13769311..25394714 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,9 @@ }, "homepage": "https://github.com/MedTech-CS425/Assignment-1#readme", "dependencies": { - "nodemon": "^2.0.7" + "express": "^4.17.1", + "nodemon": "^2.0.7", + "swagger-ui-express": "^4.1.6", + "yamljs": "^0.3.0" } } From 9d7f42f0e9ca186f79b5e8a5343297b2c360d8eb Mon Sep 17 00:00:00 2001 From: najlase Date: Mon, 3 May 2021 11:10:23 +0100 Subject: [PATCH 03/19] worked on models --- error.js | 6 ++++++ loginRequest.js | 6 ++++++ loginRespone.js | 6 ++++++ models/categoryModel.js | 21 +++++++++++++++++++++ models/itemModel.js | 30 ++++++++++++++++++++++++++++++ models/listArrayModel.js | 7 +++++++ models/listModel.js | 21 +++++++++++++++++++++ models/userModel.js | 18 ++++++++++++++++++ validationError.js | 7 +++++++ 9 files changed, 122 insertions(+) create mode 100644 error.js create mode 100644 loginRequest.js create mode 100644 loginRespone.js create mode 100644 models/categoryModel.js create mode 100644 models/itemModel.js create mode 100644 models/listArrayModel.js create mode 100644 models/listModel.js create mode 100644 models/userModel.js create mode 100644 validationError.js diff --git a/error.js b/error.js new file mode 100644 index 00000000..e2b43580 --- /dev/null +++ b/error.js @@ -0,0 +1,6 @@ +class Error { + constructor(status, message){ + this.status = status; + this.message = message; + } +} \ No newline at end of file diff --git a/loginRequest.js b/loginRequest.js new file mode 100644 index 00000000..49d4736f --- /dev/null +++ b/loginRequest.js @@ -0,0 +1,6 @@ +class loginRequest { + constructor(email, password) { + this.email = email; + this.password = password; + } +} \ No newline at end of file diff --git a/loginRespone.js b/loginRespone.js new file mode 100644 index 00000000..ada93d85 --- /dev/null +++ b/loginRespone.js @@ -0,0 +1,6 @@ +class loginResponse { + constructor(user, token) { + this.user = user; + this.token = token; + } + } \ No newline at end of file diff --git a/models/categoryModel.js b/models/categoryModel.js new file mode 100644 index 00000000..1c1e1b58 --- /dev/null +++ b/models/categoryModel.js @@ -0,0 +1,21 @@ +const mongoose = require('mongoose'); + +const CategorySchema = new mongoose.Schema({ + id: { + type: integer + }, + name: { + type: String + }, + userId: { + type: integer + }, + createdAt: { + type: String + }, + updatedAt: { + type: String + } +}); + +module.exports('Category', CategorySchema); \ No newline at end of file diff --git a/models/itemModel.js b/models/itemModel.js new file mode 100644 index 00000000..dfb6ffb6 --- /dev/null +++ b/models/itemModel.js @@ -0,0 +1,30 @@ +const mongoose = require('mongoose'); + +const ItemSchema = new mongoose.Schema({ + id: { + type: integer + }, + name: { + type: String + }, + categoryId: { + type: integer + }, + userId: { + type: integer + }, + note: { + type: String + }, + image: { + type: String + }, + createdAt: { + type: String + }, + updatedAt: { + type: String + } +}); + +module.exports('Item', ItemSchema); \ No newline at end of file diff --git a/models/listArrayModel.js b/models/listArrayModel.js new file mode 100644 index 00000000..423bdfca --- /dev/null +++ b/models/listArrayModel.js @@ -0,0 +1,7 @@ +const mongoose = require('mongoose'); + +const ListArraySchema = new mongoose.Schema({ + +}); + +module.exports('ListArray', ListArraySchema); \ No newline at end of file diff --git a/models/listModel.js b/models/listModel.js new file mode 100644 index 00000000..0892e072 --- /dev/null +++ b/models/listModel.js @@ -0,0 +1,21 @@ +const mongoose = require('mongoose'); + +const ListSchema = new mongoose.Schema({ +id: { + type: integer +}, +name: { + type: String +}, +userId: { //NAAMLOHA BY REFERENCE?? + type: integer +}, +createdAt: { + type: String +}, +updatedAt: { + type: String +} +}); + +module.exports('List', ListSchema); \ No newline at end of file diff --git a/models/userModel.js b/models/userModel.js new file mode 100644 index 00000000..76ae9b66 --- /dev/null +++ b/models/userModel.js @@ -0,0 +1,18 @@ +const mongoose = require('mongoose'); + +const UserSchema = new mongoose.Schema({ + email: { + type: String, + require: true + }, + password: { + type: String, + require: true + }, + userName: { + type: String, + require: true + } +}); + +module.exports('User', UserSchema); //USER TARJAA ALA CHKOUN? \ No newline at end of file diff --git a/validationError.js b/validationError.js new file mode 100644 index 00000000..3cf75e6c --- /dev/null +++ b/validationError.js @@ -0,0 +1,7 @@ +class validationError { + constructor(status, field, message) { + this.status = status; + this.field = field; + this.message = message; + } +} \ No newline at end of file From 008e13f95bde2843c76c31cc9e74587b0fef61a9 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 00:41:43 +0100 Subject: [PATCH 04/19] feat: worked on authentication and authorization --- error.js | 6 - index.js | 31 +- models/listArrayModel.js | 7 - models/listModel.js | 21 - package-lock.json | 616 ++++++++++++++++++ package.json | 3 + src/apis/authApi.js | 59 ++ src/consts/secret.js | 3 + src/middlewares/authMiddleware.js | 20 + .../models/entities}/categoryModel.js | 13 +- {models => src/models/entities}/itemModel.js | 17 +- src/models/entities/listModel.js | 18 + {models => src/models/entities}/userModel.js | 8 +- .../models/requests/loginRequest.js | 0 src/models/responses/error.js | 8 + .../models/responses/loginRespone.js | 0 src/models/responses/validationError.js | 9 + validationError.js | 7 - 18 files changed, 779 insertions(+), 67 deletions(-) delete mode 100644 error.js delete mode 100644 models/listArrayModel.js delete mode 100644 models/listModel.js create mode 100644 src/apis/authApi.js create mode 100644 src/consts/secret.js create mode 100644 src/middlewares/authMiddleware.js rename {models => src/models/entities}/categoryModel.js (53%) rename {models => src/models/entities}/itemModel.js (57%) create mode 100644 src/models/entities/listModel.js rename {models => src/models/entities}/userModel.js (62%) rename loginRequest.js => src/models/requests/loginRequest.js (100%) create mode 100644 src/models/responses/error.js rename loginRespone.js => src/models/responses/loginRespone.js (100%) create mode 100644 src/models/responses/validationError.js delete mode 100644 validationError.js diff --git a/error.js b/error.js deleted file mode 100644 index e2b43580..00000000 --- a/error.js +++ /dev/null @@ -1,6 +0,0 @@ -class Error { - constructor(status, message){ - this.status = status; - this.message = message; - } -} \ No newline at end of file diff --git a/index.js b/index.js index f37bbfb0..ece29c80 100644 --- a/index.js +++ b/index.js @@ -1,11 +1,34 @@ -var express = require('express'); -var app = express(); +const express = require('express'); +const app = express(); app.use(express.json()); -var swaggerUi = require('swagger-ui-express'); -var YAML = require('yamljs'); +const mongoose = require('mongoose'); +const authApi = require('./src/apis/authApi'); +const authMiddleware = require('./src/middlewares/authMiddleware'); +const Error = require('./src/models/responses/error'); +const swaggerUi = require('swagger-ui-express'); +const YAML = require('yamljs'); const swaggerDocument = YAML.load('./api.yml'); app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument)); +mongoose.connect("mongodb://localhost:27017/assignment-1", {useNewUrlParser: true, useUnifiedTopology: true}); + +mongoose.connection.on('error', function() { + console.error("Connection error"); +}) +mongoose.connection.once('open', function() { + console.log("Connection to DB established"); +}) + +app.post('/signup', authApi.signUp); + +app.post('/login', authApi.login); + +app.get('/getUser', authMiddleware.authorize , authApi.getUser); + +app.use((err, req, res, next) => { + res.status(500).json(new Error(err.message)); + }); + app.listen(3000, ()=>{ console.log("Listening on Port 3000"); }) diff --git a/models/listArrayModel.js b/models/listArrayModel.js deleted file mode 100644 index 423bdfca..00000000 --- a/models/listArrayModel.js +++ /dev/null @@ -1,7 +0,0 @@ -const mongoose = require('mongoose'); - -const ListArraySchema = new mongoose.Schema({ - -}); - -module.exports('ListArray', ListArraySchema); \ No newline at end of file diff --git a/models/listModel.js b/models/listModel.js deleted file mode 100644 index 0892e072..00000000 --- a/models/listModel.js +++ /dev/null @@ -1,21 +0,0 @@ -const mongoose = require('mongoose'); - -const ListSchema = new mongoose.Schema({ -id: { - type: integer -}, -name: { - type: String -}, -userId: { //NAAMLOHA BY REFERENCE?? - type: integer -}, -createdAt: { - type: String -}, -updatedAt: { - type: String -} -}); - -module.exports('List', ListSchema); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a23f6142..72927b77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,40 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@mapbox/node-pre-gyp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.4.tgz", + "integrity": "sha512-M669Qo4nRT7iDmQEjQYC7RU8Z6dpz9UmSbkJ1OFEja3uevCdLKh7IZZki7L1TZj02kRyl82snXFY8QqkyfowrQ==", + "requires": { + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.1", + "nopt": "^5.0.0", + "npmlog": "^4.1.2", + "rimraf": "^3.0.2", + "semver": "^7.3.4", + "tar": "^6.1.0" + }, + "dependencies": { + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -17,6 +51,28 @@ "defer-to-connect": "^1.0.1" } }, + "@types/bson": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.3.tgz", + "integrity": "sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==", + "requires": { + "@types/node": "*" + } + }, + "@types/mongodb": { + "version": "3.6.12", + "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.12.tgz", + "integrity": "sha512-49aEzQD5VdHPxyd5dRyQdqEveAg9LanwrH8RQipnMuulwzKmODXIZRp0umtxi1eBUfEusRkoy8AVOMr+kVuFog==", + "requires": { + "@types/bson": "*", + "@types/node": "*" + } + }, + "@types/node": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz", + "integrity": "sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -31,6 +87,29 @@ "negotiator": "0.6.2" } }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -73,6 +152,20 @@ "picomatch": "^2.0.4" } }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -91,11 +184,34 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "bcrypt": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", + "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.0", + "node-addon-api": "^3.1.0" + } + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, + "bl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -160,6 +276,16 @@ "fill-range": "^7.0.1" } }, + "bson": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz", + "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==" + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -238,6 +364,11 @@ "readdirp": "~3.5.0" } }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -256,6 +387,11 @@ "mimic-response": "^1.0.0" } }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -287,6 +423,11 @@ "xdg-basedir": "^4.0.0" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -310,6 +451,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", @@ -341,6 +487,16 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "denque": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz", + "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -351,6 +507,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -364,6 +525,14 @@ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -501,6 +670,14 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -512,6 +689,54 @@ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -577,6 +802,11 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", @@ -606,6 +836,30 @@ } } }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -726,11 +980,57 @@ "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + } + }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "kareem": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.2.tgz", + "integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ==" + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -747,11 +1047,54 @@ "package-json": "^6.3.0" } }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -772,6 +1115,12 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -818,6 +1167,109 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "minipass": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", + "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "mongodb": { + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.6.tgz", + "integrity": "sha512-WlirMiuV1UPbej5JeCMqE93JRfZ/ZzqE7nJTwP85XzjAF4rRSeq2bGCb1cjfoHLOF06+HxADaPGqT0g3SbVT1w==", + "requires": { + "bl": "^2.2.1", + "bson": "^1.1.4", + "denque": "^1.4.1", + "optional-require": "^1.0.2", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + } + }, + "mongoose": { + "version": "5.12.7", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.12.7.tgz", + "integrity": "sha512-BniNwACn7uflK2h+M3juvyLH5nn9JDFgnB5KE2EwWFwSrRyhSpPnCtanRKJW3OtMCJyPccMIjtGZxHNW7JfnIw==", + "requires": { + "@types/mongodb": "^3.5.27", + "bson": "^1.1.4", + "kareem": "2.3.2", + "mongodb": "3.6.6", + "mongoose-legacy-pluralize": "1.0.2", + "mpath": "0.8.3", + "mquery": "3.2.5", + "ms": "2.1.2", + "regexp-clone": "1.0.0", + "safe-buffer": "5.2.1", + "sift": "13.5.2", + "sliced": "1.0.1" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, + "mongoose-legacy-pluralize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", + "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" + }, + "mpath": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.3.tgz", + "integrity": "sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA==" + }, + "mquery": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.5.tgz", + "integrity": "sha512-VjOKHHgU84wij7IUoZzFRU07IAxd5kWJaDmyUzQlbjHjyoeK5TNeeo8ZsFDtTYnSgpW6n/nMNIHvE3u8Lbrf4A==", + "requires": { + "bluebird": "3.5.1", + "debug": "3.1.0", + "regexp-clone": "^1.0.0", + "safe-buffer": "5.1.2", + "sliced": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -828,6 +1280,16 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-addon-api": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + }, "nodemon": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz", @@ -863,6 +1325,27 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -879,6 +1362,11 @@ "wrappy": "1" } }, + "optional-require": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz", + "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA==" + }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -927,6 +1415,11 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", @@ -990,6 +1483,20 @@ "strip-json-comments": "~2.0.1" } }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -998,6 +1505,11 @@ "picomatch": "^2.2.1" } }, + "regexp-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", + "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" + }, "registry-auth-token": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", @@ -1022,6 +1534,14 @@ "lowercase-keys": "^1.0.0" } }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1032,6 +1552,15 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -1105,16 +1634,40 @@ "send": "0.17.1" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "sift": { + "version": "13.5.2", + "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz", + "integrity": "sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "sliced": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "optional": true, + "requires": { + "memory-pager": "^1.0.2" + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -1160,6 +1713,14 @@ } } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -1194,6 +1755,19 @@ "swagger-ui-dist": "^3.18.1" } }, + "tar": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", + "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -1311,6 +1885,11 @@ "prepend-http": "^2.0.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -1321,6 +1900,38 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -1350,6 +1961,11 @@ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "yamljs": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz", diff --git a/package.json b/package.json index 25394714..083b869c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,10 @@ }, "homepage": "https://github.com/MedTech-CS425/Assignment-1#readme", "dependencies": { + "bcrypt": "^5.0.1", "express": "^4.17.1", + "jsonwebtoken": "^8.5.1", + "mongoose": "^5.12.7", "nodemon": "^2.0.7", "swagger-ui-express": "^4.1.6", "yamljs": "^0.3.0" diff --git a/src/apis/authApi.js b/src/apis/authApi.js new file mode 100644 index 00000000..214dab2b --- /dev/null +++ b/src/apis/authApi.js @@ -0,0 +1,59 @@ +const bcrypt = require('bcrypt'); +const jwt = require('jsonwebtoken'); +const UserModel = require('../models/entities/userModel'); +const Error = require('../models/responses/error'); +const ValidationError = require('../models/responses/validationError'); +const secret = require('../consts/secret'); + +class AuthApi { + + async login(req, res, next) { + try { + if (!req.body.email) { + return res.status(422).json(new ValidationError("email", "Missing email is required")); + } + if (!req.body.password) { + return res.status(422).json(new ValidationError("password", "Missing password is required")); + } + const user = (await UserModel.findOne({ email: req.body.email })).toObject(); + const match = await bcrypt.compare(req.body.password, user.password); + if (!match) { + res.status(401).json(new Error("Invalid credentials")); + } + const token = jwt.sign({ id: user._id }, secret); + res.status(201).json({ user, token }); + } catch(error) { + next(error) + } + } + + async signUp(req, res, next) { + try { + const user = new UserModel(req.body); + let error = user.validateSync(); + if(error) { + const errorField = Object.keys(error.errors)[0]; + return res.status(422).json(new ValidationError(error.errors[errorField].path, error.errors[errorField].message)); + } + user.password = await bcrypt.hash(req.body.password, 12); + await user.save(); + res.status(201).json({}); + } catch (error) { + next(error); + } + } + + async getUser(req, res, next) { + try { + const user = await UserModel.findById(req.userId); + if (!user) { + return res.status(404).json(new Error("User not found")); + } + res.json({ email: user.email, password: user.password, userName: user.userName }); + } catch(error) { + next(error); + } + } +} + +module.exports = new AuthApi(); \ No newline at end of file diff --git a/src/consts/secret.js b/src/consts/secret.js new file mode 100644 index 00000000..81ed1269 --- /dev/null +++ b/src/consts/secret.js @@ -0,0 +1,3 @@ +const secret = 'c6c4773b358c3610cb4e54b55aecfa24102182f88c633c17529f3fd9f25a5abff028ebfa68b9b6a880a3a99ec7e9346043f70bd1c598a09eefb2d4a67656c4a2'; + +module.exports = secret; \ No newline at end of file diff --git a/src/middlewares/authMiddleware.js b/src/middlewares/authMiddleware.js new file mode 100644 index 00000000..35c57b02 --- /dev/null +++ b/src/middlewares/authMiddleware.js @@ -0,0 +1,20 @@ +const jwt = require("jsonwebtoken") +const secret = require('../consts/secret'); +const Error = require('../models/responses/error'); + +class AuthMiddleware { + authorize(req, res, next) { + const authHeader = req.headers['authorization'] + const token = authHeader && authHeader.split(' ')[1] + if (token == null) return res.status(401).json(new Error("Invalid token")); + + jwt.verify(token, secret, (err, user) => { + if (err) return res.status(401).json(new Error("Invalid token")); + + req.userId = user.id; + next(); + }) + } +} + +module.exports = new AuthMiddleware() \ No newline at end of file diff --git a/models/categoryModel.js b/src/models/entities/categoryModel.js similarity index 53% rename from models/categoryModel.js rename to src/models/entities/categoryModel.js index 1c1e1b58..0281bb32 100644 --- a/models/categoryModel.js +++ b/src/models/entities/categoryModel.js @@ -1,21 +1,18 @@ const mongoose = require('mongoose'); const CategorySchema = new mongoose.Schema({ - id: { - type: integer - }, name: { type: String }, - userId: { - type: integer + user: { + type: mongoose.Types.ObjectId }, createdAt: { - type: String + type: Date }, updatedAt: { - type: String + type: Date } }); -module.exports('Category', CategorySchema); \ No newline at end of file +module.exports = mongoose.model('Category', CategorySchema); \ No newline at end of file diff --git a/models/itemModel.js b/src/models/entities/itemModel.js similarity index 57% rename from models/itemModel.js rename to src/models/entities/itemModel.js index dfb6ffb6..286bb0bd 100644 --- a/models/itemModel.js +++ b/src/models/entities/itemModel.js @@ -1,17 +1,14 @@ const mongoose = require('mongoose'); const ItemSchema = new mongoose.Schema({ - id: { - type: integer - }, name: { type: String }, - categoryId: { - type: integer + category: { + type: mongoose.Types.ObjectId }, - userId: { - type: integer + user: { + type: mongoose.Types.ObjectId }, note: { type: String @@ -20,11 +17,11 @@ const ItemSchema = new mongoose.Schema({ type: String }, createdAt: { - type: String + type: Date }, updatedAt: { - type: String + type: Date } }); -module.exports('Item', ItemSchema); \ No newline at end of file +module.exports = mongoose.model('Item', ItemSchema); \ No newline at end of file diff --git a/src/models/entities/listModel.js b/src/models/entities/listModel.js new file mode 100644 index 00000000..2866dcca --- /dev/null +++ b/src/models/entities/listModel.js @@ -0,0 +1,18 @@ +const mongoose = require('mongoose'); + +const ListSchema = new mongoose.Schema({ +name: { + type: String +}, +user: { + type: mongoose.Types.ObjectId +}, +createdAt: { + type: Date +}, +updatedAt: { + type: Date +} +}); + +module.exports = mongoose.model('List', ListSchema); \ No newline at end of file diff --git a/models/userModel.js b/src/models/entities/userModel.js similarity index 62% rename from models/userModel.js rename to src/models/entities/userModel.js index 76ae9b66..e2f967ca 100644 --- a/models/userModel.js +++ b/src/models/entities/userModel.js @@ -3,16 +3,16 @@ const mongoose = require('mongoose'); const UserSchema = new mongoose.Schema({ email: { type: String, - require: true + required: true }, password: { type: String, - require: true + required: true }, userName: { type: String, - require: true + required: true } }); -module.exports('User', UserSchema); //USER TARJAA ALA CHKOUN? \ No newline at end of file +module.exports = mongoose.model('User', UserSchema); \ No newline at end of file diff --git a/loginRequest.js b/src/models/requests/loginRequest.js similarity index 100% rename from loginRequest.js rename to src/models/requests/loginRequest.js diff --git a/src/models/responses/error.js b/src/models/responses/error.js new file mode 100644 index 00000000..f59e4f98 --- /dev/null +++ b/src/models/responses/error.js @@ -0,0 +1,8 @@ +class Error { + constructor(message){ + this.status = "error"; + this.message = message; + } +} + +module.exports = Error; \ No newline at end of file diff --git a/loginRespone.js b/src/models/responses/loginRespone.js similarity index 100% rename from loginRespone.js rename to src/models/responses/loginRespone.js diff --git a/src/models/responses/validationError.js b/src/models/responses/validationError.js new file mode 100644 index 00000000..b2e063df --- /dev/null +++ b/src/models/responses/validationError.js @@ -0,0 +1,9 @@ +class validationError { + constructor(field, message) { + this.status = "error"; + this.field = field; + this.message = message; + } +} + +module.exports = validationError; \ No newline at end of file diff --git a/validationError.js b/validationError.js deleted file mode 100644 index 3cf75e6c..00000000 --- a/validationError.js +++ /dev/null @@ -1,7 +0,0 @@ -class validationError { - constructor(status, field, message) { - this.status = status; - this.field = field; - this.message = message; - } -} \ No newline at end of file From c4adf29e1c2971386d08dfdd6e3f672ed77172c6 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 18:14:21 +0100 Subject: [PATCH 05/19] updated models --- src/models/entities/categoryModel.js | 20 +++++++++++--------- src/models/entities/itemModel.js | 14 +++++++------- src/models/entities/listModel.js | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/models/entities/categoryModel.js b/src/models/entities/categoryModel.js index 0281bb32..4b7efc6b 100644 --- a/src/models/entities/categoryModel.js +++ b/src/models/entities/categoryModel.js @@ -2,17 +2,19 @@ const mongoose = require('mongoose'); const CategorySchema = new mongoose.Schema({ name: { - type: String + type: String, + required: true }, user: { - type: mongoose.Types.ObjectId - }, - createdAt: { - type: Date - }, - updatedAt: { - type: Date + type: mongoose.Types.ObjectId, + required: true } -}); +}, + { + timestamps: { + createdAt: "created_at", + updatedAt: "updated_at" + } + }); module.exports = mongoose.model('Category', CategorySchema); \ No newline at end of file diff --git a/src/models/entities/itemModel.js b/src/models/entities/itemModel.js index 286bb0bd..ce3bea30 100644 --- a/src/models/entities/itemModel.js +++ b/src/models/entities/itemModel.js @@ -16,12 +16,12 @@ const ItemSchema = new mongoose.Schema({ image: { type: String }, - createdAt: { - type: Date - }, - updatedAt: { - type: Date - } -}); +}, + { + timestamps: { + createdAt: "created_at", + updatedAt: "updated_at" + } + }); module.exports = mongoose.model('Item', ItemSchema); \ No newline at end of file diff --git a/src/models/entities/listModel.js b/src/models/entities/listModel.js index 2866dcca..59df1695 100644 --- a/src/models/entities/listModel.js +++ b/src/models/entities/listModel.js @@ -1,18 +1,18 @@ const mongoose = require('mongoose'); const ListSchema = new mongoose.Schema({ -name: { - type: String + name: { + type: String + }, + user: { + type: mongoose.Types.ObjectId + }, }, -user: { - type: mongoose.Types.ObjectId -}, -createdAt: { - type: Date -}, -updatedAt: { - type: Date -} -}); + { + timestamps: { + createdAt: "created_at", + updatedAt: "updated_at" + } + }); module.exports = mongoose.model('List', ListSchema); \ No newline at end of file From 243f9de3e9c6259cae0e7967524e02bdbec7b5e9 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 18:16:12 +0100 Subject: [PATCH 06/19] added method for model validation --- src/utils/validateModel.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/utils/validateModel.js diff --git a/src/utils/validateModel.js b/src/utils/validateModel.js new file mode 100644 index 00000000..3cac1c91 --- /dev/null +++ b/src/utils/validateModel.js @@ -0,0 +1,12 @@ +const ValidationError = require('../models/responses/validationError'); + +function validateModel(model) { + const error = model.validateSync(); + if (error) { + const errorField = Object.keys(error.errors)[0]; + return new ValidationError(error.errors[errorField].path, error.errors[errorField].message); + } + return null; +} + +module.exports = validateModel; \ No newline at end of file From 16c1096ee68165d1b5c85e80f3e6574998d8d5bf Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 18:17:34 +0100 Subject: [PATCH 07/19] feat: worked on categories api --- index.js | 15 ++++++++++- src/apis/categoriesApi.js | 56 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/apis/categoriesApi.js diff --git a/index.js b/index.js index ece29c80..5ed8130a 100644 --- a/index.js +++ b/index.js @@ -4,6 +4,9 @@ app.use(express.json()); const mongoose = require('mongoose'); const authApi = require('./src/apis/authApi'); const authMiddleware = require('./src/middlewares/authMiddleware'); +const categoriesApi = require('./src/apis/categoriesApi'); +const itemsApi = require('./src/apis/itemsApi'); +const listsApi = require('./src/apis/listsApi'); const Error = require('./src/models/responses/error'); const swaggerUi = require('swagger-ui-express'); const YAML = require('yamljs'); @@ -19,12 +22,22 @@ mongoose.connection.once('open', function() { console.log("Connection to DB established"); }) +//Auth routes app.post('/signup', authApi.signUp); app.post('/login', authApi.login); app.get('/getUser', authMiddleware.authorize , authApi.getUser); - + +// Categories routes +app.get('/categories', authMiddleware.authorize, categoriesApi.getCategories); + +app.post('/categories', authMiddleware.authorize, categoriesApi.createCategory); + +app.put('/categories/:category_id', authMiddleware.authorize, categoriesApi.updateCategory); + +app.delete('/categories/:category_id', authMiddleware.authorize, categoriesApi.deleteCategory); + app.use((err, req, res, next) => { res.status(500).json(new Error(err.message)); }); diff --git a/src/apis/categoriesApi.js b/src/apis/categoriesApi.js new file mode 100644 index 00000000..8950e5eb --- /dev/null +++ b/src/apis/categoriesApi.js @@ -0,0 +1,56 @@ +const CategoryModel = require('../models/entities/categoryModel'); +const validateModel = require('../utils/validateModel'); +const mongoose = require('mongoose'); + +class CategoriesApi { + async getCategories(req, res, next) { + try { + const categories = await CategoryModel.find({ user: req.userId }); + res.status(201).json(categories); + } catch (error) { + next(error); + } + } + + async createCategory(req, res, next) { + try { + const category = new CategoryModel(req.body); + category.user = mongoose.Types.ObjectId(req.userId); + const validationError = validateModel(category); + if (validationError) + return res.status(422).json(validationError); + await category.save(); + res.status(201).json(category); + } catch (error) { + next(error); + } + } + + async updateCategory(req, res, next) { + try { + const category = await CategoryModel.findById(req.params.category_id); + if (!category) { + return res.status(404).json(new Error("Category not found")); + } + category.name = req.body.name; + const validationError = validateModel(category); + if (validationError) + return res.status(422).json(validationError); + await category.save(); + res.status(201).json(category); + } catch (error) { + next(error); + } + } + + async deleteCategory(req, res, next) { + try { + await CategoryModel.findByIdAndDelete(req.params.category_id); + res.json({}); + } catch (error) { + next(error); + } + } +} + +module.exports = new CategoriesApi(); \ No newline at end of file From 585e48a1e645095923f241261f02f6e526521069 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 18:18:24 +0100 Subject: [PATCH 08/19] updated auth api --- src/apis/authApi.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/apis/authApi.js b/src/apis/authApi.js index 214dab2b..cdc21603 100644 --- a/src/apis/authApi.js +++ b/src/apis/authApi.js @@ -22,24 +22,22 @@ class AuthApi { } const token = jwt.sign({ id: user._id }, secret); res.status(201).json({ user, token }); - } catch(error) { + } catch (error) { next(error) - } + } } async signUp(req, res, next) { try { const user = new UserModel(req.body); - let error = user.validateSync(); - if(error) { - const errorField = Object.keys(error.errors)[0]; - return res.status(422).json(new ValidationError(error.errors[errorField].path, error.errors[errorField].message)); - } + const validationError = validateModel(user); + if (validationError) + return res.status(422).json(validationError); user.password = await bcrypt.hash(req.body.password, 12); await user.save(); res.status(201).json({}); } catch (error) { - next(error); + next(error); } } @@ -50,9 +48,9 @@ class AuthApi { return res.status(404).json(new Error("User not found")); } res.json({ email: user.email, password: user.password, userName: user.userName }); - } catch(error) { + } catch (error) { next(error); - } + } } } From c2b69bf9fc2530309e55d34c355b935fe9764c78 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 18:23:57 +0100 Subject: [PATCH 09/19] updated item model: set attributes as required --- src/models/entities/itemModel.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/models/entities/itemModel.js b/src/models/entities/itemModel.js index ce3bea30..64c34071 100644 --- a/src/models/entities/itemModel.js +++ b/src/models/entities/itemModel.js @@ -2,19 +2,23 @@ const mongoose = require('mongoose'); const ItemSchema = new mongoose.Schema({ name: { - type: String + type: String, + required: true }, category: { - type: mongoose.Types.ObjectId + type: mongoose.Types.ObjectId, + required: true }, user: { type: mongoose.Types.ObjectId }, note: { - type: String + type: String, + required: true }, image: { - type: String + type: String, + required: true }, }, { From 415de0fbda30b0c9e3b37e8329dd002617343701 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 21:27:25 +0100 Subject: [PATCH 10/19] feat: worked on items api --- index.js | 11 ++++++++- src/apis/itemsApi.js | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 src/apis/itemsApi.js diff --git a/index.js b/index.js index 5ed8130a..192181b8 100644 --- a/index.js +++ b/index.js @@ -38,10 +38,19 @@ app.put('/categories/:category_id', authMiddleware.authorize, categoriesApi.upda app.delete('/categories/:category_id', authMiddleware.authorize, categoriesApi.deleteCategory); +// Items routes +app.get('/items', authMiddleware.authorize, itemsApi.getItems); + +app.post('/items', authMiddleware.authorize, itemsApi.createItem); + +app.put('/items/:item_id', authMiddleware.authorize, itemsApi.updateItem); + +app.delete('/items/:item_id', authMiddleware.authorize, itemsApi.deleteItem); + app.use((err, req, res, next) => { res.status(500).json(new Error(err.message)); }); app.listen(3000, ()=>{ console.log("Listening on Port 3000"); -}) +}) \ No newline at end of file diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js new file mode 100644 index 00000000..56e0704a --- /dev/null +++ b/src/apis/itemsApi.js @@ -0,0 +1,56 @@ +const ItemModel = require('../models/entities/itemModel'); +const validateModel = require('../utils/validateModel'); +const mongoose = require('mongoose'); + +class ItemsApi { + async getItems(req, res, next) { + try { + const items = await ItemModel.find({ user: req.userId }); + res.status(201).json(items); + } catch (error) { + next(error); + } + } + + async createItem(req, res, next) { + try { + const item = new ItemModel(req.body); + item.user = mongoose.Types.ObjectId(req.userId); + const error = item.validateSync(); + if (error) { + const errorField = Object.keys(error.errors)[0]; + return res.status(422).json(new ValidationError(error.errors[errorField].path, error.errors[errorField].message)); + } + await item.save(); + res.status(200).json(item); + } catch (error) { + next(error); + } + } + + async updateItem(req, res, next) { + try { + const item = await ItemModel.findById(req.params.item_id); + if (!item) { + return res.status(404).json(new Error("item not found")); + } + item.name = req.body.name; + + await item.save(); + res.status(201).json(item); + } catch (error) { + next(error); + } + } + + async deleteItem(req, res, next) { + try { + await ItemModel.findByIdAndDelete(req.params.item_id); + res.json({}); + } catch(error) { + next(error); + } + } +} + +module.exports = new ItemsApi(); \ No newline at end of file From 513d87870f294b522515bc33f5ca9913bb549bd1 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 22:03:50 +0100 Subject: [PATCH 11/19] fix: added ref in models --- src/models/entities/categoryModel.js | 1 + src/models/entities/itemModel.js | 5 ++++- src/models/entities/listModel.js | 11 +++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/models/entities/categoryModel.js b/src/models/entities/categoryModel.js index 4b7efc6b..0cd2a330 100644 --- a/src/models/entities/categoryModel.js +++ b/src/models/entities/categoryModel.js @@ -7,6 +7,7 @@ const CategorySchema = new mongoose.Schema({ }, user: { type: mongoose.Types.ObjectId, + ref: 'User', required: true } }, diff --git a/src/models/entities/itemModel.js b/src/models/entities/itemModel.js index 64c34071..4c4e682a 100644 --- a/src/models/entities/itemModel.js +++ b/src/models/entities/itemModel.js @@ -7,10 +7,13 @@ const ItemSchema = new mongoose.Schema({ }, category: { type: mongoose.Types.ObjectId, + ref: 'Category', required: true }, user: { - type: mongoose.Types.ObjectId + type: mongoose.Types.ObjectId, + ref: 'User', + required: true }, note: { type: String, diff --git a/src/models/entities/listModel.js b/src/models/entities/listModel.js index 59df1695..e69eefe5 100644 --- a/src/models/entities/listModel.js +++ b/src/models/entities/listModel.js @@ -2,11 +2,18 @@ const mongoose = require('mongoose'); const ListSchema = new mongoose.Schema({ name: { - type: String + type: String, + required: true }, user: { - type: mongoose.Types.ObjectId + type: mongoose.Types.ObjectId, + ref: 'User', + required: true }, + items: [{ + type: mongoose.Types.ObjectId, + ref: 'Item' + }] }, { timestamps: { From 4dbae2b5fdbf09442cd276d5d1ce88569d237b32 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 22:11:25 +0100 Subject: [PATCH 12/19] fixed items api --- src/apis/itemsApi.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js index 56e0704a..3cd069ee 100644 --- a/src/apis/itemsApi.js +++ b/src/apis/itemsApi.js @@ -16,13 +16,12 @@ class ItemsApi { try { const item = new ItemModel(req.body); item.user = mongoose.Types.ObjectId(req.userId); - const error = item.validateSync(); - if (error) { - const errorField = Object.keys(error.errors)[0]; - return res.status(422).json(new ValidationError(error.errors[errorField].path, error.errors[errorField].message)); - } + item.category = mongoose.Types.ObjectId(req.body.category); + const validationError = validateModel(item); + if (validationError) + return res.status(422).json(validationError); await item.save(); - res.status(200).json(item); + res.status(201).json(item); } catch (error) { next(error); } @@ -32,10 +31,15 @@ class ItemsApi { try { const item = await ItemModel.findById(req.params.item_id); if (!item) { - return res.status(404).json(new Error("item not found")); + return res.status(404).json(new Error("Item not found")); } item.name = req.body.name; - + item.image = req.body.image; + item.category = mongoose.Types.ObjectId(req.body.category); + item.note = req.body.note; + const validationError = validateModel(item); + if (validationError) + return res.status(422).json(validationError); await item.save(); res.status(201).json(item); } catch (error) { @@ -47,7 +51,7 @@ class ItemsApi { try { await ItemModel.findByIdAndDelete(req.params.item_id); res.json({}); - } catch(error) { + } catch (error) { next(error); } } From 48e3748e5b50f2e3321ad8c714018289b56d67ef Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 23:29:36 +0100 Subject: [PATCH 13/19] fixed notation --- src/apis/categoriesApi.js | 2 +- src/apis/itemsApi.js | 6 +++--- src/models/entities/categoryModel.js | 2 +- src/models/entities/itemModel.js | 4 ++-- src/models/entities/listModel.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/apis/categoriesApi.js b/src/apis/categoriesApi.js index 8950e5eb..9331a69f 100644 --- a/src/apis/categoriesApi.js +++ b/src/apis/categoriesApi.js @@ -15,7 +15,7 @@ class CategoriesApi { async createCategory(req, res, next) { try { const category = new CategoryModel(req.body); - category.user = mongoose.Types.ObjectId(req.userId); + category.user_id = mongoose.Types.ObjectId(req.userId); const validationError = validateModel(category); if (validationError) return res.status(422).json(validationError); diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js index 3cd069ee..b3f1950a 100644 --- a/src/apis/itemsApi.js +++ b/src/apis/itemsApi.js @@ -15,8 +15,8 @@ class ItemsApi { async createItem(req, res, next) { try { const item = new ItemModel(req.body); - item.user = mongoose.Types.ObjectId(req.userId); - item.category = mongoose.Types.ObjectId(req.body.category); + item.user_id = mongoose.Types.ObjectId(req.userId); + item.category_id = mongoose.Types.ObjectId(req.body.category_id); const validationError = validateModel(item); if (validationError) return res.status(422).json(validationError); @@ -35,7 +35,7 @@ class ItemsApi { } item.name = req.body.name; item.image = req.body.image; - item.category = mongoose.Types.ObjectId(req.body.category); + item.category_id = mongoose.Types.ObjectId(req.body.category_id); item.note = req.body.note; const validationError = validateModel(item); if (validationError) diff --git a/src/models/entities/categoryModel.js b/src/models/entities/categoryModel.js index 0cd2a330..efd324ce 100644 --- a/src/models/entities/categoryModel.js +++ b/src/models/entities/categoryModel.js @@ -5,7 +5,7 @@ const CategorySchema = new mongoose.Schema({ type: String, required: true }, - user: { + user_id: { type: mongoose.Types.ObjectId, ref: 'User', required: true diff --git a/src/models/entities/itemModel.js b/src/models/entities/itemModel.js index 4c4e682a..118a7786 100644 --- a/src/models/entities/itemModel.js +++ b/src/models/entities/itemModel.js @@ -5,12 +5,12 @@ const ItemSchema = new mongoose.Schema({ type: String, required: true }, - category: { + category_id: { type: mongoose.Types.ObjectId, ref: 'Category', required: true }, - user: { + user_id: { type: mongoose.Types.ObjectId, ref: 'User', required: true diff --git a/src/models/entities/listModel.js b/src/models/entities/listModel.js index e69eefe5..bc084c1c 100644 --- a/src/models/entities/listModel.js +++ b/src/models/entities/listModel.js @@ -5,7 +5,7 @@ const ListSchema = new mongoose.Schema({ type: String, required: true }, - user: { + user_id: { type: mongoose.Types.ObjectId, ref: 'User', required: true From d23b0d208db26b63d92406ae299cd75f2d8099e6 Mon Sep 17 00:00:00 2001 From: najlase Date: Tue, 4 May 2021 23:34:23 +0100 Subject: [PATCH 14/19] fixed DB queries --- src/apis/categoriesApi.js | 2 +- src/apis/itemsApi.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apis/categoriesApi.js b/src/apis/categoriesApi.js index 9331a69f..8b0871bf 100644 --- a/src/apis/categoriesApi.js +++ b/src/apis/categoriesApi.js @@ -5,7 +5,7 @@ const mongoose = require('mongoose'); class CategoriesApi { async getCategories(req, res, next) { try { - const categories = await CategoryModel.find({ user: req.userId }); + const categories = await CategoryModel.find({ user_id: req.userId }); res.status(201).json(categories); } catch (error) { next(error); diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js index b3f1950a..0f902943 100644 --- a/src/apis/itemsApi.js +++ b/src/apis/itemsApi.js @@ -5,7 +5,7 @@ const mongoose = require('mongoose'); class ItemsApi { async getItems(req, res, next) { try { - const items = await ItemModel.find({ user: req.userId }); + const items = await ItemModel.find({ user_id: req.userId }); res.status(201).json(items); } catch (error) { next(error); From 71d5f0740b1b7ccc96631705d7a298c321df1c12 Mon Sep 17 00:00:00 2001 From: najlase Date: Wed, 5 May 2021 22:10:17 +0100 Subject: [PATCH 15/19] feat: worked on list api --- index.js | 30 ++++++++-- src/apis/listsApi.js | 137 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 src/apis/listsApi.js diff --git a/index.js b/index.js index 192181b8..dae18ddf 100644 --- a/index.js +++ b/index.js @@ -13,12 +13,12 @@ const YAML = require('yamljs'); const swaggerDocument = YAML.load('./api.yml'); app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument)); -mongoose.connect("mongodb://localhost:27017/assignment-1", {useNewUrlParser: true, useUnifiedTopology: true}); +mongoose.connect("mongodb://localhost:27017/assignment-1", { useNewUrlParser: true, useUnifiedTopology: true }); -mongoose.connection.on('error', function() { +mongoose.connection.on('error', function () { console.error("Connection error"); }) -mongoose.connection.once('open', function() { +mongoose.connection.once('open', function () { console.log("Connection to DB established"); }) @@ -27,7 +27,7 @@ app.post('/signup', authApi.signUp); app.post('/login', authApi.login); -app.get('/getUser', authMiddleware.authorize , authApi.getUser); +app.get('/getUser', authMiddleware.authorize, authApi.getUser); // Categories routes app.get('/categories', authMiddleware.authorize, categoriesApi.getCategories); @@ -47,10 +47,28 @@ app.put('/items/:item_id', authMiddleware.authorize, itemsApi.updateItem); app.delete('/items/:item_id', authMiddleware.authorize, itemsApi.deleteItem); +// Lists routes +app.get('/lists', authMiddleware.authorize, listsApi.getLists); + +app.post('/lists', authMiddleware.authorize, listsApi.createList); + +app.put('/lists/:list_id', authMiddleware.authorize, listsApi.updateList); + +app.delete('/lists/:list_id', authMiddleware.authorize, listsApi.deleteList); + +app.get('/lists/:list_id/items', authMiddleware.authorize, listsApi.getListItems); + +app.post('/lists/:list_id/items', authMiddleware.authorize, listsApi.addListItem); + +app.put('/lists/:list_id/items', authMiddleware.authorize, listsApi.updateListItem); + +app.delete('/lists/:list_id/items', authMiddleware.authorize, listsApi.deleteListItem); + + app.use((err, req, res, next) => { res.status(500).json(new Error(err.message)); - }); +}); -app.listen(3000, ()=>{ +app.listen(3000, () => { console.log("Listening on Port 3000"); }) \ No newline at end of file diff --git a/src/apis/listsApi.js b/src/apis/listsApi.js new file mode 100644 index 00000000..8922bfb5 --- /dev/null +++ b/src/apis/listsApi.js @@ -0,0 +1,137 @@ +const ListModel = require('../models/entities/listModel'); +const ValidationError = require('../models/responses/validationError'); +const validateModel = require('../utils/validateModel'); +const ItemModel = require('../models/entities/itemModel'); +const mongoose = require('mongoose'); + +class ListsApi { + async getLists(req, res, next) { + try { + const lists = await ListModel.find({ user_id: req.userId }).select("-items"); + res.status(201).json(lists); + } catch (error) { + next(error); + } + } + + async createList(req, res, next) { + try { + const list = new ListModel(req.body); + list.user_id = mongoose.Types.ObjectId(req.userId); + const validationError = validateModel(list); + if (validationError) + return res.status(422).json(validationError); + await list.save(); + delete list.items; + res.status(201).json(list); + } catch (error) { + next(error); + } + } + + async updateList(req, res, next) { + try { + const list = await ListModel.findById(req.params.list_id); + if (!list) { + return res.status(404).json(new Error("List not found")); + } + list.name = req.body.name; + const validationError = validateModel(list); + if (validationError) + return res.status(422).json(validationError); + await list.save(); + res.status(201).json(list); + } catch (error) { + next(error); + } + } + + async deleteList(req, res, next) { + try { + await ListModel.findByIdAndDelete(req.params.list_id); + res.json({}); + } catch (error) { + next(error); + } + } + + async getListItems(req, res, next) { + try { + const list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id }).populate('items')); + if (!list) { + return res.status(404).json(new Error("Invalid list id")); + } + res.status(201).json(list.items); + } catch (error) { + next(error); + } + } + + async addListItem(req, res, next) { + try { + let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + if (!list) { + return res.status(404).json(new Error("Invalid list id")); + } + if (list.items.indexOf(req.body.item_id) !== -1) { + return res.status(422).json(new ValidationError("item_id", "Item already exists in list")); + } + list.items.push(mongoose.Types.ObjectId(req.body.item_id)); + const validationError = validateModel(list); + if (validationError) + return res.status(422).json(validationError); + await list.save(); + list = list.toObject(); + delete list.items; + res.status(201).json(list); + } catch (error) { + next(error); + } + } + + async deleteListItem(req, res, next) { + try { + let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + if (!list) { + return res.status(404).json(new Error("Invalid list id")); + } + const index = list.items.indexOf(req.body.item_id); + if (index === -1) { + return res.status(422).json(new ValidationError("item_id", "Item doesn't exist in list")); + } + list.items.splice(index, 1); + await list.save(); + res.status(201).json({}); + } catch (error) { + next(error); + } + } + + async updateListItem(req, res, next) { + try { + let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + if (!list) { + return res.status(404).json(new Error("Invalid list id")); + } + const index = list.items.indexOf(req.body.item_id); + if (index === -1) { + return res.status(422).json(new ValidationError("item_id", "Item doesn't exist in list")); + } + const item = await ItemModel.findById(list.items[index]); + item.name = req.body.name; + item.image = req.body.image; + item.category_id = mongoose.Types.ObjectId(req.body.category_id); + item.note = req.body.note; + const validationError = validateModel(item); + if (validationError) + return res.status(422).json(validationError); + await item.save(); + res.status(201).json({}); + } catch (error) { + next(error); + } + + } +} + +module.exports = new ListsApi(); \ No newline at end of file From 25233d483d8f11497e39dbcc32102ff48e7d44de Mon Sep 17 00:00:00 2001 From: najlase Date: Wed, 5 May 2021 22:26:42 +0100 Subject: [PATCH 16/19] formatted code --- src/middlewares/authMiddleware.js | 6 +++--- src/models/responses/error.js | 2 +- src/models/responses/loginRespone.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/middlewares/authMiddleware.js b/src/middlewares/authMiddleware.js index 35c57b02..a32f99fd 100644 --- a/src/middlewares/authMiddleware.js +++ b/src/middlewares/authMiddleware.js @@ -1,11 +1,11 @@ -const jwt = require("jsonwebtoken") +const jwt = require("jsonwebtoken"); const secret = require('../consts/secret'); const Error = require('../models/responses/error'); class AuthMiddleware { authorize(req, res, next) { - const authHeader = req.headers['authorization'] - const token = authHeader && authHeader.split(' ')[1] + const authHeader = req.headers['authorization']; + const token = authHeader && authHeader.split(' ')[1]; if (token == null) return res.status(401).json(new Error("Invalid token")); jwt.verify(token, secret, (err, user) => { diff --git a/src/models/responses/error.js b/src/models/responses/error.js index f59e4f98..bc49328d 100644 --- a/src/models/responses/error.js +++ b/src/models/responses/error.js @@ -1,5 +1,5 @@ class Error { - constructor(message){ + constructor(message) { this.status = "error"; this.message = message; } diff --git a/src/models/responses/loginRespone.js b/src/models/responses/loginRespone.js index ada93d85..35cd1c36 100644 --- a/src/models/responses/loginRespone.js +++ b/src/models/responses/loginRespone.js @@ -3,4 +3,4 @@ class loginResponse { this.user = user; this.token = token; } - } \ No newline at end of file +} \ No newline at end of file From 21e4279fd8a97944f1f959e1ec3662b675babea5 Mon Sep 17 00:00:00 2001 From: najlase Date: Wed, 5 May 2021 23:02:41 +0100 Subject: [PATCH 17/19] integrated LoginRequest and LoginResponse in auth api --- src/apis/authApi.js | 21 +++++++++++---------- src/models/requests/loginRequest.js | 18 ++++++++++++++++-- src/models/responses/loginResponse.js | 8 ++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 src/models/responses/loginResponse.js diff --git a/src/apis/authApi.js b/src/apis/authApi.js index cdc21603..6c7087c9 100644 --- a/src/apis/authApi.js +++ b/src/apis/authApi.js @@ -2,28 +2,29 @@ const bcrypt = require('bcrypt'); const jwt = require('jsonwebtoken'); const UserModel = require('../models/entities/userModel'); const Error = require('../models/responses/error'); -const ValidationError = require('../models/responses/validationError'); +const validateModel = require('../utils/validateModel'); const secret = require('../consts/secret'); +const LoginResponse = require('../models/responses/loginResponse'); +const LoginRequest = require('../models/requests/loginRequest'); class AuthApi { async login(req, res, next) { try { - if (!req.body.email) { - return res.status(422).json(new ValidationError("email", "Missing email is required")); - } - if (!req.body.password) { - return res.status(422).json(new ValidationError("password", "Missing password is required")); + const loginRequest = new LoginRequest(req.body.email, req.body.password); + const error = loginRequest.validate(); + if(error !== null) { + return res.status(422).json(error); } const user = (await UserModel.findOne({ email: req.body.email })).toObject(); const match = await bcrypt.compare(req.body.password, user.password); if (!match) { - res.status(401).json(new Error("Invalid credentials")); + res.status(401).json(new Error('Invalid credentials')); } const token = jwt.sign({ id: user._id }, secret); - res.status(201).json({ user, token }); + res.status(201).json(new LoginResponse(user, token)); } catch (error) { - next(error) + next(error); } } @@ -45,7 +46,7 @@ class AuthApi { try { const user = await UserModel.findById(req.userId); if (!user) { - return res.status(404).json(new Error("User not found")); + return res.status(404).json(new Error('User not found')); } res.json({ email: user.email, password: user.password, userName: user.userName }); } catch (error) { diff --git a/src/models/requests/loginRequest.js b/src/models/requests/loginRequest.js index 49d4736f..95eacd19 100644 --- a/src/models/requests/loginRequest.js +++ b/src/models/requests/loginRequest.js @@ -1,6 +1,20 @@ -class loginRequest { +const ValidationError = require('../responses/validationError'); + +class LoginRequest { constructor(email, password) { this.email = email; this.password = password; } -} \ No newline at end of file + + validate() { + if (!this.email) { + return new ValidationError('email', 'Missing email is required'); + } + if (!this.password) { + return new ValidationError('password', 'Missing password is required'); + } + return null; + } +} + +module.exports = LoginRequest; \ No newline at end of file diff --git a/src/models/responses/loginResponse.js b/src/models/responses/loginResponse.js new file mode 100644 index 00000000..9e79685e --- /dev/null +++ b/src/models/responses/loginResponse.js @@ -0,0 +1,8 @@ +class LoginResponse { + constructor(user, token) { + this.user = user; + this.token = token; + } +} + +module.exports = LoginResponse; \ No newline at end of file From e14b04fa0fed27d43ad980a2d67a239b8c04aa83 Mon Sep 17 00:00:00 2001 From: najlase Date: Thu, 6 May 2021 00:20:03 +0100 Subject: [PATCH 18/19] formatted and fixed code --- index.js | 8 ++-- src/apis/authApi.js | 10 ++-- src/apis/categoriesApi.js | 2 +- src/apis/itemsApi.js | 2 +- src/apis/listsApi.js | 62 ++++++++++++------------- src/middlewares/authMiddleware.js | 6 +-- src/models/entities/categoryModel.js | 4 +- src/models/entities/itemModel.js | 4 +- src/models/entities/listModel.js | 4 +- src/models/responses/error.js | 2 +- src/models/responses/loginRespone.js | 6 --- src/models/responses/validationError.js | 2 +- 12 files changed, 55 insertions(+), 57 deletions(-) delete mode 100644 src/models/responses/loginRespone.js diff --git a/index.js b/index.js index dae18ddf..0746565f 100644 --- a/index.js +++ b/index.js @@ -13,13 +13,13 @@ const YAML = require('yamljs'); const swaggerDocument = YAML.load('./api.yml'); app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument)); -mongoose.connect("mongodb://localhost:27017/assignment-1", { useNewUrlParser: true, useUnifiedTopology: true }); +mongoose.connect('mongodb://localhost:27017/assignment-1', { useNewUrlParser: true, useUnifiedTopology: true }); mongoose.connection.on('error', function () { - console.error("Connection error"); + console.error('Connection error'); }) mongoose.connection.once('open', function () { - console.log("Connection to DB established"); + console.log('Connection to DB established'); }) //Auth routes @@ -70,5 +70,5 @@ app.use((err, req, res, next) => { }); app.listen(3000, () => { - console.log("Listening on Port 3000"); + console.log('Listening on Port 3000'); }) \ No newline at end of file diff --git a/src/apis/authApi.js b/src/apis/authApi.js index 6c7087c9..dba577ee 100644 --- a/src/apis/authApi.js +++ b/src/apis/authApi.js @@ -13,14 +13,18 @@ class AuthApi { try { const loginRequest = new LoginRequest(req.body.email, req.body.password); const error = loginRequest.validate(); - if(error !== null) { + if (error !== null) { return res.status(422).json(error); } - const user = (await UserModel.findOne({ email: req.body.email })).toObject(); + let user = await UserModel.findOne({ email: req.body.email }); + if(!user) { + return res.status(401).json(new Error('Invalid credentials')); + } const match = await bcrypt.compare(req.body.password, user.password); if (!match) { - res.status(401).json(new Error('Invalid credentials')); + return res.status(401).json(new Error('Invalid credentials')); } + user = user.toObject(); const token = jwt.sign({ id: user._id }, secret); res.status(201).json(new LoginResponse(user, token)); } catch (error) { diff --git a/src/apis/categoriesApi.js b/src/apis/categoriesApi.js index 8b0871bf..05102fea 100644 --- a/src/apis/categoriesApi.js +++ b/src/apis/categoriesApi.js @@ -30,7 +30,7 @@ class CategoriesApi { try { const category = await CategoryModel.findById(req.params.category_id); if (!category) { - return res.status(404).json(new Error("Category not found")); + return res.status(404).json(new Error('Category not found')); } category.name = req.body.name; const validationError = validateModel(category); diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js index 0f902943..bf2877e1 100644 --- a/src/apis/itemsApi.js +++ b/src/apis/itemsApi.js @@ -31,7 +31,7 @@ class ItemsApi { try { const item = await ItemModel.findById(req.params.item_id); if (!item) { - return res.status(404).json(new Error("Item not found")); + return res.status(404).json(new Error('Item not found')); } item.name = req.body.name; item.image = req.body.image; diff --git a/src/apis/listsApi.js b/src/apis/listsApi.js index 8922bfb5..01759b78 100644 --- a/src/apis/listsApi.js +++ b/src/apis/listsApi.js @@ -1,4 +1,5 @@ const ListModel = require('../models/entities/listModel'); +const Error = require('../models/responses/error'); const ValidationError = require('../models/responses/validationError'); const validateModel = require('../utils/validateModel'); const ItemModel = require('../models/entities/itemModel'); @@ -7,7 +8,7 @@ const mongoose = require('mongoose'); class ListsApi { async getLists(req, res, next) { try { - const lists = await ListModel.find({ user_id: req.userId }).select("-items"); + const lists = await ListModel.find({ user_id: req.userId }).select('-items'); res.status(201).json(lists); } catch (error) { next(error); @@ -22,7 +23,6 @@ class ListsApi { if (validationError) return res.status(422).json(validationError); await list.save(); - delete list.items; res.status(201).json(list); } catch (error) { next(error); @@ -33,7 +33,7 @@ class ListsApi { try { const list = await ListModel.findById(req.params.list_id); if (!list) { - return res.status(404).json(new Error("List not found")); + return res.status(404).json(new Error('List not found')); } list.name = req.body.name; const validationError = validateModel(list); @@ -59,7 +59,7 @@ class ListsApi { try { const list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id }).populate('items')); if (!list) { - return res.status(404).json(new Error("Invalid list id")); + return res.status(404).json(new Error('Invalid list id')); } res.status(201).json(list.items); } catch (error) { @@ -69,68 +69,68 @@ class ListsApi { async addListItem(req, res, next) { try { - let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + const list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); if (!list) { - return res.status(404).json(new Error("Invalid list id")); + return res.status(404).json(new Error('Invalid list id')); + } + if(!req.body.item_id) { + return res.status(422).json(new ValidationError('item-id', 'Invalid item id')); } if (list.items.indexOf(req.body.item_id) !== -1) { - return res.status(422).json(new ValidationError("item_id", "Item already exists in list")); + return res.status(422).json(new ValidationError('item_id', 'Item already exists in list')); } list.items.push(mongoose.Types.ObjectId(req.body.item_id)); const validationError = validateModel(list); if (validationError) return res.status(422).json(validationError); await list.save(); - list = list.toObject(); - delete list.items; res.status(201).json(list); } catch (error) { next(error); } } - async deleteListItem(req, res, next) { + async updateListItem(req, res, next) { try { - let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + const list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); if (!list) { - return res.status(404).json(new Error("Invalid list id")); + return res.status(404).json(new Error('Invalid list id')); } const index = list.items.indexOf(req.body.item_id); if (index === -1) { - return res.status(422).json(new ValidationError("item_id", "Item doesn't exist in list")); + return res.status(422).json(new ValidationError('item_id', 'Item does not exist in list')); } - list.items.splice(index, 1); - await list.save(); - res.status(201).json({}); + const item = await ItemModel.findById(list.items[index]); + item.name = req.body.name; + item.image = req.body.image; + item.category_id = req.body.category_id ? mongoose.Types.ObjectId(req.body.category_id) : null; + item.note = req.body.note; + const validationError = validateModel(item); + if (validationError) + return res.status(422).json(validationError); + await item.save(); + res.status(201).json(item); } catch (error) { next(error); } } - async updateListItem(req, res, next) { + async deleteListItem(req, res, next) { try { - let list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); + const list = (await ListModel.findOne({ user_id: req.userId, _id: req.params.list_id })); if (!list) { - return res.status(404).json(new Error("Invalid list id")); + return res.status(404).json(new Error('Invalid list id')); } const index = list.items.indexOf(req.body.item_id); if (index === -1) { - return res.status(422).json(new ValidationError("item_id", "Item doesn't exist in list")); + return res.status(422).json(new ValidationError('item_id', 'Item does not exist in list')); } - const item = await ItemModel.findById(list.items[index]); - item.name = req.body.name; - item.image = req.body.image; - item.category_id = mongoose.Types.ObjectId(req.body.category_id); - item.note = req.body.note; - const validationError = validateModel(item); - if (validationError) - return res.status(422).json(validationError); - await item.save(); - res.status(201).json({}); + list.items.splice(index, 1); + await list.save(); + res.json({}); } catch (error) { next(error); } - } } diff --git a/src/middlewares/authMiddleware.js b/src/middlewares/authMiddleware.js index a32f99fd..49834abb 100644 --- a/src/middlewares/authMiddleware.js +++ b/src/middlewares/authMiddleware.js @@ -1,4 +1,4 @@ -const jwt = require("jsonwebtoken"); +const jwt = require('jsonwebtoken'); const secret = require('../consts/secret'); const Error = require('../models/responses/error'); @@ -6,10 +6,10 @@ class AuthMiddleware { authorize(req, res, next) { const authHeader = req.headers['authorization']; const token = authHeader && authHeader.split(' ')[1]; - if (token == null) return res.status(401).json(new Error("Invalid token")); + if (token == null) return res.status(401).json(new Error('Invalid token')); jwt.verify(token, secret, (err, user) => { - if (err) return res.status(401).json(new Error("Invalid token")); + if (err) return res.status(401).json(new Error('Invalid token')); req.userId = user.id; next(); diff --git a/src/models/entities/categoryModel.js b/src/models/entities/categoryModel.js index efd324ce..3218a760 100644 --- a/src/models/entities/categoryModel.js +++ b/src/models/entities/categoryModel.js @@ -13,8 +13,8 @@ const CategorySchema = new mongoose.Schema({ }, { timestamps: { - createdAt: "created_at", - updatedAt: "updated_at" + createdAt: 'created_at', + updatedAt: 'updated_at' } }); diff --git a/src/models/entities/itemModel.js b/src/models/entities/itemModel.js index 118a7786..25049fe7 100644 --- a/src/models/entities/itemModel.js +++ b/src/models/entities/itemModel.js @@ -26,8 +26,8 @@ const ItemSchema = new mongoose.Schema({ }, { timestamps: { - createdAt: "created_at", - updatedAt: "updated_at" + createdAt: 'created_at', + updatedAt: 'updated_at' } }); diff --git a/src/models/entities/listModel.js b/src/models/entities/listModel.js index bc084c1c..f22c2c1b 100644 --- a/src/models/entities/listModel.js +++ b/src/models/entities/listModel.js @@ -17,8 +17,8 @@ const ListSchema = new mongoose.Schema({ }, { timestamps: { - createdAt: "created_at", - updatedAt: "updated_at" + createdAt: 'created_at', + updatedAt: 'updated_at' } }); diff --git a/src/models/responses/error.js b/src/models/responses/error.js index bc49328d..54d579cf 100644 --- a/src/models/responses/error.js +++ b/src/models/responses/error.js @@ -1,6 +1,6 @@ class Error { constructor(message) { - this.status = "error"; + this.status = 'error'; this.message = message; } } diff --git a/src/models/responses/loginRespone.js b/src/models/responses/loginRespone.js deleted file mode 100644 index 35cd1c36..00000000 --- a/src/models/responses/loginRespone.js +++ /dev/null @@ -1,6 +0,0 @@ -class loginResponse { - constructor(user, token) { - this.user = user; - this.token = token; - } -} \ No newline at end of file diff --git a/src/models/responses/validationError.js b/src/models/responses/validationError.js index b2e063df..ef124a13 100644 --- a/src/models/responses/validationError.js +++ b/src/models/responses/validationError.js @@ -1,6 +1,6 @@ class validationError { constructor(field, message) { - this.status = "error"; + this.status = 'error'; this.field = field; this.message = message; } From ba8a8ba3b05144f55ed1de732bdd6d9f416bcd2b Mon Sep 17 00:00:00 2001 From: najlase Date: Thu, 6 May 2021 15:45:37 +0100 Subject: [PATCH 19/19] fixed response codes --- src/apis/categoriesApi.js | 2 +- src/apis/itemsApi.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apis/categoriesApi.js b/src/apis/categoriesApi.js index 05102fea..c8c3e12e 100644 --- a/src/apis/categoriesApi.js +++ b/src/apis/categoriesApi.js @@ -20,7 +20,7 @@ class CategoriesApi { if (validationError) return res.status(422).json(validationError); await category.save(); - res.status(201).json(category); + res.json(category); } catch (error) { next(error); } diff --git a/src/apis/itemsApi.js b/src/apis/itemsApi.js index bf2877e1..0ef3c93f 100644 --- a/src/apis/itemsApi.js +++ b/src/apis/itemsApi.js @@ -21,7 +21,7 @@ class ItemsApi { if (validationError) return res.status(422).json(validationError); await item.save(); - res.status(201).json(item); + res.json(item); } catch (error) { next(error); }