From c9fb3aaec3fe7e0c1787e5c95dd0412222dd7bfa Mon Sep 17 00:00:00 2001
From: Saurav Kothari <sauravkothari2@gmail.com>
Date: Mon, 24 Apr 2017 16:07:05 +0530
Subject: [PATCH 1/3] BROWSERSTACK_USER and BROWSERSTACK_ACCESSKEY also valid
 env variables. Add suffix for tracking sessions run via TeamCity

---
 .../automate/ci/teamcity/BrowserStackLocalAgent.java     | 9 ++++++---
 .../automate/ci/teamcity/BrowserStackParameters.java     | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java b/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
index a55b996..2c8be5c 100644
--- a/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
+++ b/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
@@ -144,9 +144,12 @@ private void exportEnvVars(final BuildRunnerContext runner, final Map<String, St
         if (!config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || !config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY)) {
             return;
         }
-
-        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, config.get(EnvVars.BROWSERSTACK_USERNAME));
-        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESS_KEY, config.get(EnvVars.BROWSERSTACK_ACCESS_KEY));
+        String username = config.get(EnvVars.BROWSERSTACK_USERNAME) == null ? config.get(EnvVars.BROWSERSTACK_USER) : config.get(EnvVars.BROWSERSTACK_USERNAME);
+        String accesskey = config.get(EnvVars.BROWSERSTACK_ACCESS_KEY) == null ? config.get(EnvVars.BROWSERSTACK_ACCESSKEY) : config.get(EnvVars.BROWSERSTACK_ACCESS_KEY);
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, username + "-teamcity");
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USER, username + "-teamcity");
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESS_KEY, accesskey);
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESSKEY, accesskey);
         runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_LOCAL, config.get(EnvVars.BROWSERSTACK_LOCAL));
 
         BuildProgressLogger buildLogger = runner.getBuild().getBuildLogger();
diff --git a/browserstack-teamcity-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java b/browserstack-teamcity-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java
index f4cfbec..15c26df 100644
--- a/browserstack-teamcity-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java
+++ b/browserstack-teamcity-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java
@@ -6,7 +6,9 @@ public class BrowserStackParameters {
 
     public interface EnvVars {
         String BROWSERSTACK_USERNAME = "BROWSERSTACK_USERNAME";
+        String BROWSERSTACK_USER = "BROWSERSTACK_USER";
         String BROWSERSTACK_ACCESS_KEY = "BROWSERSTACK_ACCESS_KEY";
+        String BROWSERSTACK_ACCESSKEY = "BROWSERSTACK_ACCESSKEY";
         String BROWSERSTACK_LOCAL = "BROWSERSTACK_LOCAL";
         String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
         String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";

From be029f337974dad5878ebdb77c40c6acc2bc36d9 Mon Sep 17 00:00:00 2001
From: Saurav Kothari <sauravkothari2@gmail.com>
Date: Mon, 24 Apr 2017 16:08:08 +0530
Subject: [PATCH 2/3] Minor version bump

---
 browserstack-teamcity-agent/pom.xml  | 2 +-
 browserstack-teamcity-common/pom.xml | 2 +-
 browserstack-teamcity-server/pom.xml | 2 +-
 build/pom.xml                        | 2 +-
 pom.xml                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browserstack-teamcity-agent/pom.xml b/browserstack-teamcity-agent/pom.xml
index 13a0bd2..5a90b99 100644
--- a/browserstack-teamcity-agent/pom.xml
+++ b/browserstack-teamcity-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>browserstack-teamcity-agent</artifactId>
diff --git a/browserstack-teamcity-common/pom.xml b/browserstack-teamcity-common/pom.xml
index 8461625..35e5e34 100644
--- a/browserstack-teamcity-common/pom.xml
+++ b/browserstack-teamcity-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>browserstack-teamcity-common</artifactId>
     <packaging>jar</packaging>
diff --git a/browserstack-teamcity-server/pom.xml b/browserstack-teamcity-server/pom.xml
index 7c06763..c1ffbda 100644
--- a/browserstack-teamcity-server/pom.xml
+++ b/browserstack-teamcity-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>browserstack-teamcity</artifactId>
     <groupId>com.browserstack</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
   <artifactId>browserstack-teamcity-server</artifactId>
   <packaging>jar</packaging>
diff --git a/build/pom.xml b/build/pom.xml
index 8b3a189..04d396d 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>build</artifactId>
diff --git a/pom.xml b/pom.xml
index 39a5493..5259f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.browserstack</groupId>
     <artifactId>browserstack-teamcity</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <properties>

From aeb92ac0d5e86ab73598e4012d3394b8582ff8cd Mon Sep 17 00:00:00 2001
From: Saurav Kothari <sauravkothari2@gmail.com>
Date: Fri, 28 Apr 2017 18:14:30 +0530
Subject: [PATCH 3/3] Check for both variants of username and access key

---
 .../automate/ci/teamcity/BrowserStackLocalAgent.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java b/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
index 2c8be5c..1fa225e 100644
--- a/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
+++ b/browserstack-teamcity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
@@ -141,9 +141,10 @@ private void loadBuildFeature(final AgentRunningBuild build) {
      * @param config
      */
     private void exportEnvVars(final BuildRunnerContext runner, final Map<String, String> config) {
-        if (!config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || !config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY)) {
-            return;
+        if(!((config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || config.containsKey(EnvVars.BROWSERSTACK_USER)) && (config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY) || config.containsKey(EnvVars.BROWSERSTACK_ACCESSKEY)))) {
+          return;
         }
+
         String username = config.get(EnvVars.BROWSERSTACK_USERNAME) == null ? config.get(EnvVars.BROWSERSTACK_USER) : config.get(EnvVars.BROWSERSTACK_USERNAME);
         String accesskey = config.get(EnvVars.BROWSERSTACK_ACCESS_KEY) == null ? config.get(EnvVars.BROWSERSTACK_ACCESSKEY) : config.get(EnvVars.BROWSERSTACK_ACCESS_KEY);
         runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, username + "-teamcity");