feat: raise ls protocol version to support oauth2 [HEAD-117] (#136)

* feat: WIP initial refresh token impl

* task: WIP implementing oauth

* feat: handle token message [HEAD-117]

* feat: add token refresh

* chore: remove redundant preference

* chore: remove redundant expiry pref

* chore: cleanup redundant code

* feat: testing oauth implementation

* feat: testing

* feat: adds more tests

* fix: borked tests

* fix: borking tests

* chore: pr feedback

* chore: increase LS protocol version to 8

* chore: update required protocol version

* chore: remove logging

* chore: use SNYK_OAUTH_TOKEN for CLI

* chore: refresh token before calling CLI

and replace oauth refresh ls command by get active user

---------

Co-authored-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com>

Author: bastiandoetsch

plugin/src/main/java/io/snyk/eclipse/plugin/EnvironmentConstants.java

@@ -7,4 +7,5 @@ public interface EnvironmentConstants {
   String ENV_DISABLE_ANALYTICS = "SNYK_CFG_DISABLE_ANALYTICS";
   String ENV_INTERNAL_SNYK_OAUTH_ENABLED = "INTERNAL_SNYK_OAUTH_ENABLED";
   String ENV_INTERNAL_OAUTH_TOKEN_STORAGE = "INTERNAL_OAUTH_TOKEN_STORAGE";
+  String ENV_OAUTH_ACCESS_TOKEN = "SNYK_OAUTH_TOKEN";
 }

plugin/src/main/java/io/snyk/eclipse/plugin/runner/ProcessRunner.java

@@ -11,6 +11,8 @@
 import java.util.Optional;
 
 import io.snyk.languageserver.LsRuntimeEnvironment;
+import io.snyk.languageserver.protocolextension.messageObjects.OAuthToken;
+
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
@@ -19,6 +21,9 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.snyk.eclipse.plugin.EnvironmentConstants;
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
@@ -122,14 +127,18 @@ private void setupProcessBuilderBase(ProcessBuilder pb) {
 
     String authMethod = Preferences.getInstance().getPref(Preferences.AUTHENTICATION_METHOD);
     String token = Preferences.getInstance().getAuthToken();
-    if (token != null && authMethod.equals(Preferences.AUTH_METHOD_OAUTH)) {      
-      pb.environment().put(EnvironmentConstants.ENV_INTERNAL_SNYK_OAUTH_ENABLED, "1");
-      pb.environment().put(EnvironmentConstants.ENV_INTERNAL_OAUTH_TOKEN_STORAGE, token);
-      pb.environment().remove(EnvironmentConstants.ENV_SNYK_TOKEN);
-    } else {      
+    if (token != null && authMethod.equals(Preferences.AUTH_METHOD_OAUTH)) {
+      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);
+      }
+    } else {
       pb.environment().put(EnvironmentConstants.ENV_SNYK_TOKEN, token);
-      pb.environment().remove(EnvironmentConstants.ENV_INTERNAL_OAUTH_TOKEN_STORAGE);
-
+      pb.environment().remove(EnvironmentConstants.ENV_OAUTH_ACCESS_TOKEN);
     }
 
     String insecure = Preferences.getInstance().getPref(Preferences.INSECURE_KEY);

plugin/src/main/java/io/snyk/eclipse/plugin/runner/SnykCliRunner.java

@@ -3,6 +3,8 @@
 import io.snyk.eclipse.plugin.exception.NotSupportedException;
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
 import io.snyk.eclipse.plugin.utils.Lists;
+import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
+
 import org.apache.commons.lang3.SystemUtils;
 
 import java.io.File;
@@ -58,6 +60,7 @@ private ProcessResult snykRun(List<String> arguments) {
   private ProcessResult snykRun(List<String> arguments, Optional<File> navigatePath) {
     try {
       checkIfTrusted(navigatePath.get());
+      SnykExtendedLanguageClient.getInstance().refreshOAuthToken();
       ProcessBuilder processBuilder = createProcessBuilderByOS(arguments, Preferences.getInstance().getPath());
       return processRunner.run(processBuilder, navigatePath);
     } catch (Exception e) {

plugin/src/main/java/io/snyk/languageserver/download/LsBinaries.java

@@ -4,7 +4,7 @@
 
 public class LsBinaries {
   private static final String LS_DOWNLOAD_BASE_URL = "https://static.snyk.io/snyk-ls";
-  public static final String REQUIRED_LS_PROTOCOL_VERSION = "9";
+  public static final String REQUIRED_LS_PROTOCOL_VERSION = "10";
 
   public static URI getBaseUri() {
     return URI.create(String.format("%s/%s", LS_DOWNLOAD_BASE_URL, REQUIRED_LS_PROTOCOL_VERSION));

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

@@ -218,7 +218,7 @@ public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams par
   public boolean refreshOAuthToken() {
     var p = Preferences.getInstance();
     var token = p.getAuthToken();
-    executeCommand("snyk.oauthRefreshCommand", new ArrayList<>());
+    executeCommand("snyk.getActiveUser", new ArrayList<>());
     // wait until token has changed or 2s have passed
     CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {
       while (token.equals(p.getAuthToken())) {

tests/src/test/java/io/snyk/eclipse/plugin/runner/ProcessRunnerTest.java

@@ -123,7 +123,6 @@ void testOAuthEnabled() {
 
     var env = builder.environment();
 
-    assertEquals("1", env.get(EnvironmentConstants.ENV_INTERNAL_SNYK_OAUTH_ENABLED));
-    assertEquals(expectedToken, env.get(EnvironmentConstants.ENV_INTERNAL_OAUTH_TOKEN_STORAGE));
+    assertEquals("configAccessToken", env.get(EnvironmentConstants.ENV_OAUTH_ACCESS_TOKEN));
   }
 }