From a0b8d919ee01a0d5d14492924b77f159f4b0a416 Mon Sep 17 00:00:00 2001
From: JuanfeSanahuja <juanfe.sanahuja@zettagenomics.com>
Date: Thu, 26 Sep 2024 10:23:00 +0200
Subject: [PATCH 1/3] cli: Error message Active token detected. Please logout
 first. #TASK-6992

---
 .../opencga/app/cli/main/custom/CustomUsersCommandExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java
index bfef1fbca25..c608f5e2c1a 100644
--- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java
+++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java
@@ -77,7 +77,7 @@ public RestResponse<AuthenticationResponse> login(CustomUsersCommandOptions.Logi
                 String token = session.getSession().getToken();
                 String errorMsg = "Missing password. ";
                 if (StringUtils.isNotEmpty(token)) {
-                    errorMsg += "Active token detected ";
+                    errorMsg += "Active token detected. Please logout first.";
                 }
                 CommandLineUtils.error(errorMsg);
             }

From 92ff7a77913069d2644b6942883342c282358c56 Mon Sep 17 00:00:00 2001
From: JuanfeSanahuja <juanfe.sanahuja@zettagenomics.com>
Date: Thu, 26 Sep 2024 16:25:30 +0200
Subject: [PATCH 2/3] cli: Ensure that the client has the session token
 #TASK-6992

---
 .../opencga/app/cli/main/processors/CommandProcessor.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/processors/CommandProcessor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/processors/CommandProcessor.java
index ef06e2c8944..8c43c340ab6 100644
--- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/processors/CommandProcessor.java
+++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/processors/CommandProcessor.java
@@ -136,9 +136,13 @@ private boolean checkAutoRefresh(OpencgaCommandExecutor commandExecutor) {
 
     public void loadSessionStudies(OpencgaCommandExecutor commandExecutor) {
         Session session = commandExecutor.getSessionManager().getSession();
-        logger.debug("Loading session studies using token: "
-                + session.getToken());
         OpenCGAClient openCGAClient = commandExecutor.getOpenCGAClient();
+        logger.debug("openCGAClient Token: " + openCGAClient.getToken());
+        if(StringUtils.isEmpty(openCGAClient.getToken())) {
+            openCGAClient.setToken(session.getToken());
+        }
+        logger.debug("Loading session studies using token: "
+                + openCGAClient.getToken());
         try {
             // Query the server to retrieve the studies of user projects
             RestResponse<Project> res = openCGAClient.getProjectClient().search(new ObjectMap());

From 3456609d33f8618cd310cef84eefee05ee3abbe4 Mon Sep 17 00:00:00 2001
From: JuanfeSanahuja <juanfe.sanahuja@zettagenomics.com>
Date: Fri, 27 Sep 2024 09:44:23 +0200
Subject: [PATCH 3/3] Update versions of the libraries #TASK-6992

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bb7b819bb0..92abd71dbb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,12 @@
     </modules>
 
     <properties>
-        <pyopencga.version>3.2.1</pyopencga.version>
-        <opencgar.version>3.2.1</opencgar.version>
-        <cellbase.version>6.2.1</cellbase.version>
-        <biodata.version>3.2.1</biodata.version>
-        <java-common-libs.version>5.2.1</java-common-libs.version>
-        <iva.version>3.2.1</iva.version>
+        <pyopencga.version>3.2.2-SNAPSHOT</pyopencga.version>
+        <opencgar.version>3.2.2-SNAPSHOT</opencgar.version>
+        <cellbase.version>6.2.2-SNAPSHOT</cellbase.version>
+        <biodata.version>3.2.2-SNAPSHOT</biodata.version>
+        <java-common-libs.version>5.2.2-SNAPSHOT</java-common-libs.version>
+        <iva.version>3.2.2-SNAPSHOT</iva.version>
 
         <oskar.version>0.2.0</oskar.version>