From 1062a0d66a7645d6550d492d847aba49bc93c850 Mon Sep 17 00:00:00 2001 From: Ben West Date: Sun, 28 Jun 2020 11:38:09 -0700 Subject: [PATCH 1/7] prepare hotfix for MMConnect/EU - 2020-06-28 Prepare to handle issue #5719. This patch adjusts dependencies to target a community edition fork of minimed-connect-to-nightscout. The new dependency targets information provided to begin addressing changes to Medtronic Carelink services starting late June 2020. --- npm-shrinkwrap.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 7d3a1730a7d..e5adf1c91b2 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -6858,9 +6858,8 @@ } }, "minimed-connect-to-nightscout": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/minimed-connect-to-nightscout/-/minimed-connect-to-nightscout-1.3.2.tgz", - "integrity": "sha512-1fF1ekFafvzNB9VzoP5T74KVJ32UDi9s4IE8ezNGOJ1XUAAq3qgWYGC4tZgug51sbMvr7c77XQw0bIPl2RpU9Q==", + "version": "github:nightscout/minimed-connect-to-nightscout#69837649ba554161f9cb734463bc6600c5ea7ae6", + "from": "github:nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU", "requires": { "common": "^0.2.5", "lodash": "^4.17.15", diff --git a/package.json b/package.json index 32ee90d2a33..4a97423a812 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "^1.3.2", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From bcd6df2e17e38e2b426a3e3c08f25518406dab7d Mon Sep 17 00:00:00 2001 From: Ben West Date: Mon, 29 Jun 2020 13:32:33 -0700 Subject: [PATCH 2/7] bump pointing at right tag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a97423a812..ef4aaab922c 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-01", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From acf0d390528cf87a22db108b2ebab9c3ab5dfbc8 Mon Sep 17 00:00:00 2001 From: Ben West Date: Tue, 30 Jun 2020 16:32:44 -0700 Subject: [PATCH 3/7] hotfix attempt 2 - carelink 2020 sso updates --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef4aaab922c..ddee5e56e6e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-01", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-02", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From 06982d7af21bb7398f34e51f0856159dc5321ffa Mon Sep 17 00:00:00 2001 From: Ben West Date: Tue, 30 Jun 2020 16:33:35 -0700 Subject: [PATCH 4/7] hotfix 3 - attempt 3 at carelink 2020 sso updates --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ddee5e56e6e..fae38de94c3 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-02", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-03", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From 93c84472c586211662426dafa329f564b0d3d55d Mon Sep 17 00:00:00 2001 From: Ben West Date: Wed, 1 Jul 2020 09:42:20 -0700 Subject: [PATCH 5/7] attempt 4 at hotfix for nightscout Based on more reliable version of minimed-connect-to-nightscout.... This is testing the hotfix. When it works, we will bump this one more time with the newly released version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fae38de94c3..ed4ab258406 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-03", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-04", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From 8fba311ddc2c4f219c1e7048a38a14918c0ecaaa Mon Sep 17 00:00:00 2001 From: Ben West Date: Wed, 1 Jul 2020 10:59:17 -0700 Subject: [PATCH 6/7] hotfix 5 - incorporates latest axios changes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed4ab258406..4d48aa28308 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-04", + "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-05", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26", From 9528b79f0eca425b224c8e0db6c2a0ea40fa1604 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 2 Jul 2020 12:08:52 -0700 Subject: [PATCH 7/7] npm install --save minimed-connect-to-nightscout@^1.4.0 --- npm-shrinkwrap.json | 103 ++++++++++++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 86 insertions(+), 19 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e5adf1c91b2..c6e13fff3ab 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -6858,12 +6858,16 @@ } }, "minimed-connect-to-nightscout": { - "version": "github:nightscout/minimed-connect-to-nightscout#69837649ba554161f9cb734463bc6600c5ea7ae6", - "from": "github:nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/minimed-connect-to-nightscout/-/minimed-connect-to-nightscout-1.4.0.tgz", + "integrity": "sha512-hxbcncJPiQOoTtjp1VquoxA4ab/Lbn1LiwAymeaEUfyqUxaj9E7w8CHJ/kGbgEu2oYHsqUMvJ1orOlCuUA/g6g==", "requires": { + "axios": "^0.19.2", + "axios-cookiejar-support": "^1.0.0", "common": "^0.2.5", "lodash": "^4.17.15", - "request": "^2.88.0" + "request": "^2.88.0", + "tough-cookie": "^4.0.0" }, "dependencies": { "ajv": { @@ -6931,6 +6935,23 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "axios-cookiejar-support": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-1.0.0.tgz", + "integrity": "sha512-9pBlIU5jfrGZTnUQlt8symShviSTOSlOKGtryHx76lJPnKIXDqUT3JDAjJ1ywOQLyfiWrthIt4iJiVP2L2S4jA==", + "requires": { + "is-redirect": "^1.0.0", + "pify": "^5.0.0" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -7200,6 +7221,29 @@ "is-buffer": "~2.0.3" } }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -7350,6 +7394,11 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" + }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -7679,10 +7728,15 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "pify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", + "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==" + }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "pump": { "version": "3.0.0", @@ -7733,6 +7787,20 @@ "node-uuid": { "version": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "requires": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + } } } }, @@ -7841,19 +7909,13 @@ } }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" } }, "tunnel-agent": { @@ -7869,6 +7931,11 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", diff --git a/package.json b/package.json index 4d48aa28308..c2e25697d39 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lodash": "^4.17.15", "memory-cache": "^0.2.0", "mime": "^2.4.4", - "minimed-connect-to-nightscout": "nightscout/minimed-connect-to-nightscout#hotfix-2020-06-28-EU-05", + "minimed-connect-to-nightscout": "^1.4.0", "moment": "^2.24.0", "moment-locales-webpack-plugin": "^1.1.0", "moment-timezone": "^0.5.26",