From 38c2c97d6485b966a60fae57eb65c1ca1e314cf4 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 09:08:28 +0200
Subject: [PATCH 1/7] initial logout button setup

---
 .idea/jarRepositories.xml                     |  5 ++++
 .idea/misc.xml                                |  2 +-
 .../extensions/settings/ArtemisSettings.java  | 18 +++++++++++-
 .../sdq/intelligrade/login/CefUtils.java      | 26 +++++++++++++----
 .../sdq/intelligrade/state/PluginState.java   | 29 +++++++++++++++++++
 5 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 3f521fc..7c2c321 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -56,5 +56,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://s01.oss.sonatype.org/content/repositories/snapshots" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba0541a..447794c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
index dea187e..2355fb3 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
@@ -87,7 +87,23 @@ public class ArtemisSettings implements Configurable {
             this.apply();
             PluginState.getInstance().connect();
         });
-        contentPanel.add(loginButton, "span 2, growx");
+        contentPanel.add(loginButton, "span 1, growx");
+
+        // Button to log out of artemis
+        var logoutButton = new JButton("Logout");
+        logoutButton.addActionListener(a -> {
+            //request a logout
+            boolean loggedOut = PluginState.getInstance().logout();
+            //clear data iff logout was actually carried out
+            if (loggedOut) {
+                ArtemisCredentialsProvider.getInstance().setJwt(null);
+                ArtemisCredentialsProvider.getInstance().setArtemisPassword(null);
+                ArtemisSettingsState.getInstance().setJwtExpiry(null);
+                this.apply();
+            }
+
+        });
+        contentPanel.add(logoutButton, "span 1, growx");
 
         // Login options
         contentPanel.add(new TitledSeparator("Login Options"), "span 2, growx");
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
index a720bf0..137c578 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
@@ -29,6 +29,27 @@ private CefUtils() {
         throw new IllegalAccessError("Utility Class");
     }
 
+    /**
+     * Reset the CEF Browsers cookies to remove the artemis login token
+     */
+    public static void resetCookies() {
+        if (browserClient == null) {
+            browserClient = JBCefApp.getInstance().createClient();
+        }
+
+        // offscreen rendering is problematic on Linux
+        JBCefBrowser browser = JBCefBrowser.createBuilder()
+                .setClient(browserClient)
+                .setOffScreenRendering(false)
+                .build();
+
+        //clear cookies
+        CefApp.getInstance().onInitialization(state -> {
+            browser.getJBCefCookieManager().deleteCookies(null, null);
+        });
+        browser.dispose();
+    }
+
     /**
      * Create and display a Window containing a JBCef Window to request login. Call this on the EDT!
      *
@@ -47,11 +68,6 @@ public static CompletableFuture<JBCefCookie> jcefBrowserLogin() {
                 .setUrl(ArtemisSettingsState.getInstance().getArtemisInstanceUrl())
                 .build();
 
-        // TODO the following code deletes the jwt cookie, which is needed for a "fresh" login
-        // TODO add this somewhere where it is useful
-        // CefApp.getInstance().onInitialization(state -> {
-        //     browser.getJBCefCookieManager().deleteCookies(null, null);
-        // });
 
         // set focus handler because it gets invoked sometimes and causes NullPE otherwise
         CefFocusHandler focusHandler = new CefWindowFocusHandler();
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index aad1fac..e55f5e8 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -38,8 +38,11 @@
 import edu.kit.kastel.sdq.intelligrade.utils.ArtemisUtils;
 import edu.kit.kastel.sdq.intelligrade.utils.IntellijUtil;
 import org.apache.commons.io.FileUtils;
+import org.cef.CefApp;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 public class PluginState {
     private static final Logger LOG = Logger.getInstance(PluginState.class);
 
@@ -61,6 +64,32 @@ public static PluginState getInstance() {
         return pluginState;
     }
 
+    /**
+     * Logs out while displaying a warning if an assessment is still running
+     *
+     * @return true iff the logout was completed, false otherwise
+     */
+    public boolean logout() {
+        int answer = JOptionPane.OK_OPTION;
+        //check if confirmation is necessary because assessment is running
+        if (isAssessing()) {
+            answer = JOptionPane.showConfirmDialog(null,
+                    "Logging out while assessing will terminate the current assessment. Continue?",
+                    "Logging out while assessing!", JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+        }
+        //actually reset state
+        if (answer == JOptionPane.OK_OPTION) {
+            this.resetState();
+
+            //reset JBCef cookies iff available
+            if (JBCefApp.isSupported()) {
+                CefUtils.resetCookies();
+            }
+        }
+
+        return answer == JOptionPane.OK_OPTION;
+    }
+
     public void connect() {
         this.resetState();
 

From 84881871d514f22ee8fb36753bd1da507b193dd7 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 09:11:02 +0200
Subject: [PATCH 2/7] spotless

---
 .../extensions/settings/ArtemisSettings.java   |  5 ++---
 .../sdq/intelligrade/login/CefUtils.java       |  3 +--
 .../sdq/intelligrade/state/PluginState.java    | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
index 2355fb3..46ad901 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
@@ -92,16 +92,15 @@ public class ArtemisSettings implements Configurable {
         // Button to log out of artemis
         var logoutButton = new JButton("Logout");
         logoutButton.addActionListener(a -> {
-            //request a logout
+            // request a logout
             boolean loggedOut = PluginState.getInstance().logout();
-            //clear data iff logout was actually carried out
+            // clear data iff logout was actually carried out
             if (loggedOut) {
                 ArtemisCredentialsProvider.getInstance().setJwt(null);
                 ArtemisCredentialsProvider.getInstance().setArtemisPassword(null);
                 ArtemisSettingsState.getInstance().setJwtExpiry(null);
                 this.apply();
             }
-
         });
         contentPanel.add(logoutButton, "span 1, growx");
 
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
index 137c578..0a99ef5 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
@@ -43,7 +43,7 @@ public static void resetCookies() {
                 .setOffScreenRendering(false)
                 .build();
 
-        //clear cookies
+        // clear cookies
         CefApp.getInstance().onInitialization(state -> {
             browser.getJBCefCookieManager().deleteCookies(null, null);
         });
@@ -68,7 +68,6 @@ public static CompletableFuture<JBCefCookie> jcefBrowserLogin() {
                 .setUrl(ArtemisSettingsState.getInstance().getArtemisInstanceUrl())
                 .build();
 
-
         // set focus handler because it gets invoked sometimes and causes NullPE otherwise
         CefFocusHandler focusHandler = new CefWindowFocusHandler();
         browserClient.addFocusHandler(focusHandler, browser.getCefBrowser());
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index e55f5e8..5e0966f 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
+import javax.swing.*;
+
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -38,11 +40,8 @@
 import edu.kit.kastel.sdq.intelligrade.utils.ArtemisUtils;
 import edu.kit.kastel.sdq.intelligrade.utils.IntellijUtil;
 import org.apache.commons.io.FileUtils;
-import org.cef.CefApp;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class PluginState {
     private static final Logger LOG = Logger.getInstance(PluginState.class);
 
@@ -71,17 +70,20 @@ public static PluginState getInstance() {
      */
     public boolean logout() {
         int answer = JOptionPane.OK_OPTION;
-        //check if confirmation is necessary because assessment is running
+        // check if confirmation is necessary because assessment is running
         if (isAssessing()) {
-            answer = JOptionPane.showConfirmDialog(null,
+            answer = JOptionPane.showConfirmDialog(
+                    null,
                     "Logging out while assessing will terminate the current assessment. Continue?",
-                    "Logging out while assessing!", JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+                    "Logging out while assessing!",
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.WARNING_MESSAGE);
         }
-        //actually reset state
+        // actually reset state
         if (answer == JOptionPane.OK_OPTION) {
             this.resetState();
 
-            //reset JBCef cookies iff available
+            // reset JBCef cookies iff available
             if (JBCefApp.isSupported()) {
                 CefUtils.resetCookies();
             }

From f3b50043d25b7df3b9ec75a0dd0fee415033a8fa Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 09:19:30 +0200
Subject: [PATCH 3/7] notify appropriate listeners upon logout

---
 .../java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index 5e0966f..291da84 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -88,7 +88,7 @@ public boolean logout() {
                 CefUtils.resetCookies();
             }
         }
-
+        this.notifyConnectedListeners();
         return answer == JOptionPane.OK_OPTION;
     }
 

From ca6237e30ce3a25637645e511e49d8d0bb8b4e35 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 16:52:54 +0200
Subject: [PATCH 4/7] removed unnecessary code as per review

---
 .../edu/kit/kastel/sdq/intelligrade/login/CefUtils.java     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
index 0a99ef5..6972b3a 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
@@ -33,9 +33,6 @@ private CefUtils() {
      * Reset the CEF Browsers cookies to remove the artemis login token
      */
     public static void resetCookies() {
-        if (browserClient == null) {
-            browserClient = JBCefApp.getInstance().createClient();
-        }
 
         // offscreen rendering is problematic on Linux
         JBCefBrowser browser = JBCefBrowser.createBuilder()
@@ -57,9 +54,6 @@ public static void resetCookies() {
      */
     public static CompletableFuture<JBCefCookie> jcefBrowserLogin() {
 
-        if (browserClient == null) {
-            browserClient = JBCefApp.getInstance().createClient();
-        }
 
         // offscreen rendering is problematic on Linux
         JBCefBrowser browser = JBCefBrowser.createBuilder()

From 2e2371246008e8ad88f57866a311f7f65f51c413 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 16:58:08 +0200
Subject: [PATCH 5/7] moved JOptionPane to IJ dialog thingy

---
 .../sdq/intelligrade/state/PluginState.java      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index 291da84..1cd2a75 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -22,6 +22,7 @@
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.ui.MessageDialogBuilder;
 import com.intellij.ui.jcef.JBCefApp;
 import edu.kit.kastel.sdq.artemis4j.ArtemisClientException;
 import edu.kit.kastel.sdq.artemis4j.ArtemisNetworkException;
@@ -69,18 +70,15 @@ public static PluginState getInstance() {
      * @return true iff the logout was completed, false otherwise
      */
     public boolean logout() {
-        int answer = JOptionPane.OK_OPTION;
+        boolean answer = true;
         // check if confirmation is necessary because assessment is running
         if (isAssessing()) {
-            answer = JOptionPane.showConfirmDialog(
-                    null,
-                    "Logging out while assessing will terminate the current assessment. Continue?",
-                    "Logging out while assessing!",
-                    JOptionPane.OK_CANCEL_OPTION,
-                    JOptionPane.WARNING_MESSAGE);
+            answer = MessageDialogBuilder.okCancel("Logging out while assessing!",
+                            "Logging out while assessing will discard current changes. Continue?")
+                    .guessWindowAndAsk();
         }
         // actually reset state
-        if (answer == JOptionPane.OK_OPTION) {
+        if (answer) {
             this.resetState();
 
             // reset JBCef cookies iff available
@@ -89,7 +87,7 @@ public boolean logout() {
             }
         }
         this.notifyConnectedListeners();
-        return answer == JOptionPane.OK_OPTION;
+        return answer;
     }
 
     public void connect() {

From 3b1b08ed0edb241c7946b76fe1322d13cab641e2 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 17:00:37 +0200
Subject: [PATCH 6/7] moved code from settings to PluginState

---
 .../extensions/settings/ArtemisSettings.java           | 10 ++--------
 .../kit/kastel/sdq/intelligrade/state/PluginState.java | 10 ++++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
index 46ad901..23030c7 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/extensions/settings/ArtemisSettings.java
@@ -93,14 +93,8 @@ public class ArtemisSettings implements Configurable {
         var logoutButton = new JButton("Logout");
         logoutButton.addActionListener(a -> {
             // request a logout
-            boolean loggedOut = PluginState.getInstance().logout();
-            // clear data iff logout was actually carried out
-            if (loggedOut) {
-                ArtemisCredentialsProvider.getInstance().setJwt(null);
-                ArtemisCredentialsProvider.getInstance().setArtemisPassword(null);
-                ArtemisSettingsState.getInstance().setJwtExpiry(null);
-                this.apply();
-            }
+            PluginState.getInstance().logout();
+            this.apply();
         });
         contentPanel.add(logoutButton, "span 1, growx");
 
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index 1cd2a75..da37cf6 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -66,10 +66,8 @@ public static PluginState getInstance() {
 
     /**
      * Logs out while displaying a warning if an assessment is still running
-     *
-     * @return true iff the logout was completed, false otherwise
      */
-    public boolean logout() {
+    public void logout() {
         boolean answer = true;
         // check if confirmation is necessary because assessment is running
         if (isAssessing()) {
@@ -81,13 +79,17 @@ public boolean logout() {
         if (answer) {
             this.resetState();
 
+            // reset state in settings
+            ArtemisCredentialsProvider.getInstance().setJwt(null);
+            ArtemisCredentialsProvider.getInstance().setArtemisPassword(null);
+            ArtemisSettingsState.getInstance().setJwtExpiry(null);
+
             // reset JBCef cookies iff available
             if (JBCefApp.isSupported()) {
                 CefUtils.resetCookies();
             }
         }
         this.notifyConnectedListeners();
-        return answer;
     }
 
     public void connect() {

From 92a6aad40a98e7fa8f16d4d4d3690956663f983d Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Fri, 11 Oct 2024 17:01:23 +0200
Subject: [PATCH 7/7] spotless

---
 .../java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java   | 1 -
 .../edu/kit/kastel/sdq/intelligrade/state/PluginState.java     | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
index 6972b3a..b0fff5c 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/login/CefUtils.java
@@ -54,7 +54,6 @@ public static void resetCookies() {
      */
     public static CompletableFuture<JBCefCookie> jcefBrowserLogin() {
 
-
         // offscreen rendering is problematic on Linux
         JBCefBrowser browser = JBCefBrowser.createBuilder()
                 .setClient(browserClient)
diff --git a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
index da37cf6..4d8cc20 100644
--- a/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
+++ b/src/main/java/edu/kit/kastel/sdq/intelligrade/state/PluginState.java
@@ -71,7 +71,8 @@ public void logout() {
         boolean answer = true;
         // check if confirmation is necessary because assessment is running
         if (isAssessing()) {
-            answer = MessageDialogBuilder.okCancel("Logging out while assessing!",
+            answer = MessageDialogBuilder.okCancel(
+                            "Logging out while assessing!",
                             "Logging out while assessing will discard current changes. Continue?")
                     .guessWindowAndAsk();
         }