Skip to content

Use dedicated API call to retrieve publisher agreement when publishing an extension #1445

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use dedicated API call to retrieve publisher agreement when publishing an extension #1445

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
23 changes: 16 additions & 7 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 @@ -112,15 +112,24 @@ public void checkPublisherAgreement(UserData user) {
if (personId == null) {
throw new ErrorResultException("You must log in with an Eclipse Foundation account and sign a Publisher Agreement before publishing any extension.");
}
var profile = getPublicProfile(personId);
if (profile.getPublisherAgreements() == null || profile.getPublisherAgreements().getOpenVsx() == null
|| profile.getPublisherAgreements().getOpenVsx().getVersion() == null) {

var json = user.toUserJson();
enrichUserJson(json, user);
var publisherAgreement = json.getPublisherAgreement();

if (publisherAgreement == null || publisherAgreement.getStatus().equals("none")) {
throw new ErrorResultException("You must sign a Publisher Agreement with the Eclipse Foundation before publishing any extension.");
}
if (!publisherAgreementAllowedVersions.contains(profile.getPublisherAgreements().getOpenVsx().getVersion())) {
throw new ErrorResultException("Your Publisher Agreement with the Eclipse Foundation is outdated (version "
+ profile.getPublisherAgreements().getOpenVsx().getVersion() + "). The current version is "
+ publisherAgreementVersion + ".");

if (!publisherAgreement.getStatus().equals("signed")) {
var profile = getPublicProfile(personId);
if (profile != null && profile.getPublisherAgreements() != null && profile.getPublisherAgreements().getOpenVsx() != null) {
throw new ErrorResultException("Your Publisher Agreement with the Eclipse Foundation is outdated (version "
+ profile.getPublisherAgreements().getOpenVsx().getVersion() + "). The current version is "
+ publisherAgreementVersion + ".");
} else {
throw new ErrorResultException("Your Publisher Agreement with the Eclipse Foundation is outdated.");
}
}
}

Expand Down
Loading