From 3e41ee46572e21d1bd190bbf7145a7f6b1b93cb6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 25 Jul 2017 15:01:11 +0000 Subject: [PATCH] Match production URL properly when trying to warn about bad uploads --- bin/medic-conf.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/medic-conf.js b/bin/medic-conf.js index 9be8dd859..9246b0f7a 100755 --- a/bin/medic-conf.js +++ b/bin/medic-conf.js @@ -28,7 +28,7 @@ const projectName = fs.path.basename(fs.path.resolve('.')); const instanceUrl = args[0]; const couchUrl = `${instanceUrl}/medic`; -const productionUrlMatch = /^http(?:s)?:\/\/(.*)\.app\.medicmobile\.org(?:$|\/)/.exec(instanceUrl); +const productionUrlMatch = /^http(?:s)?:\/\/(?:[^@]*@)?(.*)\.app\.medicmobile\.org(?:$|\/)/.exec(instanceUrl); if(productionUrlMatch && productionUrlMatch[1] !== projectName) { if(!readline.keyInYN('\x1b[33mWARN ' + `Attempting to upload configuration for \x1b[31m${projectName}\x1b[33m ` + diff --git a/package.json b/package.json index 34cc6e7dd..baa9795ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "medic-configurer-beta", - "version": "1.1.4", + "version": "1.1.5", "description": "Configure Medic Mobile deployments", "main": "index.js", "scripts": {