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

Always set PublisherAgreement #1033

Merged
merged 1 commit into from
Nov 6, 2024
+9 −9
Merged

Always set PublisherAgreement #1033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions server/src/main/java/org/eclipse/openvsx/eclipse/EclipseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,24 +166,25 @@ public void enrichUserJson(UserJson json, UserData user) {
}

var publisherAgreement = new UserJson.PublisherAgreement();
publisherAgreement.setStatus("none");
json.setPublisherAgreement(publisherAgreement);

var personId = user.getEclipsePersonId();
if (personId == null) {
publisherAgreement.setStatus("none");
return;
}

var usableToken = true;
try {
// Add information on the publisher agreement
var agreement = getPublisherAgreement(user);
if (agreement == null || !agreement.isActive() || agreement.version() == null)
publisherAgreement.setStatus("none");
else if (publisherAgreementVersion.equals(agreement.version()))
publisherAgreement.setStatus("signed");
else
publisherAgreement.setStatus("outdated");
if (agreement != null && agreement.timestamp() != null)
if(agreement != null && agreement.isActive() && agreement.version() != null) {
var status = publisherAgreementVersion.equals(agreement.version()) ? "signed" : "outdated";
publisherAgreement.setStatus(status);
}
if (agreement != null && agreement.timestamp() != null) {
publisherAgreement.setTimestamp(TimeUtil.toUTCString(agreement.timestamp()));
}
} catch (ErrorResultException e) {
if(e.getStatus() == HttpStatus.FORBIDDEN) {
usableToken = false;
Expand All @@ -192,7 +193,6 @@ else if (publisherAgreementVersion.equals(agreement.version()))
}
}

json.setPublisherAgreement(publisherAgreement);
// Report user as logged in only if there is a usable token:
// we need the token to access the Eclipse REST API
if(usableToken) {
Expand Down