2021-1-capstone-design1 / RIT_Project1

Go to a project
Toggle navigation Toggle navigation pinning
박권수
d0feab07 2 parents 2fc943ea 6f4d55c9

Merge branch 'server' into web

Inline Side-by-side
Showing 8 changed files with 452 additions and 277 deletions
......@@ -6,7 +6,6 @@ const bodyparser = require('koa-bodyparser');
const Mongoose = require('mongoose');
const api = require('./src/api');
const updateMedicineInfo = require('./src/lib/UpdatingMedicineInfo');
const MqttServer = require('./src/util/MqttServer');
const BatchSystem = require('./src/util/Batch');
......@@ -25,7 +24,7 @@ Mongoose.connect(MONGO_URL, {
useCreateIndex : true
}).then(() => {
console.log('\x1b[1;32mMongo DB is connected : ', MONGO_URL, '\x1b[0m');
// updateMedicineInfo.updateMedicineInfo();
BatchSystem.updateMedicineData();
}).catch(e => {
console.log(e);
});
......
This diff could not be displayed because it is too large.
......@@ -17,8 +17,9 @@
"author": "박권수",
"license": "ISC",
"dependencies": {
"@google-cloud/storage": "^5.14.2",
"@koa/cors": "^3.1.0",
"firebase-admin": "^9.11.1",
"koa-body": "^4.2.0",
"moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"mqtt": "^4.2.6",
......
......@@ -7,6 +7,8 @@ const Joi = require('joi');
const jwt = require('jsonwebtoken');
const axios = require('axios');
const { Storage } = require('@google-cloud/storage');
const GoogleStorageUrl = 'https://storage.googleapis.com/';
exports.register = async(ctx) => {
const {
......@@ -95,17 +97,38 @@ exports.doctorRegister = async ctx => {
userId,
password,
passwordCheck,
info,
contact,
hospitalNm,
hospitalAddr,
doctorType,
doctorNm,
} = ctx.request.body;
const { doctorInfoFile } = ctx.request.files;
const info = {
contact,
hospitalAddr,
hospitalNm,
doctorType,
doctorNm,
doctorLicense : '',
};
const schema = Joi.object().keys({
userId : Joi.string().email().max(50).required(),
password : Joi.string().required(),
passwordCheck : Joi.string().required(),
info : Joi.object().required(),
})
const result = schema.validate(ctx.request.body);
doctorInfoFile : Joi.object().required(),
});
const result = schema.validate({
userId,
password,
passwordCheck,
doctorInfoFile,
});
if(result.error || password !== passwordCheck) {
ctx.status = 400;
ctx.body = {
......@@ -145,19 +168,31 @@ exports.doctorRegister = async ctx => {
});
await doctor.setPassword(password);
doctor.save();
const doctorInfo = new DoctorInfo({
doctorId : userId,
info,
useYn : 'W',
});
const destination = userId + '_' + doctorInfoFile.name;
const storage = new Storage();
storage.bucket('doctor-info').upload(doctorInfoFile.path, {
destination,
}, (err, file, res) => {
if(err) console.log('Fail to upload Doctor License');
else {
info.doctorLicense = GoogleStorageUrl + `${res.bucket}/${res.name}`;
console.log('Success to Upload Doctor License!');
}
doctor.save();
doctorInfo.save();
const doctorInfo = new DoctorInfo({
doctorId : userId,
info,
useYn : 'W',
});
doctorInfo.save();
});
ctx.status = 201;
}
exports.login = async(ctx) => {
......
const Router = require('koa-router')
const KoaBody = require('koa-body')({multipart : true});
const authCtrl = require('./auth.ctrl')
const auth = new Router()
......@@ -22,10 +23,10 @@ auth.get('/hospital', authCtrl.searchHospital);
/**
* 회원가입 (email type) : 의사 회원가입
* url : http://localhost:4000/api/auth/register/doctor
* request parameter : userId, password, passwordCheck, doctorInfo
* request parameter : userId, password, passwordCheck, doctorInfo(File)
* return : null
*/
auth.post('/register/doctor', authCtrl.doctorRegister)
auth.post('/register/doctor', KoaBody, authCtrl.doctorRegister)
/**
* 로그인 (email type)
......
const User = require('../../models/user');
const DoctorInfo = require('../../models/doctorInfo');
const Profile = require('../../models/profile');
const jwt = require('jsonwebtoken');
const { Storage } = require('@google-cloud/storage');
/**
* 의사 회원가입을 요청한 회원 리스트를 확인한다.
* http methods : get
......@@ -108,9 +110,25 @@ exports.getDoctorRegReqDetail = async ctx => {
return;
}
const fileName = doctorInfo.info.doctorLicense.split('/').pop();
const file = new Storage().bucket('doctor-info').file(fileName);
const option = {
version : 'v4',
expires : Date.now() + 1000 * 60 * 15,
action : 'read',
};
const [signedUrl] = file ? await file.getSignedUrl(option) : [''];
ctx.status = 200;
ctx.body = {
doctorInfo,
doctorInfo : {
...doctorInfo._doc,
info : {
...doctorInfo.info,
doctorLicense : signedUrl,
},
},
};
} catch (e) {
......
......@@ -13,6 +13,8 @@
const Hub = require('../models/hub');
const Bottle = require('../models/bottle');
const BottleMedicine = require('../models/bottleMedicine');
const updateMedicineInfo = require('../lib/UpdatingMedicineInfo');
// //매년 1월 1일 00시 00분에 1살씩 추가
......@@ -28,9 +30,16 @@
// timezone : 'Asia/Tokyo',
// });
// };
//dosage에 따라, Push Notification을 발송한다.
//아침 8시, 점심 12시, 저녁 6시에 한번씩 발송
//매월 1일 0시 0분에 약 정보 업데이트
exports.updateMedicineData = async () => {
cron.schedule('0 0 0 1 * *', () => {
updateMedicineInfo.updateMedicineInfo();
});
};
//dosage에 따라, Push Notification을 발송한다.
//아침 8시, 점심 12시, 저녁 6시에 한번씩 발송
exports.PushNotifyByDosage = async() => {
//매일 아침 8시 : 복용량 상관 없이 보냄
......
......@@ -38,61 +38,6 @@
"minimatch" "^3.0.4"
"strip-json-comments" "^3.1.1"
"@firebase/app-types@0.6.3":
"integrity" "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw=="
"resolved" "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz"
"version" "0.6.3"
"@firebase/app-types@0.x":
"integrity" "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="
"resolved" "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz"
"version" "0.7.0"
"@firebase/auth-interop-types@0.1.6":
"integrity" "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g=="
"resolved" "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz"
"version" "0.1.6"
"@firebase/component@0.5.5":
"integrity" "sha512-L41SdS/4a164jx2iGfakJgaBUPPBI3DI+RrUlmh3oHSUljTeCwfj/Nhcv3S7e2lyXsGFJtAyepfPUx4IQ05crw=="
"resolved" "https://registry.npmjs.org/@firebase/component/-/component-0.5.5.tgz"
"version" "0.5.5"
dependencies:
"@firebase/util" "1.2.0"
"tslib" "^2.1.0"
"@firebase/database-types@^0.7.2", "@firebase/database-types@0.7.3":
"integrity" "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A=="
"resolved" "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz"
"version" "0.7.3"
dependencies:
"@firebase/app-types" "0.6.3"
"@firebase/database@^0.10.0":
"integrity" "sha512-Jxi9SiE4cNOftO9YKlG71ccyWFw4kSM9AG/xYu6vWXUGBr39Uw1TvYougANOcU21Q0TP4J08VPGnOnpXk/FGbQ=="
"resolved" "https://registry.npmjs.org/@firebase/database/-/database-0.10.9.tgz"
"version" "0.10.9"
dependencies:
"@firebase/auth-interop-types" "0.1.6"
"@firebase/component" "0.5.5"
"@firebase/database-types" "0.7.3"
"@firebase/logger" "0.2.6"
"@firebase/util" "1.2.0"
"faye-websocket" "0.11.3"
"tslib" "^2.1.0"
"@firebase/logger@0.2.6":
"integrity" "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw=="
"resolved" "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz"
"version" "0.2.6"
"@firebase/util@1.2.0", "@firebase/util@1.x":
"integrity" "sha512-8W9TTGImXr9cu+oyjBJ7yjoEd/IVAv0pBZA4c1uIuKrpGZi2ee38m+8xlZOBRmsAaOU/tR9DXz1WF/oeM6Fb7Q=="
"resolved" "https://registry.npmjs.org/@firebase/util/-/util-1.2.0.tgz"
"version" "1.2.0"
dependencies:
"tslib" "^2.1.0"
"@google-cloud/common@^3.7.0":
"integrity" "sha512-5Q9f74IbZaY6xAwJSNFy5SrGwbm1j7mpv+6A/r+K2dymjsXBH5UauB0tziaMwWoVVaMq1IQnZF9lgtfqqvxcUg=="
"resolved" "https://registry.npmjs.org/@google-cloud/common/-/common-3.7.2.tgz"
......@@ -108,38 +53,28 @@
"retry-request" "^4.2.2"
"teeny-request" "^7.0.0"
"@google-cloud/firestore@^4.5.0":
"integrity" "sha512-2PWsCkEF1W02QbghSeRsNdYKN1qavrHBP3m72gPDMHQSYrGULOaTi7fSJquQmAtc4iPVB2/x6h80rdLHTATQtA=="
"resolved" "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.15.1.tgz"
"version" "4.15.1"
dependencies:
"fast-deep-equal" "^3.1.1"
"functional-red-black-tree" "^1.0.1"
"google-gax" "^2.24.1"
"protobufjs" "^6.8.6"
"@google-cloud/paginator@^3.0.0":
"integrity" "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw=="
"resolved" "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz"
"version" "3.0.5"
"integrity" "sha512-XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ=="
"resolved" "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.6.tgz"
"version" "3.0.6"
dependencies:
"arrify" "^2.0.0"
"extend" "^3.0.2"
"@google-cloud/projectify@^2.0.0":
"integrity" "sha512-qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA=="
"resolved" "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz"
"version" "2.1.0"
"integrity" "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="
"resolved" "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"
"version" "2.1.1"
"@google-cloud/promisify@^2.0.0":
"integrity" "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="
"resolved" "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz"
"version" "2.0.3"
"integrity" "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="
"resolved" "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"
"version" "2.0.4"
"@google-cloud/storage@^5.3.0":
"integrity" "sha512-tc8IrD1ZfKOm0WoC2r3+YG8K7NdaxsubedM3KYOf0m2QqqD4j9gYuEqIegs+jGoV2fr1XMibb9g/4DLp5Sv5kg=="
"resolved" "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.14.0.tgz"
"version" "5.14.0"
"@google-cloud/storage@^5.14.2":
"integrity" "sha512-mO2OV2J5eHWtYbjYjqIzOnucZ0wxxVTS6PYU0v1Cfa3iNWRD6oiv+OUvSz6FCifrJHgGuqb9J4kR9N6x72C7nw=="
"resolved" "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.14.2.tgz"
"version" "5.14.2"
dependencies:
"@google-cloud/common" "^3.7.0"
"@google-cloud/paginator" "^3.0.0"
......@@ -161,24 +96,6 @@
"stream-events" "^1.0.1"
"xdg-basedir" "^4.0.0"
"@grpc/grpc-js@~1.3.0":
"integrity" "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="
"resolved" "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"
"version" "1.3.7"
dependencies:
"@types/node" ">=12.12.47"
"@grpc/proto-loader@^0.6.1":
"integrity" "sha512-7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="
"resolved" "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"
"version" "0.6.4"
dependencies:
"@types/long" "^4.0.1"
"lodash.camelcase" "^4.3.0"
"long" "^4.0.0"
"protobufjs" "^6.10.0"
"yargs" "^16.1.1"
"@humanwhocodes/config-array@^0.5.0":
"integrity" "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="
"resolved" "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
......@@ -200,151 +117,23 @@
dependencies:
"vary" "^1.1.2"
"@panva/asn1.js@^1.0.0":
"integrity" "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw=="
"resolved" "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz"
"version" "1.0.0"
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
"integrity" "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
"resolved" "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"
"version" "1.1.2"
"@protobufjs/base64@^1.1.2":
"integrity" "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
"resolved" "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"
"version" "1.1.2"
"@protobufjs/codegen@^2.0.4":
"integrity" "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
"resolved" "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"
"version" "2.0.4"
"@protobufjs/eventemitter@^1.1.0":
"integrity" "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
"resolved" "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"
"version" "1.1.0"
"@protobufjs/fetch@^1.1.0":
"integrity" "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU="
"resolved" "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"
"version" "1.1.0"
dependencies:
"@protobufjs/aspromise" "^1.1.1"
"@protobufjs/inquire" "^1.1.0"
"@protobufjs/float@^1.0.2":
"integrity" "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
"resolved" "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"
"version" "1.0.2"
"@protobufjs/inquire@^1.1.0":
"integrity" "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
"resolved" "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"
"version" "1.1.0"
"@protobufjs/path@^1.1.2":
"integrity" "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
"resolved" "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"
"version" "1.1.2"
"@protobufjs/pool@^1.1.0":
"integrity" "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
"resolved" "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"
"version" "1.1.0"
"@protobufjs/utf8@^1.1.0":
"integrity" "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
"resolved" "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
"version" "1.1.0"
"@tootallnate/once@1":
"integrity" "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
"resolved" "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"
"version" "1.1.2"
"@types/body-parser@*":
"integrity" "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="
"resolved" "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"
"version" "1.19.1"
dependencies:
"@types/connect" "*"
"@types/node" "*"
"@types/connect@*":
"integrity" "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
"resolved" "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
"version" "3.4.35"
dependencies:
"@types/node" "*"
"@types/express-jwt@0.0.42":
"integrity" "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="
"resolved" "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"
"version" "0.0.42"
dependencies:
"@types/express" "*"
"@types/express-unless" "*"
"@types/express-serve-static-core@^4.17.18":
"integrity" "sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="
"resolved" "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"
"version" "4.17.24"
dependencies:
"@types/node" "*"
"@types/qs" "*"
"@types/range-parser" "*"
"@types/express-unless@*":
"integrity" "sha512-Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ=="
"resolved" "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.2.tgz"
"version" "0.5.2"
dependencies:
"@types/express" "*"
"@types/express@*":
"integrity" "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="
"resolved" "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"
"version" "4.17.13"
dependencies:
"@types/body-parser" "*"
"@types/express-serve-static-core" "^4.17.18"
"@types/qs" "*"
"@types/serve-static" "*"
"@types/long@^4.0.0", "@types/long@^4.0.1":
"integrity" "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
"resolved" "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz"
"version" "4.0.1"
"@types/mime@^1":
"integrity" "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
"resolved" "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"
"version" "1.3.2"
"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
"integrity" "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
"resolved" "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz"
"version" "16.7.13"
"@types/qs@*":
"integrity" "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
"resolved" "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"
"version" "6.9.7"
"@types/range-parser@*":
"integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
"resolved" "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"
"@types/formidable@^1.0.31":
"integrity" "sha512-Z+ICLPV/BPYK5pHYDryNKRk26etA9WCicg620XZM0Uqto5gOv6XySMIlXQ3Ae6V3tS7CZNpE8UdHuuxOZxWVfw=="
"resolved" "https://registry.npmjs.org/@types/formidable/-/formidable-1.2.4.tgz"
"version" "1.2.4"
"@types/serve-static@*":
"integrity" "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="
"resolved" "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"
"version" "1.13.10"
dependencies:
"@types/mime" "^1"
"@types/node" "*"
"@types/node@*":
"integrity" "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
"resolved" "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz"
"version" "16.9.2"
"abort-controller@^3.0.0":
"integrity" "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="
"resolved" "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
......@@ -487,6 +276,19 @@
"base64-js" "^1.3.1"
"ieee754" "^1.1.13"
"bytes@3.1.0":
"integrity" "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
"resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"
"version" "3.1.0"
"call-bind@^1.0.0":
"integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
"resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
"version" "1.0.2"
dependencies:
"function-bind" "^1.1.1"
"get-intrinsic" "^1.0.2"
"callback-stream@^1.0.2":
"integrity" "sha1-RwGlEmbwbgbqpx/BcjOCLYdfSQg="
"resolved" "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"
......@@ -517,14 +319,15 @@
"ansi-styles" "^4.1.0"
"supports-color" "^7.1.0"
"cliui@^7.0.2":
"integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="
"resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
"version" "7.0.4"
"co-body@^5.1.1":
"integrity" "sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ=="
"resolved" "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz"
"version" "5.2.0"
dependencies:
"string-width" "^4.2.0"
"strip-ansi" "^6.0.0"
"wrap-ansi" "^7.0.0"
"inflation" "^2.0.0"
"qs" "^6.4.0"
"raw-body" "^2.2.0"
"type-is" "^1.6.14"
"color-convert@^1.9.0":
"integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
......@@ -616,10 +419,10 @@
"resolved" "https://registry.npmjs.org/date-and-time/-/date-and-time-2.0.0.tgz"
"version" "2.0.0"
"debug@^4.0.1", "debug@^4.1.1", "debug@^4.3.2", "debug@4":
"integrity" "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="
"resolved" "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
"version" "4.3.2"
"debug@^4.0.1", "debug@^4.1.1", "debug@4":
"integrity" "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="
"resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"
"version" "4.3.1"
dependencies:
"ms" "2.1.2"
......@@ -628,12 +431,10 @@
"resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
"version" "0.1.3"
"dicer@^0.3.0":
"integrity" "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA=="
"resolved" "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz"
"version" "0.3.0"
dependencies:
"streamsearch" "0.1.2"
"depd@~1.1.2":
"integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
"resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
"version" "1.1.2"
"doctrine@^3.0.0":
"integrity" "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="
......@@ -700,11 +501,6 @@
"resolved" "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
"version" "2.2.0"
"escalade@^3.1.1":
"integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
"resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
"version" "3.1.1"
"escape-string-regexp@^1.0.5":
"integrity" "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
"resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
......@@ -754,6 +550,9 @@
"@eslint/eslintrc" "^0.4.3"
"@humanwhocodes/config-array" "^0.5.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> server
"ajv" "^6.10.0"
"chalk" "^4.0.0"
"cross-spawn" "^7.0.2"
......@@ -865,11 +664,16 @@
"resolved" "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
"version" "2.0.6"
<<<<<<< HEAD
"fast-text-encoding@^1.0.0", "fast-text-encoding@^1.0.3":
=======
"fast-text-encoding@^1.0.0":
>>>>>>> server
"integrity" "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
"resolved" "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"
"version" "1.0.3"
<<<<<<< HEAD
"faye-websocket@0.11.3":
"integrity" "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="
"resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"
......@@ -877,6 +681,8 @@
dependencies:
"websocket-driver" ">=0.5.1"
=======
>>>>>>> server
"file-entry-cache@^6.0.1":
"integrity" "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="
"resolved" "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
......@@ -884,6 +690,7 @@
dependencies:
"flat-cache" "^3.0.4"
<<<<<<< HEAD
"firebase-admin@^9.11.1":
"integrity" "sha512-Y9fjelljy6MKqwsSbM/UN1k8gBQh5zfm5fCTe0Z6Gch2T3nDUIPsTcf+jfe4o40/MPYuybili9XJjTMmM2e5MQ=="
"resolved" "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.11.1.tgz"
......@@ -900,6 +707,8 @@
"@google-cloud/firestore" "^4.5.0"
"@google-cloud/storage" "^5.3.0"
=======
>>>>>>> server
"flat-cache@^3.0.4":
"integrity" "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="
"resolved" "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
......@@ -913,20 +722,42 @@
"resolved" "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"
"version" "3.2.2"
<<<<<<< HEAD
=======
"formidable@^1.1.1":
"integrity" "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="
"resolved" "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"
"version" "1.2.2"
>>>>>>> server
"fs.realpath@^1.0.0":
"integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
"version" "1.0.0"
<<<<<<< HEAD
=======
"function-bind@^1.1.1":
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
"version" "1.1.1"
>>>>>>> server
"functional-red-black-tree@^1.0.1":
"integrity" "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
"resolved" "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
"version" "1.0.1"
"gaxios@^4.0.0":
<<<<<<< HEAD
"integrity" "sha512-9qXV7yrMCGzTrphl9/YGMVH41oSg0rhn1j3wJWed4Oqk45/hXDD2wBT5J1NjQcqTCcv4g3nFnyQ7reSRHNgBgw=="
"resolved" "https://registry.npmjs.org/gaxios/-/gaxios-4.3.1.tgz"
"version" "4.3.1"
=======
"integrity" "sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q=="
"resolved" "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz"
"version" "4.3.2"
>>>>>>> server
dependencies:
"abort-controller" "^3.0.0"
"extend" "^3.0.2"
......@@ -955,10 +786,21 @@
"pumpify" "^2.0.0"
"stream-events" "^1.0.4"
<<<<<<< HEAD
"get-caller-file@^2.0.5":
"integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
"resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
"version" "2.0.5"
=======
"get-intrinsic@^1.0.2":
"integrity" "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="
"resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
"version" "1.1.1"
dependencies:
"function-bind" "^1.1.1"
"has" "^1.0.3"
"has-symbols" "^1.0.1"
>>>>>>> server
"get-stream@^6.0.0":
"integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
......@@ -1015,10 +857,17 @@
dependencies:
"type-fest" "^0.20.2"
<<<<<<< HEAD
"google-auth-library@^7.0.0", "google-auth-library@^7.0.2", "google-auth-library@^7.6.1":
"integrity" "sha512-cWGykH2WBR+UuYPGRnGVZ6Cjq2ftQiEIFjQWNIRIauZH7hUWoYTr/lkKUqLTYt5dex77nlWWVQ8aPV80mhfp5w=="
"resolved" "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.1.tgz"
"version" "7.9.1"
=======
"google-auth-library@^7.0.0", "google-auth-library@^7.0.2":
"integrity" "sha512-HjxbJt660a+YUTYAgYor87JCuBZvjUSNBExk4bXTEaMuCn8IHSDeHmFxKqThuDPrLCiKJp8blk/Ze8f7SI4N6g=="
"resolved" "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.2.tgz"
"version" "7.9.2"
>>>>>>> server
dependencies:
"arrify" "^2.0.0"
"base64-js" "^1.3.0"
......@@ -1030,6 +879,7 @@
"jws" "^4.0.0"
"lru-cache" "^6.0.0"
<<<<<<< HEAD
"google-gax@^2.24.1":
"integrity" "sha512-s2V5UA/M5or7PFMpsp159X1FrWgIJZ2TSp+k57giUsiS+idMTtKoVgZ+LI59+UyOkFuDg7IBLRcBwZ1TgavEBw=="
"resolved" "https://registry.npmjs.org/google-gax/-/google-gax-2.25.0.tgz"
......@@ -1049,6 +899,8 @@
"protobufjs" "6.11.2"
"retry-request" "^4.0.0"
=======
>>>>>>> server
"google-p12-pem@^3.0.3":
"integrity" "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="
"resolved" "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz"
......@@ -1080,6 +932,21 @@
"resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
"version" "4.0.0"
<<<<<<< HEAD
=======
"has-symbols@^1.0.1":
"integrity" "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
"resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
"version" "1.0.2"
"has@^1.0.3":
"integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
"resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
"version" "1.0.3"
dependencies:
"function-bind" "^1.1.1"
>>>>>>> server
"hash-stream-validation@^0.2.2":
"integrity" "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ=="
"resolved" "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz"
......@@ -1095,10 +962,23 @@
"through2" "^2.0.1"
"xtend" "^4.0.0"
<<<<<<< HEAD
"http-parser-js@>=0.5.1":
"integrity" "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
"resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"
"version" "0.5.3"
=======
"http-errors@1.7.3":
"integrity" "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="
"resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"
"version" "1.7.3"
dependencies:
"depd" "~1.1.2"
"inherits" "2.0.4"
"setprototypeof" "1.1.1"
"statuses" ">= 1.5.0 < 2"
"toidentifier" "1.0.0"
>>>>>>> server
"http-proxy-agent@^4.0.0":
"integrity" "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="
......@@ -1117,6 +997,16 @@
"agent-base" "6"
"debug" "4"
<<<<<<< HEAD
=======
"iconv-lite@0.4.24":
"integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
"resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
"version" "0.4.24"
dependencies:
"safer-buffer" ">= 2.1.2 < 3"
>>>>>>> server
"ieee754@^1.1.13":
"integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
"resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
......@@ -1140,6 +1030,14 @@
"resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
"version" "0.1.4"
<<<<<<< HEAD
=======
"inflation@^2.0.0":
"integrity" "sha1-i0F+R8KPklpFEz2RTKH9OJEH8w8="
"resolved" "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"
"version" "2.0.0"
>>>>>>> server
"inflight@^1.0.4":
"integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
"resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
......@@ -1148,7 +1046,11 @@
"once" "^1.3.0"
"wrappy" "1"
<<<<<<< HEAD
"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.3", "inherits@2":
=======
"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4":
>>>>>>> server
"integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
"resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
"version" "2.0.4"
......@@ -1202,11 +1104,14 @@
dependencies:
"is-unc-path" "^1.0.0"
<<<<<<< HEAD
"is-stream-ended@^0.1.4":
"integrity" "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="
"resolved" "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"
"version" "0.1.4"
=======
>>>>>>> server
"is-stream@^2.0.0":
"integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
"resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
......@@ -1239,6 +1144,7 @@
"resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
"version" "2.0.0"
<<<<<<< HEAD
"jose@^2.0.5":
"integrity" "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA=="
"resolved" "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz"
......@@ -1246,6 +1152,8 @@
dependencies:
"@panva/asn1.js" "^1.0.0"
=======
>>>>>>> server
"js-tokens@^4.0.0":
"integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
"resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
......@@ -1281,6 +1189,7 @@
"resolved" "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
"version" "1.0.1"
<<<<<<< HEAD
"jsonwebtoken@^8.5.1":
"integrity" "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="
"resolved" "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"
......@@ -1306,6 +1215,8 @@
"ecdsa-sig-formatter" "1.0.11"
"safe-buffer" "^5.0.1"
=======
>>>>>>> server
"jwa@^2.0.0":
"integrity" "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="
"resolved" "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"
......@@ -1315,6 +1226,7 @@
"ecdsa-sig-formatter" "1.0.11"
"safe-buffer" "^5.0.1"
<<<<<<< HEAD
"jwks-rsa@^2.0.2":
"integrity" "sha512-iJqVCECYZZ+3oPmY1qXv3Fq+3ywDtuNEVBvG41pPlaR0zyGxa12nC0beAOBBUhETJmc05puS50mRQN4NkCGhmg=="
"resolved" "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.4.tgz"
......@@ -1334,6 +1246,8 @@
"jwa" "^1.4.1"
"safe-buffer" "^5.0.1"
=======
>>>>>>> server
"jws@^4.0.0":
"integrity" "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="
"resolved" "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"
......@@ -1342,6 +1256,18 @@
"jwa" "^2.0.0"
"safe-buffer" "^5.0.1"
<<<<<<< HEAD
=======
"koa-body@^4.2.0":
"integrity" "sha512-wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA=="
"resolved" "https://registry.npmjs.org/koa-body/-/koa-body-4.2.0.tgz"
"version" "4.2.0"
dependencies:
"@types/formidable" "^1.0.31"
"co-body" "^5.1.1"
"formidable" "^1.1.1"
>>>>>>> server
"leven@^2.1.0":
"integrity" "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
"resolved" "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"
......@@ -1355,6 +1281,7 @@
"prelude-ls" "^1.2.1"
"type-check" "~0.4.0"
<<<<<<< HEAD
"limiter@^1.1.5":
"integrity" "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
"resolved" "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"
......@@ -1365,11 +1292,14 @@
"resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
"version" "4.3.0"
=======
>>>>>>> server
"lodash.clonedeep@^4.5.0":
"integrity" "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
"resolved" "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
"version" "4.5.0"
<<<<<<< HEAD
"lodash.includes@^4.3.0":
"integrity" "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
"resolved" "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"
......@@ -1400,26 +1330,34 @@
"resolved" "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"
"version" "4.0.1"
=======
>>>>>>> server
"lodash.merge@^4.6.2":
"integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
"resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
"version" "4.6.2"
<<<<<<< HEAD
"lodash.once@^4.0.0":
"integrity" "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
"resolved" "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"
"version" "4.1.1"
=======
>>>>>>> server
"lodash.truncate@^4.4.2":
"integrity" "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
"resolved" "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
"version" "4.4.2"
<<<<<<< HEAD
"long@^4.0.0":
"integrity" "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
"resolved" "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
"version" "4.0.0"
=======
>>>>>>> server
"lru-cache@^6.0.0":
"integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
"resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
......@@ -1427,6 +1365,7 @@
dependencies:
"yallist" "^4.0.0"
<<<<<<< HEAD
"lru-cache@~4.0.0":
"integrity" "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4="
"resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"
......@@ -1443,6 +1382,8 @@
"lodash.clonedeep" "^4.5.0"
"lru-cache" "~4.0.0"
=======
>>>>>>> server
"make-dir@^3.0.0":
"integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="
"resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
......@@ -1450,12 +1391,24 @@
dependencies:
"semver" "^6.0.0"
<<<<<<< HEAD
=======
"media-typer@0.3.0":
"integrity" "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
"resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
"version" "0.3.0"
>>>>>>> server
"mime-db@>= 1.43.0 < 2", "mime-db@1.49.0":
"integrity" "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
"resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"
"version" "1.49.0"
<<<<<<< HEAD
"mime-types@^2.0.8":
=======
"mime-types@^2.0.8", "mime-types@~2.1.24":
>>>>>>> server
"integrity" "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="
"resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"
"version" "2.1.32"
......@@ -1479,7 +1432,18 @@
"resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
"version" "1.2.5"
<<<<<<< HEAD
"moment@^2.29.1":
=======
"moment-timezone@^0.5.31", "moment-timezone@^0.5.33":
"integrity" "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="
"resolved" "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz"
"version" "0.5.33"
dependencies:
"moment" ">= 2.9.0"
"moment@^2.29.1", "moment@>= 2.9.0":
>>>>>>> server
"integrity" "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
"resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
"version" "2.29.1"
......@@ -1512,7 +1476,11 @@
"ws" "^7.3.1"
"xtend" "^4.0.2"
<<<<<<< HEAD
"ms@^2.1.1", "ms@2.1.2":
=======
"ms@2.1.2":
>>>>>>> server
"integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
"resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
"version" "2.1.2"
......@@ -1522,6 +1490,16 @@
"resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
"version" "1.4.0"
<<<<<<< HEAD
=======
"node-cron@^3.0.0":
"integrity" "sha512-DDwIvvuCwrNiaU7HEivFDULcaQualDv7KoNlB/UU1wPW0n1tDEmBJKhEIE6DlF2FuoOHcNbLJ8ITL2Iv/3AWmA=="
"resolved" "https://registry.npmjs.org/node-cron/-/node-cron-3.0.0.tgz"
"version" "3.0.0"
dependencies:
"moment-timezone" "^0.5.31"
>>>>>>> server
"node-fetch@^2.6.1":
"integrity" "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
"resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz"
......@@ -1532,10 +1510,17 @@
"resolved" "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
"version" "0.10.0"
<<<<<<< HEAD
"object-hash@^2.1.1":
"integrity" "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
"resolved" "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
"version" "2.2.0"
=======
"object-inspect@^1.9.0":
"integrity" "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
"resolved" "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"
"version" "1.11.0"
>>>>>>> server
"once@^1.3.0", "once@^1.3.1", "once@^1.4.0":
"integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
......@@ -1607,6 +1592,7 @@
"resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
"version" "2.0.3"
<<<<<<< HEAD
"proto3-json-serializer@^0.1.1":
"integrity" "sha512-X0DAtxCBsy1NDn84huVFGOFgBslT2gBmM+85nY6/5SOAaCon1jzVNdvi74foIyFvs5CjtSbQsepsM5TsyNhqQw=="
"resolved" "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.3.tgz"
......@@ -1636,6 +1622,8 @@
"resolved" "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
"version" "1.0.2"
=======
>>>>>>> server
"pump@^2.0.0":
"integrity" "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="
"resolved" "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
......@@ -1675,6 +1663,26 @@
"resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
"version" "2.1.1"
<<<<<<< HEAD
=======
"qs@^6.4.0":
"integrity" "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="
"resolved" "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"
"version" "6.10.1"
dependencies:
"side-channel" "^1.0.4"
"raw-body@^2.2.0":
"integrity" "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="
"resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"
"version" "2.4.1"
dependencies:
"bytes" "3.1.0"
"http-errors" "1.7.3"
"iconv-lite" "0.4.24"
"unpipe" "1.0.0"
>>>>>>> server
"readable-stream@^2.0.0":
"integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="
"resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
......@@ -1764,11 +1772,14 @@
"resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
"version" "1.1.0"
<<<<<<< HEAD
"require-directory@^2.1.1":
"integrity" "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
"resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
"version" "2.1.1"
=======
>>>>>>> server
"require-from-string@^2.0.2":
"integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
"resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
......@@ -1779,7 +1790,11 @@
"resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
"version" "4.0.0"
<<<<<<< HEAD
"retry-request@^4.0.0", "retry-request@^4.2.2":
=======
"retry-request@^4.2.2":
>>>>>>> server
"integrity" "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="
"resolved" "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"
"version" "4.2.2"
......@@ -1799,7 +1814,11 @@
dependencies:
"glob" "^7.1.3"
<<<<<<< HEAD
"safe-buffer@^5.0.1", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0":
=======
"safe-buffer@^5.0.1", "safe-buffer@~5.2.0":
>>>>>>> server
"integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
"resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
"version" "5.2.1"
......@@ -1809,10 +1828,17 @@
"resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
"version" "5.1.2"
<<<<<<< HEAD
"semver@^5.6.0":
"integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
"resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
"version" "5.7.1"
=======
"safer-buffer@>= 2.1.2 < 3":
"integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
"resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
"version" "2.1.2"
>>>>>>> server
"semver@^6.0.0":
"integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
......@@ -1826,6 +1852,14 @@
dependencies:
"lru-cache" "^6.0.0"
<<<<<<< HEAD
=======
"setprototypeof@1.1.1":
"integrity" "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
"resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"
"version" "1.1.1"
>>>>>>> server
"shebang-command@^2.0.0":
"integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
"resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
......@@ -1838,10 +1872,26 @@
"resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
"version" "3.0.0"
<<<<<<< HEAD
"signal-exit@^3.0.2":
"integrity" "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
"resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
"version" "3.0.3"
=======
"side-channel@^1.0.4":
"integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
"resolved" "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
"version" "1.0.4"
dependencies:
"call-bind" "^1.0.0"
"get-intrinsic" "^1.0.2"
"object-inspect" "^1.9.0"
"signal-exit@^3.0.2":
"integrity" "sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="
"resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"
"version" "3.0.4"
>>>>>>> server
"slice-ansi@^4.0.0":
"integrity" "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="
......@@ -1869,6 +1919,14 @@
"resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
"version" "1.0.3"
<<<<<<< HEAD
=======
"statuses@>= 1.5.0 < 2":
"integrity" "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
"resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
"version" "1.5.0"
>>>>>>> server
"stream-events@^1.0.1", "stream-events@^1.0.4", "stream-events@^1.0.5":
"integrity" "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg=="
"resolved" "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz"
......@@ -1881,11 +1939,14 @@
"resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
"version" "1.0.1"
<<<<<<< HEAD
"streamsearch@0.1.2":
"integrity" "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
"resolved" "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"
"version" "0.1.2"
=======
>>>>>>> server
"string_decoder@^1.1.1":
"integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
"resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
......@@ -1900,7 +1961,11 @@
dependencies:
"safe-buffer" "~5.1.0"
<<<<<<< HEAD
"string-width@^4.1.0", "string-width@^4.2.0":
=======
"string-width@^4.2.0":
>>>>>>> server
"integrity" "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="
"resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"
"version" "4.2.2"
......@@ -1953,9 +2018,15 @@
"strip-ansi" "^6.0.0"
"teeny-request@^7.0.0":
<<<<<<< HEAD
"integrity" "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg=="
"resolved" "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz"
"version" "7.1.1"
=======
"integrity" "sha512-Mr4NYZuniKDpgcLxdBkDE1CcWy98Aw1ennn6oNofen+XWUvDs+ZZzBAujy6XOAVwwLLZMwEQSfdljUI+ebs4Ww=="
"resolved" "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.2.tgz"
"version" "7.1.2"
>>>>>>> server
dependencies:
"http-proxy-agent" "^4.0.0"
"https-proxy-agent" "^5.0.0"
......@@ -1992,10 +2063,17 @@
"is-absolute" "^1.0.0"
"is-negated-glob" "^1.0.0"
<<<<<<< HEAD
"tslib@^2.1.0":
"integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
"resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
"version" "2.3.1"
=======
"toidentifier@1.0.0":
"integrity" "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
"resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"
"version" "1.0.0"
>>>>>>> server
"type-check@^0.4.0", "type-check@~0.4.0":
"integrity" "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="
......@@ -2009,6 +2087,17 @@
"resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
"version" "0.20.2"
<<<<<<< HEAD
=======
"type-is@^1.6.14":
"integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
"resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
"version" "1.6.18"
dependencies:
"media-typer" "0.3.0"
"mime-types" "~2.1.24"
>>>>>>> server
"typedarray-to-buffer@^3.1.5":
"integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="
"resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
......@@ -2041,6 +2130,14 @@
dependencies:
"crypto-random-string" "^2.0.0"
<<<<<<< HEAD
=======
"unpipe@1.0.0":
"integrity" "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
"resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
"version" "1.0.0"
>>>>>>> server
"uri-js@^4.2.2":
"integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
"resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
......@@ -2068,6 +2165,7 @@
"resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
"version" "1.1.2"
<<<<<<< HEAD
"websocket-driver@>=0.5.1":
"integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
"resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
......@@ -2082,6 +2180,8 @@
"resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
"version" "0.1.4"
=======
>>>>>>> server
"which@^2.0.1":
"integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
"resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
......@@ -2094,6 +2194,7 @@
"resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
"version" "1.2.3"
<<<<<<< HEAD
"wrap-ansi@^7.0.0":
"integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
"resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
......@@ -2103,6 +2204,8 @@
"string-width" "^4.1.0"
"strip-ansi" "^6.0.0"
=======
>>>>>>> server
"wrappy@1":
"integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
"resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
......@@ -2133,6 +2236,7 @@
"resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
"version" "4.0.2"
<<<<<<< HEAD
"y18n@^5.0.5":
"integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
"resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
......@@ -2143,11 +2247,14 @@
"resolved" "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
"version" "2.1.2"
=======
>>>>>>> server
"yallist@^4.0.0":
"integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
"resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
"version" "4.0.0"
<<<<<<< HEAD
"yargs-parser@^20.2.2":
"integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
"resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
......@@ -2166,10 +2273,13 @@
"y18n" "^5.0.5"
"yargs-parser" "^20.2.2"
=======
>>>>>>> server
"yocto-queue@^0.1.0":
"integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
"resolved" "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
"version" "0.1.0"
<<<<<<< HEAD
=======
ajv "^6.10.0"
chalk "^4.0.0"
......@@ -2982,3 +3092,5 @@ yallist@^4.0.0:
resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
>>>>>>> server
=======
>>>>>>> server
......