Merge pull request #580 from particle-iot/bugfix/ch53821/usb-list-dif…

…f-acct bugfix/ch53821/usb-list-diff-acct
particle-iot · May 5, 2020 · e17405c · e17405c
2 parents c8c93da + 87a8327
commit e17405c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/src/cmd/usb.js b/src/cmd/usb.js
@@ -49,6 +49,7 @@ module.exports = class UsbCommand {
 							return Promise.all(info);
 						})
 						.then(([device, isInDfuMode, mode]) => {
+							const { name, platform_id: platformID, connected } = device || {};
 							const platform = platformsById[usbDevice.platformId];
 							const type = [platform];
 
@@ -62,10 +63,10 @@ module.exports = class UsbCommand {
 
 							return {
 								id: usbDevice.id,
-								name: (device && device.name) ? device.name : '',
+								name: name || '',
 								type: `${type.join(', ')}`,
-								platform_id: device.platform_id,
-								connected: device.connected
+								platform_id: platformID || '',
+								connected: !!connected
 							};
 						})
 						.finally(() => usbDevice.close());

diff --git a/test/README.md b/test/README.md
@@ -16,6 +16,8 @@ E2E_DEVICE_ID=<your test device's id>
 E2E_DEVICE_NAME=<your test device's name>
 E2E_DEVICE_PLATFORM_ID=<the platform id of your test device>
 E2E_DEVICE_PLATFORM_NAME=<the platform name of your test device>
+E2E_FOREIGN_USERNAME=<username for 3rd-party account>
+E2E_FOREIGN_PASSWORD=<password for 3rd-party account>
 E2E_FOREIGN_DEVICE_ID=<id for 3rd-party device the test user DOES NOT own>
 E2E_FOREIGN_DEVICE_NAME=<name for 3rd-party device>
 E2E_FOREIGN_DEVICE_PLATFORM_ID=<platform id for 3rd-party device>

diff --git a/test/e2e/usb.e2e.js b/test/e2e/usb.e2e.js
@@ -77,6 +77,10 @@ describe('USB Commands [@device]', function cliUSBCommands(){
 			args = ['usb', 'list'];
 		});
 
+		after(async () => {
+			await cli.setTestProfileAndLogin();
+		});
+
 		it('Lists connected devices', async () => {
 			const { stdout, stderr, exitCode } = await cli.run(args);
 
@@ -165,6 +169,24 @@ describe('USB Commands [@device]', function cliUSBCommands(){
 			expect(stderr).to.equal('');
 			expect(exitCode).to.equal(0);
 		});
+
+		it('Lists connected devices when signed-in to a foreign account', async () => {
+			await cli.loginToForeignAcct();
+			const { stdout, stderr, exitCode } = await cli.run(args);
+
+			expect(stdout).to.include(`<no name> [${DEVICE_ID}] (${platform})`);
+			expect(stderr).to.equal('');
+			expect(exitCode).to.equal(0);
+		});
+
+		it('Fails to list devices when signed-out', async () => {
+			await cli.logout();
+			const { stdout, stderr, exitCode } = await cli.run(args);
+
+			expect(stdout).to.include('The access token was not found');
+			expect(stderr).to.equal('');
+			expect(exitCode).to.equal(1);
+		});
 	});
 
 	describe('USB Start-Listening Subcommand', () => {

diff --git a/test/lib/cli.js b/test/lib/cli.js
@@ -6,6 +6,8 @@ const {
 	PASSWORD,
 	DEVICE_ID,
 	DEVICE_NAME,
+	FOREIGN_USERNAME,
+	FOREIGN_PASSWORD,
 	PATH_TMP_DIR,
 	PATH_REPO_DIR,
 	PATH_PROJ_BLANK_INO,
@@ -36,6 +38,11 @@ module.exports.login = () => {
 	return run(['login', '-u', USERNAME, '-p', PASSWORD], { reject: true });
 };
 
+module.exports.loginToForeignAcct = () => {
+	const { run } = module.exports;
+	return run(['login', '-u', FOREIGN_USERNAME, '-p', FOREIGN_PASSWORD], { reject: true });
+};
+
 module.exports.logout = () => {
 	const { run } = module.exports;
 	return run(['logout'], { input: 'y\n', reject: true });

diff --git a/test/lib/env.js b/test/lib/env.js
@@ -27,6 +27,8 @@ const {
 	E2E_DEVICE_NAME: DEVICE_NAME,
 	E2E_DEVICE_PLATFORM_ID: DEVICE_PLATFORM_ID,
 	E2E_DEVICE_PLATFORM_NAME: DEVICE_PLATFORM_NAME,
+	E2E_FOREIGN_USERNAME: FOREIGN_USERNAME,
+	E2E_FOREIGN_PASSWORD: FOREIGN_PASSWORD,
 	E2E_FOREIGN_DEVICE_ID: FOREIGN_DEVICE_ID,
 	E2E_FOREIGN_DEVICE_NAME: FOREIGN_DEVICE_NAME,
 	E2E_FOREIGN_DEVICE_PLATFORM_ID: FOREIGN_DEVICE_PLATFORM_ID,
@@ -41,6 +43,8 @@ module.exports = {
 	DEVICE_NAME,
 	DEVICE_PLATFORM_ID,
 	DEVICE_PLATFORM_NAME,
+	FOREIGN_USERNAME,
+	FOREIGN_PASSWORD,
 	FOREIGN_DEVICE_ID,
 	FOREIGN_DEVICE_NAME,
 	FOREIGN_DEVICE_PLATFORM_ID,