Merge pull request #1178 from amvanbaren/use-agreement-after-signing

Use publisher agreement after signing

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/UserAPI.java

@@ -346,8 +346,15 @@ public ResponseEntity<UserJson> signPublisherAgreement() {
             return new ResponseEntity<>(HttpStatus.FORBIDDEN);
         }
         try {
-            eclipse.signPublisherAgreement(user);
-            return ResponseEntity.ok(getUserData());
+            var agreement = eclipse.signPublisherAgreement(user);
+            var json = user.toUserJson();
+            var serverUrl = UrlUtil.getBaseUrl();
+            json.setRole(user.getRole());
+            json.setTokensUrl(createApiUrl(serverUrl, "user", "tokens"));
+            json.setCreateTokenUrl(createApiUrl(serverUrl, "user", "token", "create"));
+            eclipse.enrichUserJson(json, user, agreement);
+
+            return ResponseEntity.ok(json);
         } catch (ErrorResultException exc) {
             return exc.toResponseEntity(UserJson.class);
         }

server/src/main/java/org/eclipse/openvsx/eclipse/EclipseService.java

@@ -158,10 +158,31 @@ public void updateUserData(UserData user, EclipseProfile profile) {
         user.setEclipsePersonId(profile.getName());
     }
 
+    public void enrichUserJson(UserJson json, UserData user) {
+        var usableToken = true;
+        PublisherAgreement agreement = null;
+        try {
+            // Add information on the publisher agreement
+            agreement = getPublisherAgreement(user);
+        } catch (ErrorResultException e) {
+            if(e.getStatus() == HttpStatus.FORBIDDEN) {
+                usableToken = false;
+            } else {
+                logger.info("Failed to enrich UserJson", e);
+            }
+        }
+
+        enrichUserJson(json, user, agreement, usableToken);
+    }
+
+    public void enrichUserJson(UserJson json, UserData user, PublisherAgreement agreement) {
+        enrichUserJson(json, user, agreement, true);
+    }
+
     /**
      * Enrich the given JSON user data with Eclipse-specific information.
      */
-    public void enrichUserJson(UserJson json, UserData user) {
+    private void enrichUserJson(UserJson json, UserData user, PublisherAgreement agreement, boolean usableToken) {
         if (!isActive()) {
             return;
         }
@@ -175,23 +196,12 @@ public void enrichUserJson(UserJson json, UserData user) {
             return;
         }
 
-        var usableToken = true;
-        try {
-            // Add information on the publisher agreement
-            var agreement = getPublisherAgreement(user);
-            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;
-            } else {
-                logger.info("Failed to enrich UserJson", e);
-            }
+        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()));
         }
 
         // Report user as logged in only if there is a usable token: