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 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 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 res = openCGAClient.getProjectClient().search(new ObjectMap()); diff --git a/pom.xml b/pom.xml index 3bb7b819bb0..92abd71dbb6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,12 @@ - 3.2.1 - 3.2.1 - 6.2.1 - 3.2.1 - 5.2.1 - 3.2.1 + 3.2.2-SNAPSHOT + 3.2.2-SNAPSHOT + 6.2.2-SNAPSHOT + 3.2.2-SNAPSHOT + 5.2.2-SNAPSHOT + 3.2.2-SNAPSHOT 0.2.0