Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TASK-6992 - Error with token in the CLI #2509

Merged
merged 4 commits into from
Oct 1, 2024
Merged

TASK-6992 - Error with token in the CLI #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0b8d91
cli: Error message Active token detected. Please logout first. #TASK-…
juanfeSanahuja Sep 26, 2024
92ff7a7
cli: Ensure that the client has the session token #TASK-6992
juanfeSanahuja Sep 26, 2024
f434e43
Merge branch 'release-3.2.x' into TASK-6992
juanfeSanahuja Sep 26, 2024
3456609
Update versions of the libraries #TASK-6992
juanfeSanahuja Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomUsersCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 6 additions & 2 deletions opencga-app/src/main/java/org/opencb/opencga/app/cli/main/processors/CommandProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading