fix: Respect using environment defaultAsUserId for CCG Auth and OAu…

…th (#554)

src/box-command.js

@@ -799,13 +799,6 @@ class BoxCommand extends Command {
 			);
 			DEBUG.init('Initialized client from environment config');
 
-			if (environment.useDefaultAsUser) {
-				client.asUser(environment.defaultAsUserId);
-				DEBUG.init(
-					'Impersonating default user ID %s',
-					environment.defaultAsUserId
-				);
-			}
 		} else {
 			// No environments set up yet!
 			throw new BoxCLIError(
@@ -815,11 +808,18 @@ class BoxCommand extends Command {
 				Or, supply a token with your command with --token.`.replace(/^\s+/gmu, '')
 			);
 		}
+
+		// Using the as-user flag should have precedence over the environment setting
 		if (this.flags['as-user']) {
 			client.asUser(this.flags['as-user']);
-			DEBUG.init('Impersonating user ID %s', this.flags['as-user']);
+			DEBUG.init('Impersonating user ID %s using the ID provided via the --as-user flag', this.flags['as-user']);
+		} else if (!this.flags.token && environment.useDefaultAsUser) { // We don't want to use any environment settings if a token is passed in the command
+			client.asUser(environment.defaultAsUserId);
+			DEBUG.init(
+				'Impersonating default user ID %s using environment configuration',
+				environment.defaultAsUserId
+			);
 		}
-
 		return client;
 	}
 

test/box-command.test.js

@@ -68,6 +68,24 @@ describe('BoxCommand', () => {
 				const stderr = isWin() ? ctx.stderr.replace(':', '') : ctx.stderr;
 				assert.notInclude(stderr, ':');
 			});
+
+		describe('As-User', () => {
+			test
+				.nock(TEST_API_ROOT, api => api
+					.get('/2.0/users/me')
+					.matchHeader('As-user', '12345')
+					.reply(200, {})
+				)
+				.stdout()
+				.stderr()
+				.command([
+					'users:get',
+					'me',
+					'--token=test',
+					'--as-user=12345'
+				])
+				.it('should send as-user header when --as-user flag is passed');
+		});
 	});
 
 	describe('normalizeDateString()', () => {