Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev (d3c0d213) · Commits · REDMIC Project / Client / Web

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ prepare-for-unbuilt:
		name: '${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}'
		expire_in: '1 day'
		paths:
		- node_modules/
		- public/javascript/proj4js/dist/proj4.js
		- public/javascript/redmic-widgets/src/app/
		- public/javascript/templates/dist/

app/exposure.js

+20 −8

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ var express = require('express'),
		request = require('request');

		var params, app, version,
		oauthClientCredentials = process.env.OAUTH_CLIENT_CREDENTIALS \|\| '';
		oauthClientSecret = process.env.OAUTH_CLIENT_SECRET \|\| 'secret';

		function getLang(req) {

		@@ -89,23 +89,35 @@ function onUnknownRequest(req, res, next) {

		function onOauthTokenRequest(req, res) {

		var password = req.params.password,
		username = req.params.username,
		var query = req.query,
		headers = req.headers,

		clientId = query.clientid,
		password = query.password,
		username = query.username,

		clientCredentials = clientId + ':' + oauthClientSecret,
		base64ClientCredentials = Buffer.from(clientCredentials).toString('base64'),

		url = headers.origin + '/api/oauth/token',
		authorization = 'Basic ' + base64ClientCredentials,
		body = "grant_type=password&username=" + username + "&password=" + password + "&scope=write",

		options = {
		url: req.headers.origin + '/api' + req.url,
		url: url,
		method: 'POST',
		body: "grant_type=password&username=" + username + "&password=" + password + "&scope=write",
		body: body,
		headers: {
		'Content-Type': 'application/x-www-form-urlencoded',
		'Authorization': 'Basic ' + oauthClientCredentials
		'Authorization': authorization
		}
		};

		request(options, function(res, error, response, body) {
		request(options, (function(res, error, response, body) {

		res.statusCode = response.statusCode;
		res.send(body);
		}.bind(this, res));
		}).bind(this, res));
		}

		function exposeRoutes() {

public/javascript/app/redmicConfig.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ define([], function() {
		"numMaxView": 10,
		"apiVersion": 1,
		"pathSeparator": "/",
		"oauthClientId": "app",
		"siteKeyReCaptcha": "6LfA6_0SAAAAACT3i8poH1NqztZCtIW1OahT0cXs",
		"siteKeyForDebugReCaptcha": "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI",
		"googleAnalyticsId": "UA-58848624-1"
		@@ -255,7 +256,7 @@ define([], function() {
		"speciesValidity": baseUri + "speciesvalidities",
		"themes": baseUri + "themes",
		"thematicType": baseUri + "thematictypes",
		"token": "/oauth/token",
		"getToken": "/oauth/token",
		"logout": baseUri + "oauth/token/revoke",
		"unit": baseUri + "units",
		"unitType": baseUri + "unittypes",

public/javascript/app/user/views/LoginView.js

+9 −5

Original line number	Diff line number	Diff line
		@@ -146,10 +146,14 @@ define([
		// values private: credenciales para obtener el token
		//

		return request(redmicConfig.services.token, {
		method: "POST",
		handleAs: "json",
		query: "username=" + values.email + "&password=" + values.password
		var url = redmicConfig.services.getToken,
		clientId = redmicConfig.oauthClientId,
		query = 'clientid=' + clientId + '&username=' + values.email + '&password=' + values.password;

		return request(url, {
		method: 'POST',
		handleAs: 'json',
		query: query
		});
		}
		});

yarn.lock

+252 −9

Original line number	Diff line number	Diff line
		@@ -235,6 +235,15 @@ acorn@^5.0.0:
		version "5.5.3"
		resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"

		ajv@^5.1.0:
		version "5.5.2"
		resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
		dependencies:
		co "^4.6.0"
		fast-deep-equal "^1.0.0"
		fast-json-stable-stringify "^2.0.0"
		json-schema-traverse "^0.3.0"

		alertifyjs@^1.11.1:
		version "1.11.1"
		resolved "https://registry.yarnpkg.com/alertifyjs/-/alertifyjs-1.11.1.tgz#e40e45c4fde4234467cc481b936fe6337e6a4828"
		@@ -313,6 +322,14 @@ asap@~2.0.3:
		version "2.0.6"
		resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"

		asn1@~0.2.3:
		version "0.2.3"
		resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"

		assert-plus@1.0.0, assert-plus@^1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"

		assertion-error@^1.0.1:
		version "1.1.0"
		resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
		@@ -329,6 +346,18 @@ async@~1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"

		asynckit@^0.4.0:
		version "0.4.0"
		resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"

		aws-sign2@~0.7.0:
		version "0.7.0"
		resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"

		aws4@^1.6.0:
		version "1.7.0"
		resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"

		babel-code-frame@^6.26.0:
		version "6.26.0"
		resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
		@@ -414,6 +443,12 @@ basic-auth@~2.0.0:
		dependencies:
		safe-buffer "5.1.1"

		bcrypt-pbkdf@^1.0.0:
		version "1.0.2"
		resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
		dependencies:
		tweetnacl "^0.14.3"

		benchmark@~2.1.4:
		version "2.1.4"
		resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
		@@ -515,6 +550,10 @@ camelcase@^2.0.0:
		version "2.1.1"
		resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"

		caseless@~0.12.0:
		version "0.12.0"
		resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"

		"cbtree@https://github.com/pjekel/cbtree.git#master":
		version "0.9.4"
		resolved "https://github.com/pjekel/cbtree.git#cc60155a14dd8ecad95a4e8e2b0ce6358cc22066"
		@@ -587,6 +626,10 @@ cliui@^2.1.0:
		right-align "^0.1.1"
		wordwrap "0.0.2"

		co@^4.6.0:
		version "4.6.0"
		resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"

		coffeescript@~1.10.0:
		version "1.10.0"
		resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e"
		@@ -624,6 +667,12 @@ colors@~1.1.2:
		version "1.1.2"
		resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"

		combined-stream@1.0.6, combined-stream@~1.0.5:
		version "1.0.6"
		resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
		dependencies:
		delayed-stream "~1.0.0"

		commander@2, commander@~2.13.0:
		version "2.13.0"
		resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
		@@ -700,7 +749,7 @@ core-js@~2.3.0:
		version "2.3.0"
		resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"

		core-util-is@~1.0.0:
		core-util-is@1.0.2, core-util-is@~1.0.0:
		version "1.0.2"
		resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"

		@@ -1014,6 +1063,12 @@ d3@^5.3.0:
		d3-voronoi "1"
		d3-zoom "1"

		dashdash@^1.12.0:
		version "1.14.1"
		resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
		dependencies:
		assert-plus "^1.0.0"

		date-now@^0.1.4:
		version "0.1.4"
		resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
		@@ -1109,6 +1164,10 @@ default-require-extensions@^1.0.0:
		dependencies:
		strip-bom "^2.0.0"

		delayed-stream@~1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"

		depd@1.1.1:
		version "1.1.1"
		resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
		@@ -1221,6 +1280,12 @@ duplexer2@~0.1.4:
		dependencies:
		readable-stream "^2.0.2"

		ecc-jsbn@~0.1.1:
		version "0.1.1"
		resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
		dependencies:
		jsbn "~0.1.0"

		ee-first@1.1.1:
		version "1.1.1"
		resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
		@@ -1349,6 +1414,18 @@ express@^4.16.3, express@~4.16.3:
		utils-merge "1.0.1"
		vary "~1.1.2"

		extend@~3.0.1:
		version "3.0.1"
		resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"

		extsprintf@1.3.0:
		version "1.3.0"
		resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"

		extsprintf@^1.2.0:
		version "1.4.0"
		resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"

		eyes@0.1.x:
		version "0.1.8"
		resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
		@@ -1362,6 +1439,14 @@ falafel@^2.1.0:
		isarray "0.0.1"
		object-keys "^1.0.6"

		fast-deep-equal@^1.0.0:
		version "1.1.0"
		resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"

		fast-json-stable-stringify@^2.0.0:
		version "2.0.0"
		resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"

		fast-levenshtein@~2.0.4:
		version "2.0.6"
		resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
		@@ -1449,6 +1534,18 @@ foreach@^2.0.5:
		version "2.0.5"
		resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"

		forever-agent@~0.6.1:
		version "0.6.1"
		resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"

		form-data@~2.3.1:
		version "2.3.2"
		resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
		dependencies:
		asynckit "^0.4.0"
		combined-stream "1.0.6"
		mime-types "^2.1.12"

		format-util@^1.0.3:
		version "1.0.3"
		resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.3.tgz#032dca4a116262a12c43f4c3ec8566416c5b2d95"
		@@ -1498,6 +1595,12 @@ getobject@~0.1.0:
		version "0.1.0"
		resolved "https://registry.yarnpkg.com/getobject/-/getobject-0.1.0.tgz#047a449789fa160d018f5486ed91320b6ec7885c"

		getpass@^0.1.1:
		version "0.1.7"
		resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
		dependencies:
		assert-plus "^1.0.0"

		glob@7.0.x, glob@~7.0.0:
		version "7.0.6"
		resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
		@@ -1670,6 +1773,17 @@ handlebars@^4.0.11, handlebars@^4.0.3:
		optionalDependencies:
		uglify-js "^2.6"

		har-schema@^2.0.0:
		version "2.0.0"
		resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"

		har-validator@~5.0.3:
		version "5.0.3"
		resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
		dependencies:
		ajv "^5.1.0"
		har-schema "^2.0.0"

		has-ansi@^2.0.0:
		version "2.0.0"
		resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
		@@ -1726,6 +1840,14 @@ http-parser-js@>=0.4.0:
		version "0.4.9"
		resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"

		http-signature@~1.2.0:
		version "1.2.0"
		resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
		dependencies:
		assert-plus "^1.0.0"
		jsprim "^1.2.2"
		sshpk "^1.7.0"

		humanize@0.0.9:
		version "0.0.9"
		resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
		@@ -1885,7 +2007,7 @@ is-stream@^1.1.0:
		version "1.1.0"
		resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"

		is-typedarray@^1.0.0:
		is-typedarray@^1.0.0, is-typedarray@~1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"

		@@ -1905,7 +2027,7 @@ isexe@^2.0.0:
		version "2.0.0"
		resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"

		isstream@0.1.x:
		isstream@0.1.x, isstream@~0.1.2:
		version "0.1.2"
		resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"

		@@ -1978,6 +2100,10 @@ js-yaml@~3.5.2:
		argparse "^1.0.2"
		esprima "^2.6.0"

		jsbn@~0.1.0:
		version "0.1.1"
		resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"

		jsesc@^1.3.0:
		version "1.3.0"
		resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
		@@ -2004,6 +2130,18 @@ json-schema-ref-parser@^5.0.3:
		js-yaml "^3.11.0"
		ono "^4.0.3"

		json-schema-traverse@^0.3.0:
		version "0.3.1"
		resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"

		json-schema@0.2.3:
		version "0.2.3"
		resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"

		json-stringify-safe@~5.0.1:
		version "5.0.1"
		resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"

		json3@^3.3.2:
		version "3.3.2"
		resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
		@@ -2012,6 +2150,15 @@ jsonify@~0.0.0:
		version "0.0.0"
		resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"

		jsprim@^1.2.2:
		version "1.4.1"
		resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
		dependencies:
		assert-plus "1.0.0"
		extsprintf "1.3.0"
		json-schema "0.2.3"
		verror "1.10.0"

		jstransformer@1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
		@@ -2230,18 +2377,18 @@ mime-db@~1.33.0:
		version "1.33.0"
		resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"

		mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18:
		version "2.1.18"
		resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
		dependencies:
		mime-db "~1.33.0"

		mime-types@~2.1.15:
		version "2.1.17"
		resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
		dependencies:
		mime-db "~1.30.0"

		mime-types@~2.1.18:
		version "2.1.18"
		resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
		dependencies:
		mime-db "~1.33.0"

		mime@1.4.1:
		version "1.4.1"
		resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
		@@ -2340,6 +2487,10 @@ number-is-nan@^1.0.0:
		version "1.0.1"
		resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"

		oauth-sign@~0.8.2:
		version "0.8.2"
		resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

		object-assign@^4.0.1, object-assign@^4.1.0:
		version "4.1.1"
		resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
		@@ -2485,6 +2636,10 @@ pathval@^1.0.0:
		version "1.1.0"
		resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"

		"pdfjs@https://github.com/mozilla/pdf.js.git#gh-pages":
		version "0.0.0"
		resolved "https://github.com/mozilla/pdf.js.git#2a05f4e38de06521de2e34438ebaf3e3ce79c036"

		pend@~1.2.0:
		version "1.2.0"
		resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
		@@ -2493,6 +2648,10 @@ pepjs@0.4.2:
		version "0.4.2"
		resolved "https://registry.yarnpkg.com/pepjs/-/pepjs-0.4.2.tgz#13264eea894984ff423c83e40d2fa4e1dec1c9fa"

		performance-now@^2.1.0:
		version "2.1.0"
		resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

		pify@^2.0.0, pify@^2.3.0:
		version "2.3.0"
		resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
		@@ -2656,6 +2815,10 @@ pug@^2.0.3:
		pug-runtime "^2.0.4"
		pug-strip-comments "^1.0.3"

		punycode@^1.4.1:
		version "1.4.1"
		resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"

		put-selector@^0.3.6:
		version "0.3.6"
		resolved "https://registry.yarnpkg.com/put-selector/-/put-selector-0.3.6.tgz#172e8f8d978d55072b2757a1645776d685c80fa2"
		@@ -2664,6 +2827,10 @@ qs@6.5.1:
		version "6.5.1"
		resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"

		qs@~6.5.1:
		version "6.5.2"
		resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

		querystringify@0.0.x:
		version "0.0.4"
		resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
		@@ -2773,6 +2940,31 @@ repeating@^2.0.0:
		dependencies:
		is-finite "^1.0.0"

		request@^2.71.0:
		version "2.87.0"
		resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
		dependencies:
		aws-sign2 "~0.7.0"
		aws4 "^1.6.0"
		caseless "~0.12.0"
		combined-stream "~1.0.5"
		extend "~3.0.1"
		forever-agent "~0.6.1"
		form-data "~2.3.1"
		har-validator "~5.0.3"
		http-signature "~1.2.0"
		is-typedarray "~1.0.0"
		isstream "~0.1.2"
		json-stringify-safe "~5.0.1"
		mime-types "~2.1.17"
		oauth-sign "~0.8.2"
		performance-now "^2.1.0"
		qs "~6.5.1"
		safe-buffer "^5.1.1"
		tough-cookie "~2.3.3"
		tunnel-agent "^0.6.0"
		uuid "^3.1.0"

		requires-port@1.0.x, requires-port@~1.0.0:
		version "1.0.0"
		resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
		@@ -2834,6 +3026,14 @@ safe-buffer@5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
		version "5.1.1"
		resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"

		safe-buffer@^5.0.1, safe-buffer@^5.1.1:
		version "5.1.2"
		resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

		safer-buffer@^2.0.2:
		version "2.1.2"
		resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"

		sax@0.5.x:
		version "0.5.8"
		resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
		@@ -2957,6 +3157,21 @@ sprintf@^0.1.5:
		version "0.1.5"
		resolved "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf"

		sshpk@^1.7.0:
		version "1.14.2"
		resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
		dependencies:
		asn1 "~0.2.3"
		assert-plus "^1.0.0"
		dashdash "^1.12.0"
		getpass "^0.1.1"
		safer-buffer "^2.0.2"
		optionalDependencies:
		bcrypt-pbkdf "^1.0.0"
		ecc-jsbn "~0.1.1"
		jsbn "~0.1.0"
		tweetnacl "~0.14.0"

		stack-trace@0.0.x:
		version "0.0.10"
		resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
		@@ -3099,6 +3314,12 @@ token-stream@0.0.1:
		version "0.0.1"
		resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"

		tough-cookie@~2.3.3:
		version "2.3.4"
		resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
		dependencies:
		punycode "^1.4.1"

		tree-kill@~1.2.0:
		version "1.2.0"
		resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
		@@ -3119,10 +3340,20 @@ tslib@~1.9.0:
		version "1.9.0"
		resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"

		tunnel-agent@^0.6.0:
		version "0.6.0"
		resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
		dependencies:
		safe-buffer "^5.0.1"

		"tv4@https://github.com/geraintluff/tv4.git#master":
		version "1.2.7"
		resolved "https://github.com/geraintluff/tv4.git#a00bee535ae7498becd53f9a8071c1cc0bdc4359"

		tweetnacl@^0.14.3, tweetnacl@~0.14.0:
		version "0.14.5"
		resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"

		type-check@~0.3.2:
		version "0.3.2"
		resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
		@@ -3253,6 +3484,10 @@ utils-merge@1.0.1:
		version "1.0.1"
		resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"

		uuid@^3.1.0:
		version "3.3.2"
		resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"

		validate-npm-package-license@^3.0.1:
		version "3.0.1"
		resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
		@@ -3264,6 +3499,14 @@ vary@~1.1.2:
		version "1.1.2"
		resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

		verror@1.10.0:
		version "1.10.0"
		resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
		dependencies:
		assert-plus "^1.0.0"
		core-util-is "1.0.2"
		extsprintf "^1.2.0"

		vlq@^0.2.2:
		version "0.2.3"
		resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"