fix: update environment correctly

snyk · Jul 4, 2024 · bed19e3 · bed19e3
1 parent 3ae1d53
commit bed19e3
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/runner/ProcessRunner.java b/plugin/src/main/java/io/snyk/eclipse/plugin/runner/ProcessRunner.java
@@ -127,13 +127,18 @@ private void setupProcessBuilderBase(ProcessBuilder pb) {
 
     String token = Preferences.getInstance().getAuthToken();
     if (token != null && !token.isBlank()) {
-      try {
-	      ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-	      var oauthToken = objectMapper.readValue(token, OAuthToken.class);
-	      pb.environment().put(EnvironmentConstants.ENV_OAUTH_ACCESS_TOKEN, oauthToken.getAccessToken());
-	      pb.environment().remove(EnvironmentConstants.ENV_SNYK_TOKEN);
-      } catch (Exception e) {
-    	  SnykLogger.logError(e);
+      if (Preferences.getInstance().getBooleanPref(Preferences.USE_TOKEN_AUTH, false)) {
+    	  pb.environment().put(EnvironmentConstants.ENV_SNYK_TOKEN, token);
+    	  pb.environment().remove(EnvironmentConstants.ENV_OAUTH_ACCESS_TOKEN);
+      } else {
+	      try {
+		      ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		      var oauthToken = objectMapper.readValue(token, OAuthToken.class);
+		      pb.environment().put(EnvironmentConstants.ENV_OAUTH_ACCESS_TOKEN, oauthToken.getAccessToken());
+		      pb.environment().remove(EnvironmentConstants.ENV_SNYK_TOKEN);
+	      } catch (Exception e) {
+	    	  SnykLogger.logInfo(token);
+	      }
       }
     }