diff --git a/ldap_config.json b/ldap_config.json
index d18f8313f487619df82d05f9eaae182db0e1ca91..57370d5e8279fa05723aa4f9c3e9290246b161d7 100644
--- a/ldap_config.json
+++ b/ldap_config.json
@@ -58,6 +58,5 @@
"admin": "memberUid",
"class": "objectClass"
}
- },
- "sessionSecret":"ozyNMHdT,WFTu|t"
+ }
}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index b79e367478593a14d05e99f208f261c5cb7e02d3..d858b20a07c10b5e08eb4702c3fa4cede4630c5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,14 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@apollographql/apollo-tools": {
+ "version": "0.2.8",
+ "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.8.tgz",
+ "integrity": "sha512-A7FTUigtpGCFBaLT1ILicdjM6pZ7LQNw7Vgos0t4aLYtvlKO/L1nMi/NO7bPypzZaJSToTgcxHJPRydP1Md+Kw==",
+ "requires": {
+ "apollo-env": "0.2.5"
+ }
+ },
"@apollographql/apollo-upload-server": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/@apollographql/apollo-upload-server/-/apollo-upload-server-5.0.3.tgz",
@@ -15,14 +23,14 @@
}
},
"@apollographql/graphql-playground-html": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.0.tgz",
- "integrity": "sha512-QAZIFrfVRkjvMkUHIQKZXZ3La0V5t12w5PWrhihYEabHwzIZV/txQd/kSYHgYPXC4s5OURxsXZop9f0BzI2QIQ=="
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.4.tgz",
+ "integrity": "sha512-gwvaQO6/Hv4DEwhDLmmu2tzCU9oPjC5Xl9Kk8Yd0IxyKhYLlLalmkMMjsZLzU5H3fGaalLD96OYfxHL0ClVUDQ=="
},
"@babel/cli": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.1.2.tgz",
- "integrity": "sha512-K3WDlpBPGpoW11SLKFEBhMsITomPovsrZ/wnM3y+WStbytukDXC0OBic3yQp+j058QUw0+R/jfx2obwp1fOzcA==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.1.5.tgz",
+ "integrity": "sha512-zbO/DtTnaDappBflIU3zYEgATLToRDmW5uN/EGH1GXaes7ydfjqmAoK++xmJIA+8HfDw7UyPZNdM8fhGhfmMhw==",
"dev": true,
"requires": {
"chokidar": "^2.0.3",
@@ -47,21 +55,21 @@
}
},
"@babel/core": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.2.tgz",
- "integrity": "sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz",
+ "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.2",
- "@babel/helpers": "^7.1.2",
- "@babel/parser": "^7.1.2",
+ "@babel/generator": "^7.1.6",
+ "@babel/helpers": "^7.1.5",
+ "@babel/parser": "^7.1.6",
"@babel/template": "^7.1.2",
- "@babel/traverse": "^7.1.0",
- "@babel/types": "^7.1.2",
+ "@babel/traverse": "^7.1.6",
+ "@babel/types": "^7.1.6",
"convert-source-map": "^1.1.0",
- "debug": "^3.1.0",
- "json5": "^0.5.0",
+ "debug": "^4.1.0",
+ "json5": "^2.1.0",
"lodash": "^4.17.10",
"resolve": "^1.3.2",
"semver": "^5.4.1",
@@ -78,12 +86,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -130,6 +138,12 @@
"js-tokens": "^4.0.0"
}
},
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ },
"@babel/template": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
@@ -142,26 +156,26 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -169,11 +183,41 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "json5": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+ "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.0"
+ }
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -200,9 +244,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -223,9 +267,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -256,12 +300,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -308,6 +352,12 @@
"js-tokens": "^4.0.0"
}
},
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ },
"@babel/template": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
@@ -320,26 +370,26 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -347,11 +397,26 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -418,9 +483,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -456,12 +521,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -508,6 +573,12 @@
"js-tokens": "^4.0.0"
}
},
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ },
"@babel/template": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
@@ -520,26 +591,26 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -547,11 +618,26 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -585,9 +671,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -629,9 +715,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -696,9 +782,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -774,12 +860,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -838,26 +924,34 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ }
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -865,11 +959,26 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -1036,9 +1145,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1085,12 +1194,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -1149,26 +1258,34 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ }
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1176,23 +1293,38 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
"@babel/helpers": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.2.tgz",
- "integrity": "sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz",
+ "integrity": "sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==",
"dev": true,
"requires": {
"@babel/template": "^7.1.2",
- "@babel/traverse": "^7.1.0",
- "@babel/types": "^7.1.2"
+ "@babel/traverse": "^7.1.5",
+ "@babel/types": "^7.1.5"
},
"dependencies": {
"@babel/code-frame": {
@@ -1205,12 +1337,12 @@
}
},
"@babel/generator": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz",
- "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz",
+ "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.1.3",
+ "@babel/types": "^7.1.6",
"jsesc": "^2.5.1",
"lodash": "^4.17.10",
"source-map": "^0.5.0",
@@ -1269,26 +1401,34 @@
}
},
"@babel/traverse": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz",
- "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+ "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.1.3",
+ "@babel/generator": "^7.1.6",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.1.3",
- "@babel/types": "^7.1.3",
- "debug": "^3.1.0",
+ "@babel/parser": "^7.1.6",
+ "@babel/types": "^7.1.6",
+ "debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "@babel/parser": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz",
+ "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==",
+ "dev": true
+ }
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1296,11 +1436,26 @@
"to-fast-properties": "^2.0.0"
}
},
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -1541,9 +1696,9 @@
}
},
"@babel/plugin-transform-block-scoping": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz",
- "integrity": "sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz",
+ "integrity": "sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
@@ -1627,9 +1782,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1764,9 +1919,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1872,9 +2027,9 @@
}
},
"@babel/types": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz",
- "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz",
+ "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==",
"dev": true,
"requires": {
"esutils": "^2.0.2",
@@ -1962,9 +2117,9 @@
}
},
"@babel/preset-env": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.0.tgz",
- "integrity": "sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz",
+ "integrity": "sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==",
"dev": true,
"requires": {
"@babel/helper-module-imports": "^7.0.0",
@@ -1980,7 +2135,7 @@
"@babel/plugin-transform-arrow-functions": "^7.0.0",
"@babel/plugin-transform-async-to-generator": "^7.1.0",
"@babel/plugin-transform-block-scoped-functions": "^7.0.0",
- "@babel/plugin-transform-block-scoping": "^7.0.0",
+ "@babel/plugin-transform-block-scoping": "^7.1.5",
"@babel/plugin-transform-classes": "^7.1.0",
"@babel/plugin-transform-computed-properties": "^7.0.0",
"@babel/plugin-transform-destructuring": "^7.0.0",
@@ -2036,9 +2191,9 @@
}
},
"@babel/runtime-corejs2": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.0.0.tgz",
- "integrity": "sha512-Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.5.tgz",
+ "integrity": "sha512-WsYRwQsFhVmxkAqwypPTZyV9GpkqMEaAr2zOItOmqSX2GBFaI+eq98CN81e13o0zaUKJOQGYyjhNVqj56nnkYg==",
"requires": {
"core-js": "^2.5.7",
"regenerator-runtime": "^0.12.0"
@@ -2228,7 +2383,7 @@
},
"@types/accepts": {
"version": "1.3.5",
- "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
+ "resolved": "http://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==",
"requires": {
"@types/node": "*"
@@ -2365,14 +2520,14 @@
"integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="
},
"@types/node": {
- "version": "10.11.7",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.7.tgz",
- "integrity": "sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg=="
+ "version": "10.12.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.10.tgz",
+ "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w=="
},
"@types/passport": {
- "version": "0.4.6",
- "resolved": "https://registry.npmjs.org/@types/passport/-/passport-0.4.6.tgz",
- "integrity": "sha512-P7TxrdpAze3nvHghYPeLlHkYcFDiIkRBbp7xYz2ehX9zmi1yr/qWQMTpXsMxN5w3ESJpMzn917inK4giASaDcQ==",
+ "version": "0.4.7",
+ "resolved": "https://registry.npmjs.org/@types/passport/-/passport-0.4.7.tgz",
+ "integrity": "sha512-EePlxNYx5tf3n0yjdPXX0/zDOv0UCwjMyQo4UkWGlhHteNDItAj7TfDdLttSThVMKQz3uCW7lsGzMuml0f8g9Q==",
"requires": {
"@types/express": "*"
}
@@ -2409,183 +2564,183 @@
}
},
"@types/ws": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz",
- "integrity": "sha512-NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.1.tgz",
+ "integrity": "sha512-EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q==",
"requires": {
"@types/events": "*",
"@types/node": "*"
}
},
"@webassemblyjs/ast": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz",
- "integrity": "sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+ "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
"dev": true,
"requires": {
- "@webassemblyjs/helper-module-context": "1.7.8",
- "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
- "@webassemblyjs/wast-parser": "1.7.8"
+ "@webassemblyjs/helper-module-context": "1.7.11",
+ "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+ "@webassemblyjs/wast-parser": "1.7.11"
}
},
"@webassemblyjs/floating-point-hex-parser": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz",
- "integrity": "sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz",
+ "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==",
"dev": true
},
"@webassemblyjs/helper-api-error": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz",
- "integrity": "sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz",
+ "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==",
"dev": true
},
"@webassemblyjs/helper-buffer": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz",
- "integrity": "sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz",
+ "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==",
"dev": true
},
"@webassemblyjs/helper-code-frame": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz",
- "integrity": "sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz",
+ "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==",
"dev": true,
"requires": {
- "@webassemblyjs/wast-printer": "1.7.8"
+ "@webassemblyjs/wast-printer": "1.7.11"
}
},
"@webassemblyjs/helper-fsm": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz",
- "integrity": "sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz",
+ "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==",
"dev": true
},
"@webassemblyjs/helper-module-context": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz",
- "integrity": "sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz",
+ "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==",
"dev": true
},
"@webassemblyjs/helper-wasm-bytecode": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz",
- "integrity": "sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz",
+ "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==",
"dev": true
},
"@webassemblyjs/helper-wasm-section": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz",
- "integrity": "sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz",
+ "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-buffer": "1.7.8",
- "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
- "@webassemblyjs/wasm-gen": "1.7.8"
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-buffer": "1.7.11",
+ "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+ "@webassemblyjs/wasm-gen": "1.7.11"
}
},
"@webassemblyjs/ieee754": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz",
- "integrity": "sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz",
+ "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
"dev": true,
"requires": {
"@xtuc/ieee754": "^1.2.0"
}
},
"@webassemblyjs/leb128": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.8.tgz",
- "integrity": "sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz",
+ "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==",
"dev": true,
"requires": {
"@xtuc/long": "4.2.1"
}
},
"@webassemblyjs/utf8": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.8.tgz",
- "integrity": "sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz",
+ "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==",
"dev": true
},
"@webassemblyjs/wasm-edit": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz",
- "integrity": "sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz",
+ "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-buffer": "1.7.8",
- "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
- "@webassemblyjs/helper-wasm-section": "1.7.8",
- "@webassemblyjs/wasm-gen": "1.7.8",
- "@webassemblyjs/wasm-opt": "1.7.8",
- "@webassemblyjs/wasm-parser": "1.7.8",
- "@webassemblyjs/wast-printer": "1.7.8"
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-buffer": "1.7.11",
+ "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+ "@webassemblyjs/helper-wasm-section": "1.7.11",
+ "@webassemblyjs/wasm-gen": "1.7.11",
+ "@webassemblyjs/wasm-opt": "1.7.11",
+ "@webassemblyjs/wasm-parser": "1.7.11",
+ "@webassemblyjs/wast-printer": "1.7.11"
}
},
"@webassemblyjs/wasm-gen": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz",
- "integrity": "sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz",
+ "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
- "@webassemblyjs/ieee754": "1.7.8",
- "@webassemblyjs/leb128": "1.7.8",
- "@webassemblyjs/utf8": "1.7.8"
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+ "@webassemblyjs/ieee754": "1.7.11",
+ "@webassemblyjs/leb128": "1.7.11",
+ "@webassemblyjs/utf8": "1.7.11"
}
},
"@webassemblyjs/wasm-opt": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz",
- "integrity": "sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz",
+ "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-buffer": "1.7.8",
- "@webassemblyjs/wasm-gen": "1.7.8",
- "@webassemblyjs/wasm-parser": "1.7.8"
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-buffer": "1.7.11",
+ "@webassemblyjs/wasm-gen": "1.7.11",
+ "@webassemblyjs/wasm-parser": "1.7.11"
}
},
"@webassemblyjs/wasm-parser": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz",
- "integrity": "sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz",
+ "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-api-error": "1.7.8",
- "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
- "@webassemblyjs/ieee754": "1.7.8",
- "@webassemblyjs/leb128": "1.7.8",
- "@webassemblyjs/utf8": "1.7.8"
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-api-error": "1.7.11",
+ "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+ "@webassemblyjs/ieee754": "1.7.11",
+ "@webassemblyjs/leb128": "1.7.11",
+ "@webassemblyjs/utf8": "1.7.11"
}
},
"@webassemblyjs/wast-parser": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz",
- "integrity": "sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz",
+ "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/floating-point-hex-parser": "1.7.8",
- "@webassemblyjs/helper-api-error": "1.7.8",
- "@webassemblyjs/helper-code-frame": "1.7.8",
- "@webassemblyjs/helper-fsm": "1.7.8",
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/floating-point-hex-parser": "1.7.11",
+ "@webassemblyjs/helper-api-error": "1.7.11",
+ "@webassemblyjs/helper-code-frame": "1.7.11",
+ "@webassemblyjs/helper-fsm": "1.7.11",
"@xtuc/long": "4.2.1"
}
},
"@webassemblyjs/wast-printer": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz",
- "integrity": "sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==",
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz",
+ "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/wast-parser": "1.7.8",
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/wast-parser": "1.7.11",
"@xtuc/long": "4.2.1"
}
},
@@ -2673,6 +2828,12 @@
"json-schema-traverse": "^0.3.0"
}
},
+ "ajv-errors": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz",
+ "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=",
+ "dev": true
+ },
"ajv-keywords": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
@@ -2747,12 +2908,12 @@
}
},
"apollo-cache-control": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.5.tgz",
- "integrity": "sha512-xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.2.tgz",
+ "integrity": "sha512-/fhgCWGEoTsgyA83usy/1NvJWi6hbD4rSGO5jvyNNtMZ9ledOvKUvIdzSQ1r5hxK5yds/eehWXhMJ4Pu200qrQ==",
"requires": {
- "apollo-server-env": "^2.0.3",
- "graphql-extensions": "^0.2.1"
+ "apollo-server-env": "2.2.0",
+ "graphql-extensions": "0.3.2"
}
},
"apollo-codegen": {
@@ -2917,34 +3078,55 @@
}
},
"apollo-datasource": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz",
- "integrity": "sha512-yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.0.tgz",
+ "integrity": "sha512-WJM9Ix3uogIfAG7mjL1NZQM9+45rcikn4mPWhE1Iuyw2+Y857J3uKJqQgF5h9Fg64SlCJh9u5WL3N7N5mg1fVw==",
"requires": {
- "apollo-server-caching": "0.1.2",
- "apollo-server-env": "2.0.3"
+ "apollo-server-caching": "0.2.0",
+ "apollo-server-env": "2.2.0"
}
},
"apollo-engine-reporting": {
- "version": "0.0.6",
- "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.6.tgz",
- "integrity": "sha512-JmfNJ9v3QEJQ8ZhLfCKEDiww53n5kj5HarP85p8LreoYNojbvcWN8Qm6RgvSG5N/ZJrAYHeTRQbSxm1vWwGubw==",
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.2.tgz",
+ "integrity": "sha512-W6zBTypI2ZLe9ZpMI4EasyXJP2WG8CpxYOU3Q4iuCKh8HYJqrQC5QVFXRF7TRBQTE6tc1seYnAHdgqv0ozxBrw==",
"requires": {
- "apollo-engine-reporting-protobuf": "^0.0.1",
- "apollo-server-env": "^2.0.3",
+ "apollo-engine-reporting-protobuf": "0.1.0",
+ "apollo-server-env": "2.2.0",
"async-retry": "^1.2.1",
- "graphql-extensions": "^0.2.1",
+ "graphql-extensions": "0.3.2",
"lodash": "^4.17.10"
}
},
"apollo-engine-reporting-protobuf": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.0.1.tgz",
- "integrity": "sha512-AySoDgog2p1Nph44FyyqaU4AfRZOXx8XZxRsVHvYY4dHlrMmDDhhjfF3Jswa7Wr8X/ivvx3xA0jimRn6rsG8Ew==",
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.1.0.tgz",
+ "integrity": "sha512-GReJtAYTmpwg0drb9VgFtqObYYTCHkJhlHEYCeXY8bJV4fOgXsAZ7CIXR9nPKO0mBaoHIHaGYvXGcyCLrZ36VA==",
"requires": {
"protobufjs": "^6.8.6"
}
},
+ "apollo-env": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.2.5.tgz",
+ "integrity": "sha512-Gc7TEbwCl7jJVutnn8TWfzNSkrrqyoo0DP92BQJFU9pZbJhpidoXf2Sw1YwOJl82rRKH3ujM3C8vdZLOgpFcFA==",
+ "requires": {
+ "core-js": "^3.0.0-beta.3",
+ "node-fetch": "^2.2.0"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "3.0.0-beta.3",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.3.tgz",
+ "integrity": "sha512-kM/OfrnMThP5PwGAj5HhQLdjUqzjrllqN2EVnk/X9qrLsfYjR2hzZ+E/8CzH0xuosexZtqMTLQrk//BULrBj9w=="
+ },
+ "node-fetch": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
+ "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
+ }
+ }
+ },
"apollo-link": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.2.tgz",
@@ -2963,86 +3145,125 @@
}
},
"apollo-server-caching": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.1.2.tgz",
- "integrity": "sha512-jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.0.tgz",
+ "integrity": "sha512-/v7xWEcyyahs3hwX4baH/GekuHz3LRt9NoIYwg869G1eeqjuwY6NsowRIujZ100anJQwm9v5A9/sLtHBFvbgYg==",
"requires": {
"lru-cache": "^4.1.3"
},
"dependencies": {
"lru-cache": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
- "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
+ "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
"requires": {
"pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
+ "yallist": "^3.0.2"
}
+ },
+ "yallist": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
}
}
},
"apollo-server-core": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.1.0.tgz",
- "integrity": "sha512-D1Tw0o3NzCQ2KGM8EWh9AHELHmn/SE361dtlqJxkbelxXqAkCIGIFywF30h+0ezhMbgbO7eqBBJfvRilF/oJHA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.2.tgz",
+ "integrity": "sha512-F6d4u5m1rJB4ucpLPGCoa9Dvo5OjGMIGdAzT9A35yOvlFWwvIR46jGmYmGmNp4Qx852rb1axSZVzNy7k/Dix0w==",
"requires": {
+ "@apollographql/apollo-tools": "^0.2.6",
"@apollographql/apollo-upload-server": "^5.0.3",
- "@types/ws": "^5.1.2",
- "apollo-cache-control": "^0.2.5",
- "apollo-datasource": "^0.1.3",
- "apollo-engine-reporting": "^0.0.6",
- "apollo-server-caching": "^0.1.2",
- "apollo-server-env": "^2.0.3",
- "apollo-server-errors": "^2.0.2",
- "apollo-tracing": "^0.2.5",
- "graphql-extensions": "^0.2.1",
- "graphql-subscriptions": "^0.5.8",
+ "@apollographql/graphql-playground-html": "^1.6.4",
+ "@types/ws": "^6.0.0",
+ "apollo-cache-control": "0.3.2",
+ "apollo-datasource": "0.2.0",
+ "apollo-engine-reporting": "0.1.2",
+ "apollo-server-caching": "0.2.0",
+ "apollo-server-env": "2.2.0",
+ "apollo-server-errors": "2.2.0",
+ "apollo-server-plugin-base": "0.1.2",
+ "apollo-tracing": "0.3.2",
+ "graphql-extensions": "0.3.2",
+ "graphql-subscriptions": "^1.0.0",
"graphql-tag": "^2.9.2",
- "graphql-tools": "^3.0.4",
- "hash.js": "^1.1.3",
+ "graphql-tools": "^4.0.0",
+ "json-stable-stringify": "^1.0.1",
"lodash": "^4.17.10",
"subscriptions-transport-ws": "^0.9.11",
- "ws": "^5.2.0"
+ "ws": "^6.0.0"
+ },
+ "dependencies": {
+ "apollo-link": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.4.tgz",
+ "integrity": "sha512-B1z+9H2nTyWEhMXRFSnoZ1vSuAYP+V/EdUJvRx9uZ8yuIBZMm6reyVtr1n0BWlKeSFyPieKJy2RLzmITAAQAMQ==",
+ "requires": {
+ "apollo-utilities": "^1.0.0",
+ "zen-observable-ts": "^0.8.11"
+ }
+ },
+ "graphql-tools": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.3.tgz",
+ "integrity": "sha512-NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg==",
+ "requires": {
+ "apollo-link": "^1.2.3",
+ "apollo-utilities": "^1.0.1",
+ "deprecated-decorator": "^0.1.6",
+ "iterall": "^1.1.3",
+ "uuid": "^3.1.0"
+ }
+ },
+ "zen-observable-ts": {
+ "version": "0.8.11",
+ "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.11.tgz",
+ "integrity": "sha512-8bs7rgGV4kz5iTb9isudkuQjtWwPnQ8lXq6/T76vrepYZVMsDEv6BXaEA+DHdJSK3KVLduagi9jSpSAJ5NgKHw==",
+ "requires": {
+ "zen-observable": "^0.8.0"
+ }
+ }
}
},
"apollo-server-env": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz",
- "integrity": "sha512-uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.2.0.tgz",
+ "integrity": "sha512-wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA==",
"requires": {
"node-fetch": "^2.1.2",
"util.promisify": "^1.0.0"
},
"dependencies": {
"node-fetch": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz",
- "integrity": "sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
+ "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
}
}
},
"apollo-server-errors": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.0.2.tgz",
- "integrity": "sha512-zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg=="
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.0.tgz",
+ "integrity": "sha512-gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="
},
"apollo-server-express": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.1.0.tgz",
- "integrity": "sha512-jLFIz1VLduMA/rme4OAy3IPeoaMEZOPoQXpio8AhfjIqCijRPPfoWJ2QMqz56C/g3vas7rZtgcVOrHpjBKudjw==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.2.tgz",
+ "integrity": "sha512-DPxHOUd0Waztuix0r1ed6xfdlR7P7RzIXPmybhPXj1bZJtYHz5If0ngYNjtFqnXVrC8aSRtMz108SQUAnduYwA==",
"requires": {
"@apollographql/apollo-upload-server": "^5.0.3",
- "@apollographql/graphql-playground-html": "^1.6.0",
+ "@apollographql/graphql-playground-html": "^1.6.4",
"@types/accepts": "^1.3.5",
"@types/body-parser": "1.17.0",
"@types/cors": "^2.8.4",
"@types/express": "4.16.0",
"accepts": "^1.3.5",
- "apollo-server-core": "^2.1.0",
+ "apollo-server-core": "2.2.2",
"body-parser": "^1.18.3",
"cors": "^2.8.4",
- "graphql-subscriptions": "^0.5.8",
- "graphql-tools": "^3.0.4",
+ "graphql-subscriptions": "^1.0.0",
+ "graphql-tools": "^4.0.0",
"type-is": "^1.6.16"
},
"dependencies": {
@@ -3064,16 +3285,50 @@
"@types/express-serve-static-core": "*",
"@types/serve-static": "*"
}
+ },
+ "apollo-link": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.4.tgz",
+ "integrity": "sha512-B1z+9H2nTyWEhMXRFSnoZ1vSuAYP+V/EdUJvRx9uZ8yuIBZMm6reyVtr1n0BWlKeSFyPieKJy2RLzmITAAQAMQ==",
+ "requires": {
+ "apollo-utilities": "^1.0.0",
+ "zen-observable-ts": "^0.8.11"
+ }
+ },
+ "graphql-tools": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.3.tgz",
+ "integrity": "sha512-NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg==",
+ "requires": {
+ "apollo-link": "^1.2.3",
+ "apollo-utilities": "^1.0.1",
+ "deprecated-decorator": "^0.1.6",
+ "iterall": "^1.1.3",
+ "uuid": "^3.1.0"
+ }
+ },
+ "zen-observable-ts": {
+ "version": "0.8.11",
+ "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.11.tgz",
+ "integrity": "sha512-8bs7rgGV4kz5iTb9isudkuQjtWwPnQ8lXq6/T76vrepYZVMsDEv6BXaEA+DHdJSK3KVLduagi9jSpSAJ5NgKHw==",
+ "requires": {
+ "zen-observable": "^0.8.0"
+ }
}
}
},
+ "apollo-server-plugin-base": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.2.tgz",
+ "integrity": "sha512-+uicMcNctlP6YwIhzLLEycZzao/810OSzcxgPYKItXr5lGa1GuHD7sRIWldT3YoSdpw6Gal2lBuw6/DmnoDsPg=="
+ },
"apollo-tracing": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.5.tgz",
- "integrity": "sha512-DZO7pfL5LATHeJdVFoTZ/N3HwA+IMf1YnIt5K+uMQW+/MrRgYOtTszUv5tYX2cUIqHYHcbdDaBQUuIXwSpaV2Q==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.2.tgz",
+ "integrity": "sha512-YwN1m1k0JJsxGh0QWsEM3OLnyem0GT2tZnGeO2OogCr6dH5lE0SjKPc6UzpcI/3fPyxRrx5QvpUiP+DJeehhTA==",
"requires": {
- "apollo-server-env": "^2.0.3",
- "graphql-extensions": "^0.2.1"
+ "apollo-server-env": "2.2.0",
+ "graphql-extensions": "0.3.2"
}
},
"apollo-utilities": {
@@ -3208,7 +3463,7 @@
},
"util": {
"version": "0.10.3",
- "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+ "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
@@ -3455,9 +3710,9 @@
"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
},
"binary-extensions": {
- "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
- "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
+ "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
"dev": true
},
"bluebird": {
@@ -3647,7 +3902,7 @@
},
"browserify-rsa": {
"version": "4.0.1",
- "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
@@ -3680,19 +3935,19 @@
}
},
"browserslist": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.2.0.tgz",
- "integrity": "sha512-Berls1CHL7qfQz8Lct6QxYA5d2Tvt4doDWHcjvAISybpd+EKZVppNtXgXhaN6SdrPKo7YLTSZuYBs5cYrSWN8w==",
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz",
+ "integrity": "sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30000889",
- "electron-to-chromium": "^1.3.73",
- "node-releases": "^1.0.0-alpha.12"
+ "caniuse-lite": "^1.0.30000899",
+ "electron-to-chromium": "^1.3.82",
+ "node-releases": "^1.0.1"
}
},
"buffer": {
"version": "4.9.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+ "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
@@ -3713,9 +3968,9 @@
"dev": true
},
"buffer-writer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz",
- "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+ "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
},
"buffer-xor": {
"version": "1.0.3",
@@ -3862,9 +4117,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30000890",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz",
- "integrity": "sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg==",
+ "version": "1.0.30000910",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz",
+ "integrity": "sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ==",
"dev": true
},
"capture-stack-trace": {
@@ -3969,9 +4224,9 @@
}
},
"chownr": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
- "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+ "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
},
"chrome-trace-event": {
"version": "1.0.0",
@@ -3983,9 +4238,9 @@
}
},
"ci-info": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.4.0.tgz",
- "integrity": "sha512-Oqmw2pVfCl8sCL+1QgMywPfdxPJPkC51y4usw0iiE2S9qnEOAqXy8bwl1CpMpnoU39g4iKJTz6QZj+28FvOnjQ==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+ "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
"dev": true
},
"cipher-base": {
@@ -4379,9 +4634,9 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
},
"copy-webpack-plugin": {
- "version": "4.5.3",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.3.tgz",
- "integrity": "sha512-VKCiNXQcc8zyznaepXfKpCH2cZD+/j3T3B+gsFY97P7qMlEsj34wr/sI9OCG7QPUUh7gAHVx3q8Q1rdQIDM4bA==",
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+ "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
"requires": {
"cacache": "^10.0.4",
"find-cache-dir": "^1.0.0",
@@ -4404,9 +4659,9 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"cors": {
- "version": "2.8.4",
- "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
- "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
+ "version": "2.8.5",
+ "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+ "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
"requires": {
"object-assign": "^4",
"vary": "^1"
@@ -4827,12 +5082,6 @@
"nan": "^2.3.3"
}
},
- "duplexer": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
- "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
- "dev": true
- },
"duplexer3": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -4840,9 +5089,9 @@
"dev": true
},
"duplexify": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
- "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
+ "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
"requires": {
"end-of-stream": "^1.0.0",
"inherits": "^2.0.1",
@@ -4864,9 +5113,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"electron-to-chromium": {
- "version": "1.3.79",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.79.tgz",
- "integrity": "sha512-LQdY3j4PxuUl6xfxiFruTSlCniTrTrzAd8/HfsLEMi0PUpaQ0Iy+Pr4N4VllDYjs0Hyu2lkTbvzqlG+PX9NsNw==",
+ "version": "1.3.84",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz",
+ "integrity": "sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw==",
"dev": true
},
"elliptic": {
@@ -4957,13 +5206,13 @@
}
},
"es-to-primitive": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
- "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
"requires": {
- "is-callable": "^1.1.1",
+ "is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
- "is-symbol": "^1.0.1"
+ "is-symbol": "^1.0.2"
}
},
"escape-html": {
@@ -5277,21 +5526,6 @@
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
},
- "event-stream": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
- "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
- "dev": true,
- "requires": {
- "duplexer": "~0.1.1",
- "from": "~0",
- "map-stream": "~0.1.0",
- "pause-stream": "0.0.11",
- "split": "0.3",
- "stream-combiner": "~0.0.4",
- "through": "~2.3.1"
- }
- },
"eventemitter3": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
@@ -5299,7 +5533,7 @@
},
"events": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+ "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
"dev": true
},
@@ -5606,6 +5840,12 @@
}
}
},
+ "figgy-pudding": {
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+ "dev": true
+ },
"figures": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -5831,12 +6071,6 @@
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
},
- "from": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
- "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
- "dev": true
- },
"from2": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -5920,14 +6154,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -5942,20 +6174,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -6072,8 +6301,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -6085,7 +6313,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -6100,7 +6327,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -6108,14 +6334,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -6134,7 +6358,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -6215,8 +6438,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -6228,7 +6450,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -6350,7 +6571,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -6434,9 +6654,9 @@
"dev": true
},
"fuse.js": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.2.1.tgz",
- "integrity": "sha1-YyDLlM5W7JdVyJred1vNuwNY1CU="
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.3.0.tgz",
+ "integrity": "sha512-ESBRkGLWMuVkapqYCcNO1uqMg5qbCKkgb+VS6wsy17Rix0/cMS9kSOZoYkjH8Ko//pgJ/EEGu0GTjk2mjX2LGQ=="
},
"get-caller-file": {
"version": "1.0.3",
@@ -6562,7 +6782,7 @@
},
"got": {
"version": "6.7.1",
- "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+ "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
"dev": true,
"requires": {
@@ -6593,11 +6813,11 @@
}
},
"graphql-extensions": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.2.1.tgz",
- "integrity": "sha512-/1FTPSWSffDjlRyMAV2UwQhojLmca9aQD0ieo1IYiqT5SE+uOWi4r83QF1CoER0sREIsH3s+nTmdH3cvQVG3MA==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.2.tgz",
+ "integrity": "sha512-eIAWwtZNlUAHtHF6uNP6+4M+GCksqUYfNBxW5rTAlCB4/ZcuIvchVtN1CgVM7MooW3akPM1Eci11WyeXvgOugQ==",
"requires": {
- "apollo-server-env": "^2.0.3"
+ "@apollographql/apollo-tools": "^0.2.6"
}
},
"graphql-import": {
@@ -6619,17 +6839,17 @@
}
},
"graphql-subscriptions": {
- "version": "0.5.8",
- "resolved": "http://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz",
- "integrity": "sha512-0CaZnXKBw2pwnIbvmVckby5Ge5e2ecmjofhYCdyeACbCly2j3WXDP/pl+s+Dqd2GQFC7y99NB+53jrt55CKxYQ==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.0.0.tgz",
+ "integrity": "sha512-+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ==",
"requires": {
"iterall": "^1.2.1"
}
},
"graphql-tag": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.9.2.tgz",
- "integrity": "sha512-qnNmof9pAqj/LUzs3lStP0Gw1qhdVCUS7Ab7+SUB6KD5aX1uqxWQRwMnOGTkhKuLvLNIs1TvNz+iS9kUGl1MhA=="
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz",
+ "integrity": "sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="
},
"graphql-tools": {
"version": "3.1.1",
@@ -6772,6 +6992,7 @@
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
"integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+ "dev": true,
"requires": {
"inherits": "^2.0.3",
"minimalistic-assert": "^1.0.1"
@@ -7095,12 +7316,12 @@
"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
},
"is-ci": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.0.tgz",
- "integrity": "sha512-plgvKjQtalH2P3Gytb7L61Lmz95g2DlpzFiQyRSFew8WoJKxtKRzrZMeyRN2supblm3Psc8OQGy7Xjb6XG11jw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+ "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
"dev": true,
"requires": {
- "ci-info": "^1.3.0"
+ "ci-info": "^1.5.0"
}
},
"is-data-descriptor": {
@@ -7238,7 +7459,7 @@
},
"is-obj": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
"dev": true
},
@@ -7551,6 +7772,14 @@
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
},
+ "json-stable-stringify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+ "requires": {
+ "jsonify": "~0.0.0"
+ }
+ },
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -7562,10 +7791,15 @@
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
},
+ "jsonify": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+ },
"jsonwebtoken": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz",
- "integrity": "sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag==",
+ "version": "8.4.0",
+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz",
+ "integrity": "sha512-coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg==",
"requires": {
"jws": "^3.1.5",
"lodash.includes": "^4.3.0",
@@ -8184,12 +8418,6 @@
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
},
- "map-stream": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
- "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
- "dev": true
- },
"map-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -8319,7 +8547,8 @@
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
- "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+ "dev": true
},
"minimalistic-crypto-utils": {
"version": "1.0.1",
@@ -8520,9 +8749,9 @@
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"neo-async": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
- "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
+ "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
"dev": true
},
"nice-try": {
@@ -8578,21 +8807,21 @@
}
},
"node-releases": {
- "version": "1.0.0-alpha.12",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.12.tgz",
- "integrity": "sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.4.tgz",
+ "integrity": "sha512-GqRV9GcHw8JCRDaP/JoeNMNzEGzHAknMvIHqMb2VeTOmg1Cf9+ej8bkV12tHfzWHQMCkQ5zUFgwFUkfraynNCw==",
"dev": true,
"requires": {
"semver": "^5.3.0"
}
},
"nodemon": {
- "version": "1.18.4",
- "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz",
- "integrity": "sha512-hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg==",
+ "version": "1.18.6",
+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.6.tgz",
+ "integrity": "sha512-4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ==",
"dev": true,
"requires": {
- "chokidar": "^2.0.2",
+ "chokidar": "^2.0.4",
"debug": "^3.1.0",
"ignore-by-default": "^1.0.1",
"minimatch": "^3.0.4",
@@ -9131,15 +9360,6 @@
"resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
"integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
},
- "pause-stream": {
- "version": "0.0.11",
- "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
- "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
- "dev": true,
- "requires": {
- "through": "~2.3"
- }
- },
"pbkdf2": {
"version": "3.0.17",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -9154,11 +9374,11 @@
}
},
"pg": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/pg/-/pg-7.5.0.tgz",
- "integrity": "sha512-VFyAnp8xsMZp8nwZnMp7lmU5QcWDOZSI3IDNcWv6pblsiOXis5o7lD7/zzVK1Z1JTBiIDDGQAMbFMkiUzCL59A==",
+ "version": "7.6.1",
+ "resolved": "https://registry.npmjs.org/pg/-/pg-7.6.1.tgz",
+ "integrity": "sha512-rAItIkYrRaNGinZN/Hs8F9R5mQjQSPlnzxPF+eCimSl92qnuNGR42gkpOQKP1bnvTwkSjRTBL+VNC5EcFhtCuQ==",
"requires": {
- "buffer-writer": "1.0.1",
+ "buffer-writer": "2.0.0",
"packet-reader": "0.3.1",
"pg-connection-string": "0.1.3",
"pg-pool": "~2.0.3",
@@ -9174,7 +9394,7 @@
},
"semver": {
"version": "4.3.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
+ "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
"integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
}
}
@@ -9185,9 +9405,9 @@
"integrity": "sha1-Pu/lmX4G2Ugh5NUC5CtqHHP434I="
},
"pg-pool": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.3.tgz",
- "integrity": "sha1-wCIDLIlJ8xKk+R+2QJzgQHa+Mlc="
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.4.tgz",
+ "integrity": "sha512-Mi2AsmlFkVMpI28NreaDkz5DkfxLOG16C/HNwi091LDlOiDiQACtAroLxSd1vIS2imBqxdjjO9cQZg2CwsOPbw=="
},
"pg-types": {
"version": "1.12.1",
@@ -9206,16 +9426,6 @@
"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
"requires": {
"split": "^1.0.0"
- },
- "dependencies": {
- "split": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
- "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
- "requires": {
- "through": "2"
- }
- }
}
},
"pify": {
@@ -9231,7 +9441,7 @@
},
"pinkie-promise": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
@@ -9381,28 +9591,16 @@
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
"dev": true
},
- "ps-tree": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
- "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
- "dev": true,
- "requires": {
- "event-stream": "~3.3.0"
- }
- },
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"pstree.remy": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz",
- "integrity": "sha512-q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q==",
- "dev": true,
- "requires": {
- "ps-tree": "^1.1.0"
- }
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.2.tgz",
+ "integrity": "sha512-vL6NLxNHzkNTjGJUpMm5PLC+94/0tTlC1vkP9bdU0pOHih+EujMjgMTwfZopZvHWRFbqJ5Y73OMoau50PewDDA==",
+ "dev": true
},
"public-encrypt": {
"version": "4.0.3",
@@ -9625,32 +9823,32 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
}
},
"react": {
- "version": "16.5.2",
- "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz",
- "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==",
+ "version": "16.6.3",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz",
+ "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
- "schedule": "^0.5.0"
+ "scheduler": "^0.11.2"
}
},
"react-dom": {
- "version": "16.5.2",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.5.2.tgz",
- "integrity": "sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==",
+ "version": "16.6.3",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz",
+ "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
- "schedule": "^0.5.0"
+ "scheduler": "^0.11.2"
}
},
"react-event-listener": {
@@ -9757,15 +9955,14 @@
}
},
"readdirp": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
- "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "minimatch": "^3.0.2",
- "readable-stream": "^2.0.2",
- "set-immediate-shim": "^1.0.1"
+ "graceful-fs": "^4.1.11",
+ "micromatch": "^3.1.10",
+ "readable-stream": "^2.0.2"
}
},
"rechoir": {
@@ -9964,7 +10161,7 @@
"dependencies": {
"jsesc": {
"version": "0.5.0",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+ "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
"dev": true
}
@@ -10177,11 +10374,12 @@
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
- "schedule": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.5.0.tgz",
- "integrity": "sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==",
+ "scheduler": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.2.tgz",
+ "integrity": "sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg==",
"requires": {
+ "loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
},
@@ -10295,12 +10493,6 @@
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true
},
- "set-immediate-shim": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
- "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
- "dev": true
- },
"set-value": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
@@ -10515,9 +10707,9 @@
}
},
"source-list-map": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
- "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+ "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
"dev": true
},
"source-map": {
@@ -10537,6 +10729,24 @@
"urix": "^0.1.0"
}
},
+ "source-map-support": {
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+ "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
"source-map-url": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
@@ -10575,10 +10785,9 @@
"dev": true
},
"split": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
- "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
- "dev": true,
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+ "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
"requires": {
"through": "2"
}
@@ -10631,7 +10840,7 @@
},
"stream-browserify": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"dev": true,
"requires": {
@@ -10639,15 +10848,6 @@
"readable-stream": "^2.0.2"
}
},
- "stream-combiner": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
- "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
- "dev": true,
- "requires": {
- "duplexer": "~0.1.1"
- }
- },
"stream-connect": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz",
@@ -10669,9 +10869,9 @@
}
},
"stream-each": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
- "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
"requires": {
"end-of-stream": "^1.1.0",
"stream-shift": "^1.0.0"
@@ -10800,6 +11000,16 @@
"iterall": "^1.2.1",
"symbol-observable": "^1.0.4",
"ws": "^5.2.0"
+ },
+ "dependencies": {
+ "ws": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ }
}
},
"supports-color": {
@@ -10909,6 +11119,198 @@
"execa": "^0.7.0"
}
},
+ "terser": {
+ "version": "3.10.12",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.12.tgz",
+ "integrity": "sha512-3ODPC1eVt25EVNb04s/PkHxOmzKBQUF6bwwuR6h2DbEF8/j265Y1UkwNtOk9am/pRxfJ5HPapOlUlO6c16mKQQ==",
+ "dev": true,
+ "requires": {
+ "commander": "~2.17.1",
+ "source-map": "~0.6.1",
+ "source-map-support": "~0.5.6"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "terser-webpack-plugin": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz",
+ "integrity": "sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==",
+ "dev": true,
+ "requires": {
+ "cacache": "^11.0.2",
+ "find-cache-dir": "^2.0.0",
+ "schema-utils": "^1.0.0",
+ "serialize-javascript": "^1.4.0",
+ "source-map": "^0.6.1",
+ "terser": "^3.8.1",
+ "webpack-sources": "^1.1.0",
+ "worker-farm": "^1.5.2"
+ },
+ "dependencies": {
+ "cacache": {
+ "version": "11.3.1",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.1.tgz",
+ "integrity": "sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==",
+ "dev": true,
+ "requires": {
+ "bluebird": "^3.5.1",
+ "chownr": "^1.0.1",
+ "figgy-pudding": "^3.1.0",
+ "glob": "^7.1.2",
+ "graceful-fs": "^4.1.11",
+ "lru-cache": "^4.1.3",
+ "mississippi": "^3.0.0",
+ "mkdirp": "^0.5.1",
+ "move-concurrently": "^1.0.1",
+ "promise-inflight": "^1.0.1",
+ "rimraf": "^2.6.2",
+ "ssri": "^6.0.0",
+ "unique-filename": "^1.1.0",
+ "y18n": "^4.0.0"
+ }
+ },
+ "find-cache-dir": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
+ "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
+ "dev": true,
+ "requires": {
+ "commondir": "^1.0.1",
+ "make-dir": "^1.0.0",
+ "pkg-dir": "^3.0.0"
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "lru-cache": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
+ "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
+ "dev": true,
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^3.0.2"
+ }
+ },
+ "mississippi": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+ "dev": true,
+ "requires": {
+ "concat-stream": "^1.5.0",
+ "duplexify": "^3.4.2",
+ "end-of-stream": "^1.1.0",
+ "flush-write-stream": "^1.0.0",
+ "from2": "^2.1.0",
+ "parallel-transform": "^1.1.0",
+ "pump": "^3.0.0",
+ "pumpify": "^1.3.3",
+ "stream-each": "^1.1.0",
+ "through2": "^2.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+ "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+ "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+ "dev": true,
+ "requires": {
+ "find-up": "^3.0.0"
+ }
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "schema-utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+ "dev": true,
+ "requires": {
+ "ajv": "^6.1.0",
+ "ajv-errors": "^1.0.0",
+ "ajv-keywords": "^3.1.0"
+ }
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "ssri": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+ "dev": true,
+ "requires": {
+ "figgy-pudding": "^3.5.1"
+ }
+ },
+ "yallist": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+ "dev": true
+ }
+ }
+ },
"test-value": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/test-value/-/test-value-3.0.0.tgz",
@@ -10942,12 +11344,36 @@
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"through2": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
- "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
"requires": {
- "readable-stream": "^2.1.5",
+ "readable-stream": "~2.3.6",
"xtend": "~4.0.1"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.6",
+ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
}
},
"tildify": {
@@ -11073,9 +11499,9 @@
"dev": true
},
"ts-loader": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.2.1.tgz",
- "integrity": "sha512-KC0cOvsFVyxBlg5h9jvaMlIL2tNsyQLvT2/OvIlO0AMUBJ4iXTtOfaDEqvmqv2lM/icekQfDsP2PsYBCDHpuOQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.0.tgz",
+ "integrity": "sha512-lGSNs7szRFj/rK9T1EQuayE3QNLg6izDUxt5jpmq0RG1rU2bapAt7E7uLckLCUPeO1jwxCiet2oRaWovc53UAg==",
"dev": true,
"requires": {
"chalk": "^2.3.0",
@@ -11121,9 +11547,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"typescript": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz",
- "integrity": "sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==",
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
+ "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
"dev": true
},
"typical": {
@@ -11153,46 +11579,6 @@
"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
"optional": true
},
- "uglifyjs-webpack-plugin": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz",
- "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
- "dev": true,
- "requires": {
- "cacache": "^10.0.4",
- "find-cache-dir": "^1.0.0",
- "schema-utils": "^0.4.5",
- "serialize-javascript": "^1.4.0",
- "source-map": "^0.6.1",
- "uglify-es": "^3.3.4",
- "webpack-sources": "^1.1.0",
- "worker-farm": "^1.5.2"
- },
- "dependencies": {
- "commander": {
- "version": "2.13.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
- "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
- "dev": true
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
- },
- "uglify-es": {
- "version": "3.3.9",
- "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
- "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
- "dev": true,
- "requires": {
- "commander": "~2.13.0",
- "source-map": "~0.6.1"
- }
- }
- }
- },
"uid-safe": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
@@ -11310,17 +11696,17 @@
}
},
"unique-filename": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
- "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
"requires": {
"unique-slug": "^2.0.0"
}
},
"unique-slug": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
- "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+ "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
"requires": {
"imurmurhash": "^0.1.4"
}
@@ -11625,15 +12011,15 @@
}
},
"webpack": {
- "version": "4.20.2",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.20.2.tgz",
- "integrity": "sha512-75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==",
+ "version": "4.26.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.26.0.tgz",
+ "integrity": "sha512-J/dP9SJIc5OtX2FZ/+U9ikQtd6H6Mcbqt0xeXtmPwYGDKf8nkbOQQA9KL2Y0rJOsN1Al9Pdn+/j63X58ub8gvQ==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.7.8",
- "@webassemblyjs/helper-module-context": "1.7.8",
- "@webassemblyjs/wasm-edit": "1.7.8",
- "@webassemblyjs/wasm-parser": "1.7.8",
+ "@webassemblyjs/ast": "1.7.11",
+ "@webassemblyjs/helper-module-context": "1.7.11",
+ "@webassemblyjs/wasm-edit": "1.7.11",
+ "@webassemblyjs/wasm-parser": "1.7.11",
"acorn": "^5.6.2",
"acorn-dynamic-import": "^3.0.0",
"ajv": "^6.1.0",
@@ -11651,7 +12037,7 @@
"node-libs-browser": "^2.0.0",
"schema-utils": "^0.4.4",
"tapable": "^1.1.0",
- "uglifyjs-webpack-plugin": "^1.2.4",
+ "terser-webpack-plugin": "^1.1.0",
"watchpack": "^1.5.0",
"webpack-sources": "^1.3.0"
},
@@ -11912,9 +12298,9 @@
"dev": true
},
"widest-line": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
- "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+ "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
"dev": true,
"requires": {
"string-width": "^2.1.1"
@@ -12033,9 +12419,9 @@
}
},
"ws": {
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
- "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
+ "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
"requires": {
"async-limiter": "~1.0.0"
}
diff --git a/package.json b/package.json
index ac8c03ca417cdfa277b6052e118cd5b0ee24464f..a99aefd15831e6dcca385b2684a422799e5b8292 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"build": "webpack --mode production",
"dev": "webpack --mode development",
"watch": "webpack --watch --mode development",
- "start": "nodemon --watch build build/bundle.js",
+ "start": "nodemon --watch build ./build/bundle.js",
"doc": "jsdoc --configure configfile_doc.json",
"lint": "eslint src/"
},
@@ -17,25 +17,25 @@
"author": "Binet Réseau",
"license": "ISC",
"dependencies": {
- "apollo-server-express": "^2.1.0",
+ "apollo-server-express": "^2.2.2",
"body-parser": "^1.18.3",
"colors": "^1.3.2",
"connect-ensure-login": "^0.1.1",
"connect-flash": "^0.1.1",
"cookie-parser": "^1.4.3",
- "copy-webpack-plugin": "^4.5.3",
- "cors": "^2.8.4",
+ "copy-webpack-plugin": "^4.6.0",
+ "cors": "^2.8.5",
"dotenv": "^6.1.0",
"express": "^4.16.4",
"express-jwt": "^5.3.1",
"express-session": "^1.15.6",
"file-loader": "^1.1.11",
"fs": "0.0.1-security",
- "fuse.js": "^3.2.1",
+ "fuse.js": "^3.3.0",
"graphql": "^14.0.2",
"graphql-tools": "^3.1.1",
"graphql-voyager": "^1.0.0-rc.26",
- "jsonwebtoken": "^8.3.0",
+ "jsonwebtoken": "^8.4.0",
"knex": "^0.15.2",
"ldap-escape": "^1.1.5",
"ldapjs": "^1.0.2",
@@ -45,26 +45,26 @@
"passport": "^0.4.0",
"passport-ldapauth": "^2.1.0",
"path": "^0.12.7",
- "pg": "^7.5.0",
+ "pg": "^7.6.1",
"pug": "^2.0.3",
- "react": "^16.5.2",
- "react-dom": "^16.5.2",
+ "react": "^16.6.3",
+ "react-dom": "^16.6.3",
"serve-favicon": "^2.5.0",
"url-loader": "^0.6.2"
},
"devDependencies": {
- "@babel/cli": "^7.1.2",
- "@babel/core": "^7.1.2",
+ "@babel/cli": "^7.1.5",
+ "@babel/core": "^7.1.6",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
- "@babel/preset-env": "^7.1.0",
+ "@babel/preset-env": "^7.1.6",
"@babel/preset-typescript": "^7.1.0",
"@types/connect-ensure-login": "^0.1.4",
"@types/connect-flash": "0.0.34",
"@types/graphql": "^0.13.4",
"@types/knex": "^0.14.26",
- "@types/node": "^10.11.7",
- "@types/passport": "^0.4.6",
+ "@types/node": "^10.12.10",
+ "@types/passport": "^0.4.7",
"babel-eslint": "^8.2.6",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
@@ -76,10 +76,10 @@
"jsdoc": "^3.5.5",
"jsdoc-babel": "^0.4.0",
"jsdoc-to-markdown": "^4.0.1",
- "nodemon": "^1.18.4",
- "ts-loader": "^5.2.1",
- "typescript": "^3.1.3",
- "webpack": "^4.20.2",
+ "nodemon": "^1.18.6",
+ "ts-loader": "^5.3.0",
+ "typescript": "^3.1.6",
+ "webpack": "^4.26.0",
"webpack-cli": "^3.1.2",
"webpack-graphql-loader": "^1.0.0",
"webpack-node-externals": "^1.7.2"
diff --git a/src/adminview/admin_router.ts b/src/adminview/admin_router.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e672d8fdf425ae31fd5d8270b68fbdd104dd3240
--- /dev/null
+++ b/src/adminview/admin_router.ts
@@ -0,0 +1,217 @@
+/**
+ * @file Ce fichier définit le routage d'URL au sein de l'interface du _backend_.
+ * Les URLs à résoudre ici sont les /adminview/* (et ce sont les seules).
+ *
+ * @desc Cette interface est destinée à n'être accessible qu'aux administrateurs du backend
+ * Filtrage basique : déjà il faut que la personne connaisse l'adresse IP ou le hostname du backend...
+ * L'authentification est basée sur passport avec ldapauth (comme pour les requêtes GraphQL), et
+ * l'autorisation se fait à la main en vérifiant l'appartenance de l'uid à une whitelist.
+ *
+ * Par cette interface admin, on a accès :
+ * - à une API REST fait-maison (peut-être encore à débugger),
+ * permettant de consulter la base de donnée interne à Sigma, via des requêtes construites avec Knex.
+ * accessible par les paths `/adminview/db/:table?`
+ * - à GraphQL Voyager, un package qui permet d'afficher une représentation sous forme de graphe du schéma GraphQL,
+ * acessible par le path `/adminview/voyager`
+ * - à GraphQL Playground, qui permet d'écrire ses propres requêtes GraphQL et de les exécuter.
+ * il est en fait accessible sans authentification du tout, au path `/graphql`, l'interface admin ne fait que fournir un lien vers ce path
+ * il est désactivé en production : "When NODE_ENV is set to production, GraphQL Playground (as well as introspection) is disabled as a production best-practice"
+ * https://www.apollographql.com/docs/apollo-server/features/graphql-playground.html#Configuring-Playground
+ *
+ * @author manifold, kadabra
+ *
+ * @todo whitelist the authorized admin uids; don't only use ensureLoggedIn
+ * @todo check that REST API is finished and functional
+ * @todo Les res.redirect() sont censes supporter les paths relatifs (et donc pas besoin de repreciser /adminview/* a chaque fois)
+ * mais ca marche visiblement pas... Donc j'ai mis les paths absolus dans les res.redirect(). C'est un peu moche... essayer de modifier ca
+ */
+import { Router } from 'express';
+// packages pour l'authentification
+import passport from 'passport';
+import { ensureLoggedIn } from 'connect-ensure-login';
+import flash from 'connect-flash';
+// packages pour l'API REST et pour GraphQL Voyager
+import knex from '../../db/knex_router';
+import { express as graphqlVoyager } from 'graphql-voyager/middleware';
+
+const whitelist = [
+ "magi.karp",
+ "mew.two",
+ "lippou.tou",
+ "guillaume.wang",
+]
+
+/**
+ * @desc Création du Express router et setup de middlewares basiques
+ * =================================================================
+ * router: an Express router. https://expressjs.com/en/4x/api.html#router
+ * See also https://scotch.io/tutorials/learn-to-use-the-new-router-in-expressjs-4
+ * = a "sub-middleware stack", a “mini-application" inside the main application
+ *
+ * router automatically inherits from views and 'pug' view engine, that were set in app.ts (app.set(...))
+ */
+const router = Router();
+
+router.use(flash());
+
+let port = process.env.PORT || 3000;
+
+/**
+ * @desc Paths pour l'authentification : login, logout, page d'accueil
+ * ===================================================================
+ * Le login se fait en POST. Faire un GET Ã la racine / renvoie sur
+ * /login ou sur /admin selon que l'utilisateur est connecté ou non.
+ */
+
+router.get('/', function (req, res) {
+ res.redirect('/adminview/admin');
+});
+
+router.get('/avlogin', function (req, res) {
+ // lets pug render adminview/views/login.pug with specified attributes
+ res.render('login', {
+ title: 'Login', port: port,
+ errorMessage: req.flash('error')
+ });
+});
+
+router.get('/admin',
+ ensureLoggedIn('/adminview/avlogin'),
+ function (req, res) {
+ // Une erreur a ce stade peut etre triggered si req.user n'existe pas
+ // mais pour autant on est assures que la personne est bien authentifiee
+ // donc on laisse passer sans déclencher d'erreur 500
+ let userName;
+ if (req.user) {
+ userName = req.user.uid;
+ } else {
+ console.log("Warning: une requete est arrivée /adminview/admin où req.user n'existe pas");
+ userName = "personne";
+ }
+ res.render('home', {
+ title: 'Home', port: port,
+ userName: userName
+ });
+ }
+);
+
+router.post('/avlogin',
+ passport.authenticate('ldapauth', {
+ failureRedirect: '/adminview/avlogin',
+ failureFlash: true
+ }),
+ (req, res) => {
+ // If this function gets called, authentication was successful.
+ // `req.user` contains the authenticated user.
+ // lookup req.user against whitelist of admin users
+ console.log("POST request to /adminview/avlogin: OK, authenticated by LDAP. req.user: ");
+ console.log(req.user);
+ if (req.user.uid in whitelist) {
+ console.log("is an admin");
+ res.redirect("/adminview/admin");
+ } else {
+ console.log("is NOT an admin");
+ req.flash('error: not an admin');
+ req.logout();
+ res.redirect('/adminview/admin');
+ }
+ }
+);
+
+router.post('/avlogout', function (req, res) {
+ req.logout();
+ res.redirect('/adminview/admin');
+});
+
+/**
+ * @desc GraphQL Voyager
+ * =====================
+ * affiche une représentation sous forme de graphe du schema GraphQL
+ */
+router.use('/voyager',
+ ensureLoggedIn('/login'),
+ graphqlVoyager({ endpointUrl: '/graphql' })
+);
+
+
+/**
+ * @desc API REST fait-maison
+ * ==========================
+ * `/admin/db/:table?columns=bla` fait une requete SELECT bla FROM table, et renvoie un JSON contenant le resultat
+ */
+router.use('/voyager',
+ ensureLoggedIn('/login'),
+ graphqlVoyager({ endpointUrl: '/graphql' })
+);
+// Je pense qu'on ferait mieux d'utiliser ca
+// https://expressjs.com/en/4x/api.html#router.route
+router.get('/db?', function (req, res) {
+ let table_name = req.query.table;
+ let columns = req.query.columns;
+
+ res.redirect(`/adminview/db/${table_name}?columns=${columns}`);
+});
+
+/**
+ * @function Knex_API: Get table
+ * @summary Effectue une requête pour une table dans la BDD
+ * @argument {string} table_name - La table voulue par l'utilisateur.
+ */
+router.get('/db/:table_name?', function (req, res) {
+
+ // get columns from query
+ let columns;
+ if (req.query.columns) {
+ columns = req.query.columns.split(',');
+ } else {
+ columns = null;
+ }
+ console.log(columns);
+
+ knex.select(columns).from(req.params.table_name).then(function (table) {
+ res.setHeader("Content-Type", "application/json");
+ res.write(JSON.stringify(table, null, 2));
+ res.end();
+ }, function () {
+ res.status(400);
+ res.render('error', {
+ status: res.statusCode,
+ error_message: "Bad request: can't find table " + req.params.table_name
+ });
+ res.end();
+ }
+ );
+});
+
+/**
+ * @desc Error handling
+ * ====================
+ */
+/**
+ * @function Error_404_catcher
+ * @summary Catche les requêtes en dehors des URL acceptées
+ */
+router.use((req, res, next) => {
+ let err = new Error('Not found');
+ res.status(404);
+ next(err);
+});
+
+/**
+ * @function Error_404_handler
+ * @summary Gère les erreurs 404
+ */
+router.use((err, req, res, next) => {
+ console.log("adminview: Entering error handler");
+ res.locals.message = err.message;
+ console.log(err.message);
+
+ res.status(err.status || 500);
+ let error_message = res.statusCode == 404 ? 'Not found.' : 'Internal server error.';
+ res.render('error', {
+ status: res.statusCode,
+ error_message: error_message
+ });
+});
+
+export default router;
diff --git a/src/css/error.css b/src/adminview/css/error.css
similarity index 100%
rename from src/css/error.css
rename to src/adminview/css/error.css
diff --git a/src/css/style.css b/src/adminview/css/style.css
similarity index 100%
rename from src/css/style.css
rename to src/adminview/css/style.css
diff --git a/src/adminview/favicon.ico b/src/adminview/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..67ff63fc603b159a9ae03a74d178ce8e84ff94dd
Binary files /dev/null and b/src/adminview/favicon.ico differ
diff --git a/src/views/error.pug b/src/adminview/views/error.pug
similarity index 100%
rename from src/views/error.pug
rename to src/adminview/views/error.pug
diff --git a/src/views/home.pug b/src/adminview/views/home.pug
similarity index 94%
rename from src/views/home.pug
rename to src/adminview/views/home.pug
index 966769884064892de21df0dea323adf3d8078d36..6c5035b794665a1837a1c699c3552ba14bc09353 100644
--- a/src/views/home.pug
+++ b/src/adminview/views/home.pug
@@ -24,4 +24,4 @@ block content
a(class="button button-small",href="/graphql") Playground
h2 GraphQL Voyager
p Voyager est un outil de visualisation du « graphe » derrière l'API.
- a(class="button button-small",href="/voyager") Voyager
+ a(class="button button-small",href="/adminview/voyager") Voyager
diff --git a/src/views/layout.pug b/src/adminview/views/layout.pug
similarity index 100%
rename from src/views/layout.pug
rename to src/adminview/views/layout.pug
diff --git a/src/views/login.pug b/src/adminview/views/login.pug
similarity index 100%
rename from src/views/login.pug
rename to src/adminview/views/login.pug
diff --git a/src/app.ts b/src/app.ts
index ec374e4a2df6b26266c534c0f6833f4ced6bc1f2..1f45c14d3e4e64ffec13a848490be751ffa2cad8 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,132 +1,123 @@
/**
* @file Initialise et configure le serveur Express sur lequel tourne le back.
*
- * La configuration inclut tout le _middleware_ définissant les API et les services
- * nécessaire utilisés, comme `express-session`, GraphiQL, GraphQL Voyager.
+ * Inclut les middlewares des packages utilisés: apollo-server, passportjs, morgan...
+ * et branche nos propres middleware : l'API GraphQL et l'interface admin du backend (adminview).
+ * Pour comprendre ce que fait chaque package, se référer à leur page sur https://www.npmjs.com.
*
- * @todo changer cette description... ^
- * @todo qu'arrive-t-il aux requetes avec un cookie expire? elles ne sont traitees ni par passport.session() ni par passport.authenticate('ldapauth')...
+ * On peut considérer que les app.use (et app.get et app.post) sont pattern-matchés et
+ * exécutés séquentiellement. http://expressjs.com/en/guide/using-middleware.html
*
* @author manifold, kadabra
*/
import express from 'express';
import bodyParser from 'body-parser';
// packages pour graphql
-import { express as graphqlVoyager } from 'graphql-voyager/middleware';
-// replacement of express-graphql, which hasn't been updated in 6 months
-import { ApolloServer } from 'apollo-server-express'; //hawkspar->manifold VSCode râle ici pr moi
-// typeDefs and resolvers
-import schema from './graphql/schema';
-// packages pour adminview
-import { ensureLoggedIn } from 'connect-ensure-login';
-import flash from 'connect-flash';
-import router from './routing/admin.router';
+import { ApolloServer } from 'apollo-server-express';
+import schema from './graphql/schema'; // definition du schéma et des resolvers
+// l'interface admin du backend (adminview)
+import router from './adminview/admin_router';
// packages pour l'authentification
import passport from 'passport';
-import session from 'express-session';
-import cookieParser from 'cookie-parser'; //hawkspar->manifold VSCode râle ici pr moi
+import expressSession from 'express-session';
+import cookieParser from 'cookie-parser';
import cors from 'cors';
-// packages divers
-import favicon from 'serve-favicon';
+// HTTP request logger
import morgan from 'morgan';
-// packages pour pouvoir importer depuis des fichiers de config
+// packages pour pouvoir importer des fichiers de config
import path from 'path';
+// config des paramètres de connexion au LDAP
+import { ldapConfig, credentialsLdapConfig } from './ldap/config';
-import {ldapConfig, credentialsLdapConfig} from './ldap/config';
-
-const { dn, passwd } = credentialsLdapConfig;
-
-// "The app object conventionally denotes the Express application"
-// see https://expressjs.com/en/4x/api.html#app
-const app = express();
+// configure passport, pour l'authentification ldap et pour comment gérer les sessions (serializeUser/deserializeUser)
+import './config_passport';
-// Parse incoming HTTP request bodies, available under the req.body property. cf www.npmjs.com/package/body-parser
+/**
+ * @desc Création de l'application Express et setup de middlewares basiques
+ * ========================================================================
+ */
+const app = express();
+// parse incoming HTTP request bodies, available under the req.body property
app.use(bodyParser.json()); //parses bodies of media type "application/json"
app.use(bodyParser.urlencoded({ //parses bodies of media type "application/x-www-form-urlencoded"
- extended: true //use qs library (quoi que ca veuille dire o.O)
+ extended: true //use qs library (see https://www.npmjs.com/package/body-parser#bodyparserurlencodedoptions)
}));
-//parses Cookie header and populate req.cookies with an object keyed by the cookie names. was necessary for express-session before its v1.5.0. on peut probablement l'enlever desormais.
-app.use(cookieParser());
-
-// cache le fait que l'application tourne sous Express dans le header HTTP.
+// parse Cookie header and populate req.cookies with an object keyed by the cookie names
+//app.use(cookieParser()); <-- req.cookies n'est pas utilisé.
+// ne *pas* inclure de header HTTP publicisant que l'application tourne sous Express
app.disable('x-powered-by');
+// use morgan (HTTP request logger middleware)
app.use(morgan('dev'));
-app.use(favicon(path.resolve('./', 'assets', 'favicon.ico')));
-// specifies path to static assets. ......je comprends pas ce que c'est. TODO
-app.use('/assets', express.static(path.resolve('./', 'assets')));
-/**
- * @desc AUTHENTIFICATION POUR LES REQUETES POSSEDANT UN COOKIE ET PROVENANT D'UN UTILISATEUR DEJA AUTHENTIFIE
- * Remarque: introduit aussi les middlewares session et passport,
- * qui sont aussi utiles pour l'authentification dans les autres cas.
- */
+const FRONTEND_SERVER_URL = process.env.FRONTEND_SERVER_URL || 'http://localhost:8888';
+// Options de configuration pour le _middleware_ `cors`.
+// CORS = Cross Origin Resource Sharing
+const corsOptions = {
+ //configures the "Access-Control-Allow-Origin" CORS header, declaring that sigma-back wants to make resources accessible to that site (and that site only)
+ origin: FRONTEND_SERVER_URL,
+ //configures the "Access-Control-Allow-Credentials" CORS header, allowing cookies to be included on cross-origin requests
+ credentials: true
+};
+app.use(cors(corsOptions));
+
+// respond to "GET /favicon.ico" requests
+// favicon middleware is placed near the top of the middleware stack, to answer favicon requests faster, as they are relatively frequent
+// (plus, they should not have to trigger any authentication middleware)
+import favicon from 'serve-favicon'; // tres tres important :p
+app.use(favicon(path.resolve(__dirname, 'adminview', 'favicon.ico')));
/**
- * WTF??? why is sessionSecret in ldap_config.json? it has nothing to do with ldap.
- * @todo FIX
+ * @desc Authentification de la requête contre le session-store (cookie)
+ * =====================================================================
+ * Si la requête possède un cookie, on regarde dans la session s'il s'agit d'un cookie valide.
+ * Si oui, on récupère l'uid de l'utilisateur correspondant dans la session.
+ * L'uid qu'on a trouvé est stocké dans req.user, et sera passé à GraphQL, dans le context.
+ * (Si non, on passera quand même dans context un uid spécial signifiant que l'utilisateur n'est pas authentifié. cf la définition de context, plus loin)
+ *
+ * NB : la session ne contient que les correspondances cookie / uid, et rien d'autre.
+ * passport.serializeUser et .deserializeUser servent en théorie à traduire
+ *
+ * https://stackoverflow.com/questions/22052258/what-does-passport-session-middleware-do
+ *
+ * On a un petit peu la meme demarche que l'Option 1 de
+ * https://blog.apollographql.com/a-guide-to-authentication-in-graphql-e002a4039d1
*/
-/**
-/* defines parameters for *session store*. (adds field req.session and do some magic stuff)
- * basically, searches for a session matching the received cookie and, if found, adds field req.blasomethingbla containing serialized
- * object representing user (i.e. similar to what passport.serializeUser() could produce)
- * @todo do this right, express-session docs warns that isn't for prod!
- * it is important to configure this right!!! please check out https://www.npmjs.com/package/express-session
- * and make sure you understand the way session is stored. (en vrai c'est vraiment important...)
+ /**
+ * it is also here that we define parameters for *session store*. https://redislabs.com/blog/cache-vs-session-store/
+ * configure this right, as express-session docs warns that the default config is not good for prod!!
+ * @todo [critical] configure express-session (session store and other options)
+ * @todo choose a session secret and where to store it
+ * https://www.npmjs.com/package/express-session
*/
-app.use(session({
- secret: ldapConfig.sessionSecret,
- resave: true,
- saveUninitialized: false,
-}));
+// load data from the session identified by the cookie (if one exists), into req.session
+// on ne manipulera pas req.session directement, on laisser toujours passport le faire pour nous
+ app.use(expressSession({
+ //secret: ldapConfig.sessionSecret, <-- wtf? nothing to do with ldap!
+ secret: "asdfjklkjfdsasdfjklkljfdsa",
+}));
app.use(passport.initialize());
-
-//GHETTO
-//initialize Passport. (adds hidden field req._passport and do some magic stuff)
-//app.use(passport.session()); //this is equivalent to app.use(passport.authenticate('session'))
-//this is equivalent to app.use(passport.authenticate('session'))
-app.use(passport.session(), (req, res, next)=>{
- const user = req.user ? req.user.uid : "none";
- console.log(
- `passport.session: found user: ${user}, authenticated: ${req.isAuthenticated()}`);
+//passport.session(): load the user object onto req.user if a serialised user object was found in the req.session
+// aucun effet sur les requetes sans cookie ou les requetes avec cookie expired,
+// puisqu'elles ne sont pas dans req.session, puisque non-reconnues par app.use(expressSession(...))
+//(see http://toon.io/understanding-passportjs-authentication-flow/)
+app.use(passport.session(), (req, res, next) => {
+ let user = req.user ? req.user.uid : "none";
+ console.log(`passport.session(): found user: ${user}, authenticated: ${req.isAuthenticated()}`);
next();
});
-// *aucun* effet sur les requetes n'ayant pas ete reconnues par app.use(session(...)) (e.g. les requetes sans cookie ou les requetes avec cookie expired). source: lecture directe du code passport/lib/strategies/session.js sur github... :/
-
-// connect-flash is middleware for flashing messages, used in adminview
-app.use(flash());
-
-/**
- * @desc SETUP DE ADMINVIEW
- */
-// setting up view engine for pug, for adminview
-console.log("Running at", __dirname);
-let viewpath = path.resolve(__dirname, 'views');
-app.set('views', viewpath);
-app.set('view engine', 'pug');
-
-
/**
- * @desc AUTHENTIFICATION POUR LES REQUETES DE CONNEXION VIA LDAP VENANT DU FRONT
- * i.e. endpoint for *frontend's* authentication requests (login through adminview/avlogin are caught by the router in admin_router.js)
+ * @desc Répondre aux requêtes de connexion par LDAP (venant du front)
+ * ===================================================================
+ * i.e. endpoint for frontend's authentication requests (logins through adminview/avlogin are caught by the router in admin_router.js)
* i.e. quand l'utilisateur submit le formulaire de login avec ses identifiants/mdp dans le front
- * Remarque: configure aussi passport pour l'authentification ldap, ce qui est aussi utile pour les requetes de connexion via ldap venant de adminview
+ *
+ * @todo gérer le cas où une requête à /login est reçue, mais où cette requête contient un cookie valide
+ * @todo vérifier qu'on ne fallthrough pas, i.e. qu'on renvoie une response et qu'on ne trigger pas les middlewares suivants une fois celui-ci terminé
+ * @todo rassify
*/
-const FRONTEND_SERVER_URL = process.env.FRONTEND_SERVER_URL || 'http://localhost:8888';
-
-// Options de configuration pour le _middleware_ `cors`.
-// CORS = Cross Origin Resource Sharing
-const corsOptions = {
- origin: FRONTEND_SERVER_URL, // Configures the Access-Control-Allow-Origin CORS header. i.e. specifies that sigma-back wants to make resources accessible to this site (and this site only)
- credentials: true // Configures the Access-Control-Allow-Credentials CORS header. i.e. allows cookies to be included on cross-origin requests
-};
-app.use(cors(corsOptions));
-
-//GHETTO
-// Config de passport pour l'authentification ldap. Ne fait que *configurer* passport (aucun passport.authenticate() n'est appele, par exemple)
-import './config_passport';
//with custom callback:
//http://www.passportjs.org/docs/authenticate/#custom-callback
@@ -177,32 +168,14 @@ app.post('/login', (req, res, next) => {
})(req, res, next);
});
-//without custom callback:
-/*
-// http://toon.io/understanding-passportjs-authentication-flow/
-app.post('/login',
- passport.authenticate('ldapauth'),
- function (req, res) {
- // If this function gets called, authentication was successful.
- // `req.user` contains the authenticated user.
- console.log("Frontend authentication succeeded");
- res.json({
- message: 'Authentication succeeded',
- authSucceeded: true
- });
- }
-);
-*/
-
/**
- * @desc API GraphQL
+ * @desc Servir l'API GraphQL Ã proprement parler
+ * ==============================================
*/
-/**
- * @desc Define GraphQL request context object, through a callback, with authorization.
- * See: https://github.com/apollographql/apollo-server/blob/master/docs/source/best-practices/authentication.md
- *
- */
+// Define GraphQL request's context object, through a callback, with authorization.
+// See: https://www.apollographql.com/docs/apollo-server/features/authentication.html
+
const context = async ({ req }) => {
let uid;
let password;
@@ -224,15 +197,17 @@ const context = async ({ req }) => {
console.log(err);
}
} else {
- // FOR DEVELOPMENT ONLY. for production, replace with a "publicUser" or "notLoggedInUser" or something.
- uid = dn.split("=")[1].split(",")[0];
- password = passwd;
+ // set a special uid for non-authenticated requests
+ // /!\ FOR DEVELOPMENT ONLY: use the one in the ldap config .json file
+ // for production, replace with a "publicUser" or "notLoggedInUser" or something.
+ uid = credentialsLdapConfig.dn.split("=")[1].split(",")[0];
+ password = credentialsLdapConfig.passwd;
}
return {
request: req,
user: { uid, password }
- }
+ };
}
const server = new ApolloServer({
@@ -246,20 +221,49 @@ const server = new ApolloServer({
}
});
-server.applyMiddleware({ app });
+// path defaults to '/graphql'
+//server.applyMiddleware({ app, cors: corsOptions }); <-- TODO: is this necessary?
+server.applyMiddleware({ app });
-// GraphQL voyager affiche une représentation sous forme de graphe du schema GraphQL
-// accessible depuis adminview
-app.use('/voyager',
- /*ensureLoggedIn('/login'),*/
- graphqlVoyager({ endpointUrl: '/graphql' })
-);
+/**
+ * @desc Servir l'interface admin du backend ("adminview")
+ * =======================================================
+ * On redirige vers la "mini-application" adminview.
+ * Il s'agit en fait d'un express.Router, qui sert a creer un "sous-middleware stack".
+ * Par cette interface admin, on a accès :
+ * - à une API REST fait-maison (peut-être encore à débugger)
+ * - à GraphQL Voyager, un package qui permet d'afficher une représentation sous forme de graphe du schéma GraphQL.
+ */
+// servir les fichiers statiques (e.g. images) rendant l'interface jolie
+app.use('/assets', express.static(path.resolve(__dirname, '../', 'assets')));
+
+// setup the 'pug' view engine. the adminview "sub-app" will inherit this. https://expressjs.com/en/4x/api.html#app.set
+//console.log("Express app is running at (__dirname) ", __dirname);
+//console.log("Express app is running at (full path) ", path.resolve(__dirname));let viewpath = path.resolve(__dirname, 'adminview', 'views');
+let viewpath = path.resolve(__dirname, 'adminview', 'views');
+app.set('views', viewpath);
+app.set('view engine', 'pug');
-// on utilise un express.Router qui sert a creer un "sous-middleware stack".
app.use('/adminview', router); // catches and resolves HTTP requests to paths '/adminview/*'
+// also redirect other HTTP GET requests to the adminview router
+app.get('/', function (req, res) {
+ res.redirect('/adminview');
+});
+/**
+ * @desc Catch-all
+ * ===============
+ * Normalement aucune requête ne devrait arriver au dernier middleware :
+ * les requêtes GraphQL doivent être adressées à /graphql,
+ * les requêtes de connexion du frontend doivent être adressées à /login,
+ * les requêtes vers l'adminview doivent être adressées à /adminview/*
+ * Donc c'est qu'il y a un problème quelque part. On le log et on répond 500 Internal Server Error (ou 400 Bad Request?).
+ *
+ * @todo faire un loggage plus propre que ça...
+ */
app.use('/', (req, res) => {
- res.redirect('/adminview');
+ console.log("Erreur: une requête est arrivée au dernier middleware");
+ res.status(500).send({ error: "unexpectedly triggered catchall" });
});
export default app;
diff --git a/src/config_passport.js b/src/config_passport.js
index ca35df95e59b4e8b9b87e5a4937b5bd1794c1d82..050b5e932fae24ff015f06de14786806c0ac855e 100644
--- a/src/config_passport.js
+++ b/src/config_passport.js
@@ -1,20 +1,35 @@
/**
- * @description Configuration de passport pour utiliser l'authentification LDAP
+ * @file Configuration de passport pour utiliser l'authentification LDAP
* @author kadabra
- *
- * on a besoin d'authentification pour 2 trucs :
- * - l'accès a l'interface admin (admin_view) du back, définie dans admin_router.js
- * - le contexte graphQL
*
- * serializeUser permet d'obtenir une cle identifiant chaque user
- * deserializeUser fait une requête vers une BDD de users en utilisant cette cle, et met dans l'objet JS req.user toutes les infos issues de la BDD
- * Cette repartition permet de ne stocker dans la session (i.e. en mémoire sur le serveur) que la cle des utilisateurs connectes et de ne "charger en mémoire" toutes les infos de la BDD que lorsque nécessaire
- * cf https://stackoverflow.com/questions/27637609/understanding-passport-serialize-deserialize#27637668
- * et http://toon.io/understanding-passportjs-authentication-flow/
+ * http://toon.io/on-passportjs-specific-use-cases/#howtosplituppassportjsconfigurationbetweenmultiplefiles
+ *
+ * On utilise passport avec la strategie 'ldapauth' pour transmettre une tentative d'authentification au LDAP.
+ * Dans cette partie "requete au LDAP", passport a un role de client (du LDAP).
+ *
+ * passport joue aussi un role de serveur de l'utilisateur, en retransmettant la decision du LDAP (credentials valides ou invalides).
+ * On utilise passport avec sessions, ce qui signifie qu'en plus passport est un serveur "intelligent"
+ * cà d qu'il peut authentifier lui-même un utilisateur, identifié par un cookie, qui a déjà été authentifié par le LDAP.
+ * Ceci évite d'avoir à demander une authentif LDAP à chaque requête, et surtout évite à l'utilisateur d'avoir à envoyer son mdp LDAP à chaque requête
+ *
+ * Ceci est réalisé en gardant "en mémoire" (appelée session storage) une table de correspondance entre des cookies et des sessions
+ * Ainsi une requête est authentifiée dès lors qu'elle comporte un cookie correspondant à une "entrée" dans le session storage
+ * L'existence de sessions permet aussi de garder trace d'informations spécfiques à chaque utilisateur,
+ * au lieu de juste "il s'agit d'un utilisateur, on ne sait pas lequel, qui s'était authentifié au LDAP à un moment"
+ * Typiquement dans une session on stocke l'identifiant de l'utilisateur (bien sûr) (mais ça peut aussi être pratique d'y mettre d'autres trucs)
+ *
+ * La façon dont ce mécanisme est réalisé par passport peut paraître assez compliqué, ces deux liens en donnent une bonne explication
+ * https://stackoverflow.com/questions/27637609/understanding-passport-serialize-deserialize#27637668
+ * http://toon.io/understanding-passportjs-authentication-flow/
+ *
+ * En gros l'idée est la suivante
+ * serializeUser spécifie comment créer une clé identifiant un user, qui sera stockée dans la session
+ * deserializeUser fait une requête vers une BDD de users en utilisant cette clé, et met dans l'objet JS req.user toutes les infos issues de la BDD
+ * Cette répartition permet de ne stocker dans la session (i.e. en mémoire sur le serveur) que la clé des utilisateurs connectés et de ne "charger en mémoire" des infos de la BDD que lorsque nécessaire
*
* Mais en fait dans notre cas c'est graphql qui communique avec la BDD, donc on s'en fiche! On peut se contenter de dire a serializeUser et deserializeUser de ne s'occuper que du champ uid)
* (on pourrait penser que passer par deserializeUser permettrait de réduire le nombre d'interactions avec la BDD, mais en fait non car deserializeUser est appelé *a chaque requete*)
-*/
+ */
import passport from 'passport';
import LdapStrategy from 'passport-ldapauth';
import { ldapConfig } from './ldap/config';
@@ -22,31 +37,25 @@ import { ldapConfig } from './ldap/config';
// specifies options for 'ldapauth' strategy, to customize the behaviour of subsequent passport.authenticate('ldapauth') calls
passport.use(new LdapStrategy({
server: {
- url: ldapConfig.ldap.server,
+ url: ldapConfig.server,
//bindDn: '.............',
//bindCredentials: '..........',
- searchBase: ldapConfig.ldap.searchBase,
- searchFilter: ldapConfig.ldap.searchFilter,
+ // searchBase: ldapConfig.searchBase, TODO: this cannot be left empty.
+ // searchFilter: ldapConfig.searchFilter, TODO: this cannot be left empty.
//searchAttributes: ['givenName', 'sn'],
//tlsOptions: '..........',
},
-
//usernameField: 'username', // Field name where the username is found, defaults to username
//passwordField: 'password', // Field name where the password is found, defaults to password
- // given how LdapStrategy is coded, it is not necessary to do a verify callback
- // https://github.com/vesse/passport-ldapauth/blob/master/lib/passport-ldapauth/strategy.js#L230
- // (note that LdapStrategy has no default verify callback, the "verify" function (L105) is actually the "done" function that is called by the verify callback if we choose to make one)
- // we leave this commented out as a template for future use
+ // no verify callback is needed, as we leave the authentication layer as simple as possible
+ // we leave this, commented out, as a template for future use
/*
function (user, done) {
- // "verify callback", called after each passport.authenticate(...),
- // unless missing credentials (in which case a 400 Error is returned)
-
+ // "verify callback", called after each passport.authenticate(...), unless missing credentials (in which case a 400 Error is returned)
// "The purpose of a verify callback is to find the user that possesses a set of credentials" (from passport doc)
- // i.e. we query the database (in our case the LDAP) to get user's data
+ // i.e. we query the database (in our case the LDAP) to get user's *data*
console.log("Entering passport's verify callback");
-
if (user){
//if user exists
console.log("Successfully authenticated " + user.uid);
@@ -56,16 +65,26 @@ passport.use(new LdapStrategy({
}));
-//toujours bon a savoir pour faire des tests:
-//The result of the serializeUser method is attached to the session as req.session.passport.user
+/**
+ * @desc passport.serializeUser(function(user, done) {...})
+ * > LdapStrategy is only invoked on the route which uses the passport.authenticate middleware.
+ * > Only during this authentication passport.serializeUser is invoked allowing us the specify what user information should be stored in the session
+ *
+ * toujours bon a savoir pour faire des tests
+ * after using expressSession(), the serialised user object [previously stored into session store by passport.authenticate] can be found at req.session.passport.user
+ */
passport.serializeUser(function (user, done) {
console.log(`passport.serializeUser(): serializing user ${user.uid}`); // DEBUG
done(null, user.uid);
});
-//The first argument of deserializeUser corresponds to the key of the user object that was given to the done function in serializeUser
-//The fetched object is attached to the request object as req.user (available in all subsequent middleware)
+/**
+ * @desc passport.deserializeUser(function(user, done) {...})
+ * > passport.deserializeUser is invoked on every request by passport.session.
+ * > It enables us to load additional user information on every request.
+ * > This user object is attached to the request as req.user making it accessible in our request handling. (available in all subsequent middleware)
+ */
passport.deserializeUser(function (userUid, done) {
// console.log(`passport.deserializeUser(): deserializing user ${userUid}`); // DEBUG
done(null, { uid: userUid });
-});
\ No newline at end of file
+});
diff --git a/src/index.ts b/src/index.ts
index ace1d04588a12de5b2f9924baa38b4617578dec8..f55c10752cdc50e6dc083b745c74d68f7b3eeb6b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,8 +1,8 @@
/**
- * @file Lance le serveur configuré dans {@link server.ts}
+ * @file Lance le serveur configuré dans {@link app.ts}
* @author manifold
*/
-import dotenv from 'dotenv'; //hawkspar->manifold VSCode râle ici pr moi
+import dotenv from 'dotenv'; //loads environment variables from (hidden) .env file into process.env
dotenv.config();
import app from './app';
import colors from 'colors';
diff --git a/src/ldap/config.ts b/src/ldap/config.ts
index 8a9d8ad430f0cab239223504a62e5d9266b30939..422e6b59865d187f63d9faad7b68d636647f156f 100644
--- a/src/ldap/config.ts
+++ b/src/ldap/config.ts
@@ -7,8 +7,8 @@ import fs from 'fs';
import path from 'path';
import colors from 'colors';
// Point central ; tous les champs de la BDD sont 'cachés' dans config.json et pas visibles directement
-let path_config = path.resolve('..','ldap_config.json')
-let path_credentials = path.resolve('..','ldap_credentials.json')
+let path_config = path.resolve('ldap_config.json')
+let path_credentials = path.resolve('ldap_credentials.json')
console.log(colors.cyan("Loading LDAP config file from "+path_config));
console.log(colors.cyan("Loading LDAP credentials from "+path_credentials));
export const ldapConfig = JSON.parse(fs.readFileSync(path_config).toString());
diff --git a/src/routing/admin.router.ts b/src/routing/admin.router.ts
deleted file mode 100644
index c77b422d2e60d041836e30494b7d75b2674007cc..0000000000000000000000000000000000000000
--- a/src/routing/admin.router.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @file Ce fichier définit le routage d'URL au sein de l'interface du _backend_.
- * Il définit la page de connexion `/`, le panneau administrateur `/admin` et l'API REST \(`/db/:table?`)
- * permettant de consulter la base de donnée interne à Sigma, via des requêtes construites avec Knex.
- * @author manifold
- *
- * Les res.redirect() sont censes supporter les paths relatifs (et donc pas besoin de repreciser /adminview/* a chaque fois)
- * mais ca marche visiblement pas... Donc j'ai mis les paths absolus dans les res.redirect().
- */
-import { Router } from 'express';
-import knex from '../../db/knex_router';
-import passport from 'passport';
-import flash from 'connect-flash';
-import { ensureLoggedIn } from 'connect-ensure-login';
-
-const router = Router();
-
-router.use(flash());
-
-let port = process.env.PORT || 3000;
-
-
-/**
- * * @desc Le login se fait en POST. Faire un GET Ã la racine / renvoie sur
- * /login ou sur /admin selon que l'utilisateur est connecté ou non.
- */
-
-router.get('/', function (req, res) {
- res.redirect('/adminview/admin');
-});
-
-router.get('/avlogin', function (req, res) {
- // lets pug render src/views/login.pug with specified attributes
- res.render('login', {
- title: 'Login', port: port,
- errorMessage: req.flash('error') //hawkspar->manifold VSCode râle ici pr moi ; un commentaire ?
- });
-});
-
-router.get('/admin',
- ensureLoggedIn('/adminview/avlogin'),
- function (req, res) {
- let userName;
- // Une erreur a ce stade peut etre triggered si req.user n'existe pas
- // mais pour autant on est assures que la personne est bien authentifiee
- // donc on laisse passer sans déclencher d'erreur 500
- try {
- let user = req.user;
- userName = user.uid;
- } catch (err) {
- userName = "No one";
- }
- res.render('home', { title: 'Home', port: port, userName: userName });
- }
-);
-
-router.post('/avlogin',
- passport.authenticate('ldapauth', {
- successRedirect: '/adminview/admin',
- failureRedirect: '/adminview/avlogin',
- failureFlash: true
- }
- // on a besoin de faire un callback apres le passport.authenticate car
- // on souhaite garde l'information user.dn et body.password qq part.
- // TODO: essayer de garder ces informations plus proprement...
- // EDIT: en fait apparemment on a pas besoin de ces informations du tout
- /*
- function (req, res) {
- req.session.dn = req.user.dn;
- req.session.password = req.body.password;
-
- if (req.session.returnTo !== undefined) {
- res.redirect(req.session.returnTo); //TODO: <- euh ok ca marche mais c'est quoi ca?
- } else {
- res.redirect("/admin");
- }
- }
- */
- )
-);
-
-router.post('/avlogout', function (req, res) {
- req.logout();
- res.redirect('/adminview');
-});
-
-
-
-
-
-// Je pense qu'on ferait mieux d'utiliser ca
-// https://expressjs.com/en/4x/api.html#router.route
-router.get('/db?', function (req, res) {
- let table_name = req.query.table;
- let columns = req.query.columns;
-
- res.redirect(`/adminview/db/${table_name}?columns=${columns}`);
-});
-
-/**
- * @function Knex API: Get table
- * @summary Effectue une requête pour une table dans la BDD
- * @argument {string} table_name - La table voulue par l'utilisateur.
- */
-router.get('/db/:table_name?', function (req, res) {
-
- // get columns from query
- let columns;
- if (req.query.columns) {
- columns = req.query.columns.split(',');
- } else {
- columns = null;
- }
- console.log(columns);
-
- knex.select(columns).from(req.params.table_name).then(function (table) {
- res.setHeader("Content-Type", "application/json");
- res.write(JSON.stringify(table, null, 2));
- res.end();
- }, function () {
- res.status(400);
- res.render('error', {
- status: res.statusCode,
- error_message: "Bad request: can't find table " + req.params.table_name
- });
- res.end();
- }
- );
-});
-
-/**
- * @function Error_404_catcher
- * @summary Catche les requêtes en dehors des URL acceptées
- */
-router.use((req, res, next) => {
- let err = new Error('Not found');
- res.status(404);
- next(err);
-});
-
-/**
- * @function Error_404_handler
- * @summary Gère les erreurs 404
- */
-router.use((err, req, res, next) => {
- console.log("adminview: Entering error handler");
- res.locals.message = err.message;
- console.log(err.message);
-
- res.status(err.status || 500);
- let error_message = res.statusCode == 404 ? 'Not found.' : 'Internal server error.';
- res.render('error', {
- status: res.statusCode,
- error_message: error_message
- });
-});
-
-export default router;
diff --git a/src/views/raj.txt b/src/views/raj.txt
deleted file mode 100644
index 7816163af43b17759dfe5220054cb5811aba9d4b..0000000000000000000000000000000000000000
--- a/src/views/raj.txt
+++ /dev/null
@@ -1 +0,0 @@
-Le respo doc déplore l'absence totale de doc concernant les vues
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index e94ef715083728ca003e72ff1a97657e7994cbea..8a2f66171630ea72d1d9c45896d099a242a0cf92 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,5 +1,6 @@
/**
- * @file Fichier servant à la configuration de webpack, qui rassemble tous les fichiers sources, les traduit si nécessaire et les rassemble en un bundle.js exécutable.
+ * @file Configuration de webpack.
+ * Webpack prend tous les fichiers sources, les traduit si nécessaire et les rassemble en un bundle.js exécutable.
* Cela permet de déployer directement le code produit par chaque commit
* @author manifold
*/
@@ -9,13 +10,22 @@ const nodeExternals = require('webpack-node-externals');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const config = {
- entry: './src/index.ts',
+ entry: path.resolve(__dirname, 'src', 'index.ts'),
+ output: {
+ path: path.resolve(__dirname, 'build'),
+ publicPath: '/assets/',
+ filename: 'bundle.js'
+ },
target: 'node',
- node: {
- __dirname: false
- },
- //devtool: 'inline-source-map',
+ // allows using __dirname with the correct semantic (otherwise __dirname will return '/' regardless of file)
+ node: { __dirname: true },
+
+ // Choose a style of source mapping to enhance the debugging process
+ // https://webpack.js.org/configuration/devtool/
+ //devtool: 'inline-source-map', //TODO: in production, or if deemed too slow, remove this
+
+ // do not bundle node_modules, nor secret config files
externals: [
nodeExternals(),
{
@@ -23,7 +33,24 @@ const config = {
credentialsConfig: './ldap_connexion_config.json'
}
],
-
+
+ resolve: {
+ //enables users to leave off the extension when importing
+ //e.g. import File from './path/to/file' vs. './path/to/file.js'
+ extensions: ['.ts', '.js']
+ },
+
+ plugins: [
+ //Copies individual files or entire directories to the build directory
+ new CopyWebpackPlugin([{
+ from: 'src/adminview/css',
+ to: 'css'
+ }, {
+ from: 'src/adminview/views',
+ to: 'views'
+ }])
+ ],
+
module: {
rules: [{
test: /\.js$/,
@@ -40,44 +67,26 @@ const config = {
use: ['file-loader']
}, {
test: /\.graphql?$/,
- use: [
- {
- loader: 'webpack-graphql-loader',
- options: {
- // validate: true,
- // schema: "./path/to/schema.json",
- // removeUnusedFragments: true
- // etc. See "Loader Options" below
- }
+ use: [{
+ loader: 'webpack-graphql-loader',
+ options: {
+ // validate: true,
+ // schema: "./path/to/schema.json",
+ // removeUnusedFragments: true
+ // etc. See "Loader Options" below
}
- ]
- },{
+ }]
+ }, {
test: /\.(png|jpg|ico)$/,
- loader: 'file-loader',
- options: {
- limit: 10000
+ use: {
+ loader: 'url-loader?limit=8192'
+ // loads files as base64 encoded URL if filesize is < limit
+ // default fallback: file-loader
}
+ //use: ['file-loader']
}]
},
- resolve: {
- extensions: ['.ts', '.js']
- },
- plugins: [
- new CopyWebpackPlugin([{
- from: 'src/css',
- to: 'css'
- },{
- from: 'src/views',
- to: 'views'
- }]
- )
- ],
- output: {
- path: path.resolve(__dirname, 'build'),
- publicPath: '/assets/',
- filename: 'bundle.js'
- },
};
-module.exports = config;
\ No newline at end of file
+module.exports = config;