Merge branch 'release-3.2.x' into TASK-6998-3.2.2

opencb · Oct 2, 2024 · 026c524 · 026c524
2 parents 90afb75 + 507168d
commit 026c524
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/...-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java b/...-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);
             }

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
@@ -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());

diff --git 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>