From c51c8cd691d0a883c4d4fbbb1362c78a5b78520d Mon Sep 17 00:00:00 2001
From: Sander Vocke <sandervocke@gmail.com>
Date: Thu, 26 Nov 2020 23:41:36 +0100
Subject: [PATCH] Add a confirm dialog.

---
 client/src/api.ts                             |  19 +
 .../src/components/common/StoreLinkIcon.tsx   |  15 +-
 .../windows/manage_links/BatchLinkDialog.tsx  | 163 ++++++++
 .../manage_links/LinksStatusWidget.tsx        |   4 +-
 .../manage_links/ManageLinksWindow.tsx        |  65 ++--
 .../windows/song/EditSongDialog.tsx           |   3 +-
 client/src/lib/integration/Integration.tsx    |   2 +-
 .../spotify/SpotifyClientCreds.tsx            |   3 +-
 .../youtubemusic/YoutubeMusicWebScraper.tsx   |   3 +-
 server/package-lock.json                      | 359 +++++++++---------
 server/package.json                           |  12 +-
 11 files changed, 411 insertions(+), 237 deletions(-)
 create mode 100644 client/src/components/windows/manage_links/BatchLinkDialog.tsx

diff --git a/client/src/api.ts b/client/src/api.ts
index fca7f2d..898878f 100644
--- a/client/src/api.ts
+++ b/client/src/api.ts
@@ -374,6 +374,25 @@ export enum IntegrationType {
     YoutubeWebScraper = "YoutubeWebScraper",
 }
 
+export enum ExternalStore {
+    GooglePlayMusic = "Google Play Music",
+    Spotify = "Spotify",
+    YoutubeMusic = "Youtube Music",
+}
+
+// Links to external stores are identified by their domain or some
+// other unique substring. These unique substrings are stored here.
+export const StoreURLIdentifiers: Record<ExternalStore, string> = {
+    [ExternalStore.GooglePlayMusic]: 'play.google.com',
+    [ExternalStore.Spotify]: 'spotify.com',
+    [ExternalStore.YoutubeMusic]: 'music.youtube.com',
+}
+
+export const IntegrationStores: Record<IntegrationType, ExternalStore> = {
+    [IntegrationType.SpotifyClientCredentials]: ExternalStore.Spotify,
+    [IntegrationType.YoutubeWebScraper]: ExternalStore.YoutubeMusic,
+}
+
 export interface SpotifyClientCredentialsDetails {
     clientId: string,
 }
diff --git a/client/src/components/common/StoreLinkIcon.tsx b/client/src/components/common/StoreLinkIcon.tsx
index 1a8868d..b08b28b 100644
--- a/client/src/components/common/StoreLinkIcon.tsx
+++ b/client/src/components/common/StoreLinkIcon.tsx
@@ -1,26 +1,13 @@
 import React from 'react';
+import { ExternalStore, StoreURLIdentifiers } from '../../api';
 import { ReactComponent as GPMIcon } from '../../assets/googleplaymusic_icon.svg';
 import { ReactComponent as SpotifyIcon } from '../../assets/spotify_icon.svg';
 import { ReactComponent as YoutubeMusicIcon } from '../../assets/youtubemusic_icon.svg';
 
-export enum ExternalStore {
-    GooglePlayMusic = "Google Play Music",
-    Spotify = "Spotify",
-    YoutubeMusic = "Youtube Music",
-}
-
 export interface IProps {
     whichStore: ExternalStore,
 }
 
-// Links to external stores are identified by their domain or some
-// other unique substring. These unique substrings are stored here.
-export const StoreURLIdentifiers: Record<ExternalStore, string> = {
-    [ExternalStore.GooglePlayMusic]: 'play.google.com',
-    [ExternalStore.Spotify]: 'spotify.com',
-    [ExternalStore.YoutubeMusic]: 'music.youtube.com',
-}
-
 export function whichStore(url: string) {
     return Object.keys(StoreURLIdentifiers).reduce((prev: string | undefined, cur: string) => {
         if(url.includes(StoreURLIdentifiers[cur as ExternalStore])) {
diff --git a/client/src/components/windows/manage_links/BatchLinkDialog.tsx b/client/src/components/windows/manage_links/BatchLinkDialog.tsx
new file mode 100644
index 0000000..c357b7e
--- /dev/null
+++ b/client/src/components/windows/manage_links/BatchLinkDialog.tsx
@@ -0,0 +1,163 @@
+import React, { useState } from 'react';
+import { Box, Button, Checkbox, createStyles, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Divider, FormControlLabel, List, ListItem, ListItemIcon, ListItemText, makeStyles, MenuItem, Paper, Select, Theme, Typography } from "@material-ui/core";
+import StoreLinkIcon from '../../common/StoreLinkIcon';
+import { $enum } from 'ts-enum-util';
+import { IntegrationState, useIntegrations } from '../../../lib/integration/useIntegrations';
+import { ExternalStore, IntegrationStores, IntegrationType } from '../../../api';
+
+const useStyles = makeStyles((theme: Theme) =>
+    createStyles({
+        disabled: {
+            color: theme.palette.text.disabled,
+        },
+    })
+);
+
+function ConfirmDialog(props: {
+    open: boolean
+    onConfirm: () => void,
+    onClose: () => void,
+}) {
+    return <Dialog
+        open={props.open}
+        onClose={props.onClose}
+    >
+        <DialogTitle>Are you sure?</DialogTitle>
+        <DialogContent>
+            <DialogContentText>
+                This action is non-reversible.
+            </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+            <Button onClick={props.onClose} variant="outlined">Cancel</Button>
+            <Button onClick={() => { props.onClose(); props.onConfirm(); }} variant="contained">Confirm</Button>
+        </DialogActions>
+    </Dialog>
+}
+
+export default function BatchLinkDialog(props: {
+    open: boolean,
+    onClose: () => void,
+}) {
+    let integrations = useIntegrations();
+    let classes = useStyles();
+    let [confirmDialogOpen, setConfirmDialogOpen] = useState<boolean>(false);
+
+    var compatibleIntegrations: Record<ExternalStore, IntegrationState[]> = {
+        [ExternalStore.GooglePlayMusic]: [],
+        [ExternalStore.YoutubeMusic]: [],
+        [ExternalStore.Spotify]: [],
+    };
+    $enum(ExternalStore).getValues().forEach((store: ExternalStore) => {
+        compatibleIntegrations[store] = Array.isArray(integrations.state) ?
+            integrations.state.filter((i: IntegrationState) => IntegrationStores[i.properties.type] === store)
+            : [];
+    })
+
+    interface StoreSettings {
+        selectedIntegration: number | undefined, // Index into compatibleIntegrations
+        linkArtists: boolean,
+        linkSongs: boolean,
+        linkAlbums: boolean,
+    }
+
+    let [storeSettings, setStoreSettings] = useState<Record<ExternalStore, StoreSettings>>(
+        $enum(ExternalStore).getValues().reduce((prev: any, cur: ExternalStore) => {
+            return {
+                ...prev,
+                [cur]: {
+                    selectedIntegration: compatibleIntegrations[cur].length > 0 ? 0 : undefined,
+                    linkArtists: false,
+                    linkSongs: false,
+                    linkAlbums: false,
+                }
+            }
+        }, {})
+    );
+
+    let Text = (props: any) => {
+        return props.enabled ? <Typography>{props.children}</Typography> :
+            <Typography className={classes.disabled}>{props.children}</Typography>
+    }
+
+    return <>
+        <Dialog
+            maxWidth="md"
+            fullWidth
+            open={props.open}
+            onClose={props.onClose}
+            disableBackdropClick={true}>
+            <Box m={2}>
+                <Typography variant="h5">Batch linking</Typography>
+                <Typography>
+                    Using this feature, links to external websites will automatically be added to existing items
+                in your music library. This happens by using any available integrations you have configured.<br />
+                Existing links are untouched.
+        </Typography>
+                <table style={{ borderSpacing: "20px" }}>
+                    <tr>
+                        <th><Typography><b>Service</b></Typography></th>
+                        <th><Typography><b>Use Integration</b></Typography></th>
+                        <td><Typography><b>Which items</b></Typography></td>
+                    </tr>
+                    {$enum(ExternalStore).getValues().map((store: ExternalStore) => {
+                        let active = Boolean(compatibleIntegrations[store].length);
+
+                        return <tr>
+                            <td>
+                                <Box display="flex" alignItems="center" flexDirection="column">
+                                    <StoreLinkIcon whichStore={store} />
+                                    <Text enabled={active}>{store}</Text>
+                                </Box>
+                            </td>
+                            <td>
+                                {!active && <Text enabled={active}>No integrations configured.</Text>}
+                                {active && <Select fullWidth
+                                    value={storeSettings[store].selectedIntegration}
+                                    onChange={(e: any) => {
+                                        setStoreSettings({
+                                            ...storeSettings,
+                                            [store]: {
+                                                ...storeSettings[store],
+                                                selectedIntegration: e.target.value,
+                                            }
+                                        })
+                                    }}
+                                >
+                                    {compatibleIntegrations[store].map((c: IntegrationState, idx: number) => {
+                                        return <MenuItem value={idx}>{c.properties.name}</MenuItem>
+                                    })}
+                                </Select>}
+                            </td>
+                            <td>
+                                <FormControlLabel control={
+                                    <Checkbox disabled={!active} checked={storeSettings[store].linkArtists}
+                                        onChange={(e: any) => setStoreSettings((prev: any) => { return { ...prev, [store]: { ...prev[store], linkArtists: e.target.checked } } })} />
+                                } label={<Text enabled={active}>Artists</Text>} />
+                                <FormControlLabel control={
+                                    <Checkbox disabled={!active} checked={storeSettings[store].linkAlbums}
+                                        onChange={(e: any) => setStoreSettings((prev: any) => { return { ...prev, [store]: { ...prev[store], linkAlbums: e.target.checked } } })} />
+                                } label={<Text enabled={active}>Albums</Text>} />
+                                <FormControlLabel control={
+                                    <Checkbox disabled={!active} checked={storeSettings[store].linkSongs}
+                                        onChange={(e: any) => setStoreSettings((prev: any) => { return { ...prev, [store]: { ...prev[store], linkSongs: e.target.checked } } })} />
+                                } label={<Text enabled={active}>Songs</Text>} />
+                            </td>
+                        </tr>;
+                    })}
+                </table>
+                <DialogActions>
+                    <Button variant="outlined"
+                        onClick={props.onClose}>Cancel</Button>
+                    <Button variant="contained" color="secondary"
+                        onClick={() => setConfirmDialogOpen(true)}>Start</Button>
+                </DialogActions>
+            </Box>
+        </Dialog>
+        <ConfirmDialog
+            open={confirmDialogOpen}
+            onClose={() => setConfirmDialogOpen(false)}
+            onConfirm={() => { }}
+        />
+    </>
+}
\ No newline at end of file
diff --git a/client/src/components/windows/manage_links/LinksStatusWidget.tsx b/client/src/components/windows/manage_links/LinksStatusWidget.tsx
index e47fc4e..9b0c016 100644
--- a/client/src/components/windows/manage_links/LinksStatusWidget.tsx
+++ b/client/src/components/windows/manage_links/LinksStatusWidget.tsx
@@ -1,10 +1,10 @@
 import { Box, LinearProgress, Typography } from '@material-ui/core';
 import React, { useCallback, useEffect, useReducer, useState } from 'react';
 import { $enum } from 'ts-enum-util';
-import { ItemType, QueryElemProperty, QueryResponseType } from '../../../api';
+import { ExternalStore, ItemType, QueryElemProperty, QueryResponseType, StoreURLIdentifiers } from '../../../api';
 import { queryItems } from '../../../lib/backend/queries';
 import { QueryElem, QueryLeafBy, QueryLeafOp } from '../../../lib/query/Query';
-import StoreLinkIcon, { ExternalStore, StoreURLIdentifiers } from '../../common/StoreLinkIcon';
+import StoreLinkIcon from '../../common/StoreLinkIcon';
 
 var _ = require('lodash');
 
diff --git a/client/src/components/windows/manage_links/ManageLinksWindow.tsx b/client/src/components/windows/manage_links/ManageLinksWindow.tsx
index 77b1b29..4fd3a63 100644
--- a/client/src/components/windows/manage_links/ManageLinksWindow.tsx
+++ b/client/src/components/windows/manage_links/ManageLinksWindow.tsx
@@ -1,4 +1,4 @@
-import React, { useReducer } from 'react';
+import React, { useReducer, useState } from 'react';
 import { WindowState } from "../Windows";
 import { Box, Paper, Typography, TextField, Button } from "@material-ui/core";
 import { useHistory } from 'react-router';
@@ -7,6 +7,7 @@ import Alert from '@material-ui/lab/Alert';
 import { Link } from 'react-router-dom';
 import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import LinksStatusWidget from './LinksStatusWidget';
+import BatchLinkDialog from './BatchLinkDialog';
 
 export interface ManageLinksWindowState extends WindowState {
     dummy: boolean
@@ -36,27 +37,45 @@ export function ManageLinksWindowControlled(props: {
     state: ManageLinksWindowState,
     dispatch: (action: any) => void,
 }) {
-    return <Box width="100%" justifyContent="center" display="flex" flexWrap="wrap">
-        <Box
-            m={1}
-            mt={4}
-            width="80%"
-        >
-            <OpenInNewIcon style={{ fontSize: 80 }} />
-        </Box>
-        <Box
-            m={1}
-            mt={4}
-            width="80%"
-        >
-            <Typography variant="h4">Manage Links</Typography>
-        </Box>
-        <Box
-            m={1}
-            mt={4}
-            width="80%"
-        >
-            <LinksStatusWidget/>
+    let [batchDialogOpen, setBatchDialogOpen] = useState<boolean>(false);
+
+    return <>
+        <Box width="100%" justifyContent="center" display="flex" flexWrap="wrap">
+            <Box
+                m={1}
+                mt={4}
+                width="80%"
+            >
+                <OpenInNewIcon style={{ fontSize: 80 }} />
+            </Box>
+            <Box
+                m={1}
+                mt={4}
+                width="80%"
+            >
+                <Typography variant="h4">Manage Links</Typography>
+            </Box>
+            <Box
+                m={1}
+                mt={4}
+                width="80%"
+            >
+                <LinksStatusWidget />
+            </Box>
+            <Box
+                m={1}
+                mt={4}
+                width="80%"
+            >
+                <Button variant="outlined"
+                    onClick={() => { setBatchDialogOpen(true); }}>
+                        Batch linking...
+                </Button>
+            </Box>
         </Box>
-    </Box>;
+        <BatchLinkDialog
+            onClose={() => { setBatchDialogOpen(false); }}
+            open={batchDialogOpen}
+        />
+    </>
 }
\ No newline at end of file
diff --git a/client/src/components/windows/song/EditSongDialog.tsx b/client/src/components/windows/song/EditSongDialog.tsx
index 0351a91..18c3b00 100644
--- a/client/src/components/windows/song/EditSongDialog.tsx
+++ b/client/src/components/windows/song/EditSongDialog.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { AppBar, Box, Button, Dialog, DialogActions, Divider, FormControl, FormControlLabel, IconButton, Link, List, ListItem, ListItemIcon, ListItemText, MenuItem, Radio, RadioGroup, Select, Tab, Tabs, TextField, Typography } from "@material-ui/core";
 import { SongMetadata } from "./SongWindow";
-import StoreLinkIcon, { ExternalStore, whichStore } from '../../common/StoreLinkIcon';
+import StoreLinkIcon, { whichStore } from '../../common/StoreLinkIcon';
 import CheckIcon from '@material-ui/icons/Check';
 import SearchIcon from '@material-ui/icons/Search';
 import CancelIcon from '@material-ui/icons/Cancel';
@@ -12,6 +12,7 @@ import { useIntegrations, IntegrationsState, IntegrationState } from '../../../l
 import { IntegrationFeature, IntegrationSong } from '../../../lib/integration/Integration';
 import { TabPanel } from '@material-ui/lab';
 import { v1 } from 'uuid';
+import { ExternalStore } from '../../../api';
 let _ = require('lodash')
 
 export function ProvideLinksWidget(props: {
diff --git a/client/src/lib/integration/Integration.tsx b/client/src/lib/integration/Integration.tsx
index 5ab9e51..fd82f82 100644
--- a/client/src/lib/integration/Integration.tsx
+++ b/client/src/lib/integration/Integration.tsx
@@ -1,5 +1,5 @@
 import React, { ReactFragment } from 'react';
-import { ExternalStore } from '../../components/common/StoreLinkIcon';
+import { ExternalStore } from '../../api';
 
 export interface IntegrationAlbum {
     name?: string,
diff --git a/client/src/lib/integration/spotify/SpotifyClientCreds.tsx b/client/src/lib/integration/spotify/SpotifyClientCreds.tsx
index 737fe05..62d9e13 100644
--- a/client/src/lib/integration/spotify/SpotifyClientCreds.tsx
+++ b/client/src/lib/integration/spotify/SpotifyClientCreds.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import Integration, { IntegrationFeature, IntegrationAlbum, IntegrationArtist, IntegrationSong } from '../Integration';
-import StoreLinkIcon, { ExternalStore } from '../../../components/common/StoreLinkIcon';
+import StoreLinkIcon from '../../../components/common/StoreLinkIcon';
+import { ExternalStore } from '../../../api';
 
 enum SearchType {
     Song = 'track',
diff --git a/client/src/lib/integration/youtubemusic/YoutubeMusicWebScraper.tsx b/client/src/lib/integration/youtubemusic/YoutubeMusicWebScraper.tsx
index a2deb9f..ea35b1d 100644
--- a/client/src/lib/integration/youtubemusic/YoutubeMusicWebScraper.tsx
+++ b/client/src/lib/integration/youtubemusic/YoutubeMusicWebScraper.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import Integration, { IntegrationFeature, IntegrationAlbum, IntegrationArtist, IntegrationSong } from '../Integration';
-import StoreLinkIcon, { ExternalStore } from '../../../components/common/StoreLinkIcon';
+import StoreLinkIcon from '../../../components/common/StoreLinkIcon';
+import { ExternalStore } from '../../../api';
 
 enum SearchType {
     Song = 'track',
diff --git a/server/package-lock.json b/server/package-lock.json
index 13702bb..7d7bc04 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -10,9 +10,9 @@
       "integrity": "sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA=="
     },
     "@azure/ms-rest-js": {
-      "version": "1.8.15",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.8.15.tgz",
-      "integrity": "sha512-kIB71V3DcrA4iysBbOsYcxd4WWlOE7OFtCUYNfflPODM0lbIR23A236QeTn5iAeYwcHmMjR/TAKp5KQQh/WqoQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz",
+      "integrity": "sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==",
       "requires": {
         "@types/tunnel": "0.0.0",
         "axios": "^0.19.0",
@@ -31,11 +31,6 @@
           "requires": {
             "follow-redirects": "1.5.10"
           }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -67,11 +62,6 @@
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz",
       "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ=="
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
-    },
     "@types/cookiejar": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz",
@@ -147,14 +137,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "8.10.63",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz",
-          "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q=="
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+          "version": "8.10.66",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz",
+          "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="
         }
       }
     },
@@ -195,19 +180,13 @@
       "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
     },
     "ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "requires": {
-        "@types/color-name": "^1.1.1",
         "color-convert": "^2.0.1"
       }
     },
-    "ansicolors": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
-      "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk="
-    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -574,15 +553,6 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
-    "cardinal": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz",
-      "integrity": "sha1-fMEFXYItISlU0HsIXeolHMe8VQU=",
-      "requires": {
-        "ansicolors": "~0.3.2",
-        "redeyed": "~2.1.0"
-      }
-    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -645,9 +615,9 @@
       "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
     },
     "chokidar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+      "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -656,7 +626,7 @@
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "readdirp": "~3.5.0"
       },
       "dependencies": {
         "braces": {
@@ -980,9 +950,9 @@
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
     },
     "dot-prop": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+      "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"
       }
@@ -1047,11 +1017,6 @@
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
       "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -1438,6 +1403,11 @@
         }
       }
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -1613,6 +1583,14 @@
         "har-schema": "^2.0.0"
       }
     },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -1867,6 +1845,14 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -2040,18 +2026,18 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jasmine": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.5.0.tgz",
-      "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==",
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz",
+      "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==",
       "requires": {
-        "glob": "^7.1.4",
-        "jasmine-core": "~3.5.0"
+        "glob": "^7.1.6",
+        "jasmine-core": "~3.6.0"
       }
     },
     "jasmine-core": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
+      "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw=="
     },
     "js-sha512": {
       "version": "0.8.0",
@@ -2059,9 +2045,9 @@
       "integrity": "sha512-PWsmefG6Jkodqt+ePTvBZCSMFgN7Clckjd0O7su3I0+BW2QWUTJNzjktHsztGLhncP2h8mcF9V9Y2Ha59pAViQ=="
     },
     "jsbi": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.3.tgz",
-      "integrity": "sha512-nBJqA0C6Qns+ZxurbEoIR56wyjiUszpNy70FHvxO5ervMoCbZVE3z3kxr5nKGhlxr/9MhKTSUBs7cAwwuf3g9w=="
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz",
+      "integrity": "sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg=="
     },
     "jsbn": {
       "version": "0.1.1",
@@ -2132,24 +2118,21 @@
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "knex": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/knex/-/knex-0.21.5.tgz",
-      "integrity": "sha512-cQj7F2D/fu03eTr6ZzYCYKdB9w7fPYlvTiU/f2OeXay52Pq5PwD+NAkcf40WDnppt/4/4KukROwlMOaE7WArcA==",
+      "version": "0.21.12",
+      "resolved": "https://registry.npmjs.org/knex/-/knex-0.21.12.tgz",
+      "integrity": "sha512-AEyyiTM9p/x/Pb38TPZkvphKPmn8UWxP7MdIphzjAOielOfFFeU6pjP6y3M7UJ7rxrQsCrAYHwdonLQ3l1JCDw==",
       "requires": {
         "colorette": "1.2.1",
         "commander": "^5.1.0",
         "debug": "4.1.1",
         "esm": "^3.2.25",
         "getopts": "2.2.5",
-        "inherits": "~2.0.4",
         "interpret": "^2.2.0",
         "liftoff": "3.1.0",
         "lodash": "^4.17.20",
-        "mkdirp": "^1.0.4",
         "pg-connection-string": "2.3.0",
-        "tarn": "^3.0.0",
+        "tarn": "^3.0.1",
         "tildify": "2.0.0",
-        "uuid": "^7.0.3",
         "v8flags": "^3.2.0"
       },
       "dependencies": {
@@ -2161,11 +2144,6 @@
             "ms": "^2.1.1"
           }
         },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2212,11 +2190,18 @@
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
     },
     "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "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": "^3.0.2"
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
     "make-dir": {
@@ -2405,20 +2390,15 @@
         }
       }
     },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "mssql": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/mssql/-/mssql-6.2.1.tgz",
-      "integrity": "sha512-erINJ9EUPvPuWXifZfhum0CVEVrdvnFYlpgU6WKkQW69W4W7DWqJS2FHdedHnuJWlJ8x1WW1NcD8GFfF15O2aA==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/mssql/-/mssql-6.2.3.tgz",
+      "integrity": "sha512-4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og==",
       "requires": {
         "debug": "^4",
         "tarn": "^1.1.5",
@@ -2426,11 +2406,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -2457,28 +2437,32 @@
       }
     },
     "mysql2": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-2.1.0.tgz",
-      "integrity": "sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-2.2.5.tgz",
+      "integrity": "sha512-XRqPNxcZTpmFdXbJqb+/CtYVLCx14x1RTeNMD4954L331APu75IC74GDqnZMEt1kwaXy6TySo55rF2F3YJS78g==",
       "requires": {
-        "cardinal": "^2.1.1",
         "denque": "^1.4.1",
         "generate-function": "^2.3.1",
-        "iconv-lite": "^0.5.0",
+        "iconv-lite": "^0.6.2",
         "long": "^4.0.0",
-        "lru-cache": "^5.1.1",
+        "lru-cache": "^6.0.0",
         "named-placeholders": "^1.1.2",
         "seq-queue": "^0.0.5",
-        "sqlstring": "^2.3.1"
+        "sqlstring": "^2.3.2"
       },
       "dependencies": {
         "iconv-lite": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-          "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
+        },
+        "sqlstring": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz",
+          "integrity": "sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="
         }
       }
     },
@@ -2666,9 +2650,9 @@
       }
     },
     "nodemon": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz",
-      "integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz",
+      "integrity": "sha512-4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ==",
       "requires": {
         "chokidar": "^3.2.2",
         "debug": "^3.2.6",
@@ -2678,14 +2662,14 @@
         "semver": "^5.7.1",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
-        "undefsafe": "^2.0.2",
-        "update-notifier": "^4.0.0"
+        "undefsafe": "^2.0.3",
+        "update-notifier": "^4.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -2992,24 +2976,23 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pg": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz",
-      "integrity": "sha512-wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz",
+      "integrity": "sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.3.0",
-        "pg-pool": "^3.2.1",
-        "pg-protocol": "^1.2.5",
+        "pg-connection-string": "^2.4.0",
+        "pg-pool": "^3.2.2",
+        "pg-protocol": "^1.4.0",
         "pg-types": "^2.1.0",
-        "pgpass": "1.x",
-        "semver": "4.3.2"
+        "pgpass": "1.x"
       },
       "dependencies": {
-        "semver": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-          "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
+        "pg-connection-string": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz",
+          "integrity": "sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="
         }
       }
     },
@@ -3024,14 +3007,14 @@
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
     "pg-pool": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz",
-      "integrity": "sha512-BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
+      "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="
     },
     "pg-protocol": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.5.tgz",
-      "integrity": "sha512-1uYCckkuTfzz/FCefvavRywkowa6M5FohNMF5OjKrqo9PSR8gYc8poVmwwYQaBxhmQdBjhtP514eXy9/Us2xKg=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz",
+      "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="
     },
     "pg-types": {
       "version": "2.2.0",
@@ -3046,11 +3029,11 @@
       }
     },
     "pgpass": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
-      "integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
+      "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
       "requires": {
-        "split": "^1.0.0"
+        "split2": "^3.1.1"
       }
     },
     "picomatch": {
@@ -3135,9 +3118,9 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pupa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
-      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "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"
       }
@@ -3199,9 +3182,9 @@
       }
     },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "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"
       }
@@ -3214,14 +3197,6 @@
         "resolve": "^1.1.6"
       }
     },
-    "redeyed": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz",
-      "integrity": "sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=",
-      "requires": {
-        "esprima": "~4.0.0"
-      }
-    },
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -3232,9 +3207,9 @@
       }
     },
     "registry-auth-token": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
-      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "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"
       }
@@ -3312,10 +3287,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
       "requires": {
+        "is-core-module": "^2.1.0",
         "path-parse": "^1.0.6"
       }
     },
@@ -3611,14 +3587,6 @@
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "requires": {
-        "through": "2"
-      }
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -3627,6 +3595,26 @@
         "extend-shallow": "^3.0.0"
       }
     },
+    "split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "requires": {
+        "readable-stream": "^3.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "sprintf-js": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
@@ -3795,9 +3783,9 @@
       }
     },
     "tarn": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.0.tgz",
-      "integrity": "sha512-PKUnlDFODZueoA8owLehl8vLcgtA8u4dRuVbZc92tspDYZixjJL6TqYOmryf/PfP/EBX+2rgNcrj96NO+RPkdQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.1.tgz",
+      "integrity": "sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw=="
     },
     "tedious": {
       "version": "6.7.0",
@@ -3818,9 +3806,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.12.55",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.55.tgz",
-          "integrity": "sha512-Vd6xQUVvPCTm7Nx1N7XHcpX6t047ltm7TgcsOr4gFHjeYgwZevo+V7I1lfzHnj5BT5frztZ42+RTG4MwYw63dw=="
+          "version": "12.19.7",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.7.tgz",
+          "integrity": "sha512-zvjOU1g4CpPilbTDUATnZCUb/6lARMRAqzT7ILwl1P3YvU2leEcZ2+fw9+Jrw/paXB1CgQyXTrN4hWDtqT9O2A=="
         },
         "depd": {
           "version": "2.0.0",
@@ -3848,14 +3836,9 @@
       }
     },
     "term-size": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
     },
     "tildify": {
       "version": "2.0.0",
@@ -3945,9 +3928,9 @@
       }
     },
     "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "tunnel": {
       "version": "0.0.6",
@@ -4021,9 +4004,9 @@
       }
     },
     "underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz",
+      "integrity": "sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="
     },
     "union-value": {
       "version": "1.0.1",
@@ -4086,9 +4069,9 @@
       }
     },
     "update-notifier": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.1.tgz",
-      "integrity": "sha512-9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg==",
+      "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",
@@ -4142,9 +4125,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "v8flags": {
       "version": "3.2.0",
@@ -4253,9 +4236,9 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     },
     "xmldom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz",
+      "integrity": "sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="
     },
     "xpath.js": {
       "version": "1.1.0",
diff --git a/server/package.json b/server/package.json
index ae78a00..a4d50b9 100644
--- a/server/package.json
+++ b/server/package.json
@@ -15,19 +15,19 @@
     "express": "^4.16.4",
     "express-session": "^1.17.1",
     "http-proxy-middleware": "^1.0.6",
-    "jasmine": "^3.5.0",
+    "jasmine": "^3.6.3",
     "js-sha512": "^0.8.0",
-    "knex": "^0.21.5",
+    "knex": "^0.21.12",
     "memorystore": "^1.6.4",
-    "mssql": "^6.2.1",
+    "mssql": "^6.2.3",
     "mysql": "^2.18.1",
-    "mysql2": "^2.1.0",
+    "mysql2": "^2.2.5",
     "node-fetch": "^2.6.1",
-    "nodemon": "^2.0.4",
+    "nodemon": "^2.0.6",
     "oracledb": "^5.0.0",
     "passport": "^0.4.1",
     "passport-local": "^1.0.0",
-    "pg": "^8.3.3",
+    "pg": "^8.5.1",
     "querystring": "^0.2.0",
     "sqlite3": "^5.0.0",
     "ts-enum-util": "^4.0.2",