Rate Limit API Calls issue when building an application #587

server/src/dev/resources/application.yml

@@ -95,7 +95,7 @@ bucket4j:
               time: 1
               unit: seconds
     - cache-name: buckets
-      url: '/vscode/(?!asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default).*|/api/(?!(.*/.*/review(/delete)?)|(-/(namespace/create|publish))).*'
+      url: '/vscode/(?!asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default).*'
       http-response-headers:
         Access-Control-Allow-Origin: '*'
         Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining
@@ -105,7 +105,24 @@ bucket4j:
             - capacity: 15
               time: 1
               unit: seconds
-
+    - cache-name: buckets
+      url: '/api/(?!(.*/.*/review(/delete)?)|(-/(namespace/create|publish))).*'
+      http-response-headers:
+        Access-Control-Allow-Origin: '*'
+        Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining
+      rate-limits:
+        - execute-condition: getParameter("token") != null
+          expression: getParameter("token")
+          bandwidths:
+            - capacity: 15
+              time: 1
+              unit: seconds
+        - execute-condition: getParameter("token") == null
+          expression: getRemoteAddr()
+          bandwidths:
+            - capacity: 15
+              time: 1
+              unit: seconds
 ovsx:
   databasesearch:
     enabled: false

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

@@ -408,13 +408,18 @@ private static boolean mismatch(String s1, String s2) {
                 && !s1.equalsIgnoreCase(s2);
     }
 
-    @Transactional(rollbackOn = ErrorResultException.class)
-    public ResultJson createNamespace(NamespaceJson json, String tokenValue) {
+    public PersonalAccessToken getAccessToken(String tokenValue) {
         var token = users.useAccessToken(tokenValue);
-        if (token == null) {
-            throw new ErrorResultException("Invalid access token.");
+        if (token == null || token.getUser() == null) {
+            throw new ErrorResultException("Invalid access token.", HttpStatus.UNAUTHORIZED);
         }
 
+        return token;
+    }
+
+    @Transactional(rollbackOn = ErrorResultException.class)
+    public ResultJson createNamespace(NamespaceJson json, String tokenValue) {
+        var token = getAccessToken(tokenValue);
         return createNamespace(json, token.getUser());
     }
 
@@ -465,10 +470,7 @@ public ExtensionJson publish(InputStream content, UserData user) throws ErrorRes
 
     @Transactional(rollbackOn = ErrorResultException.class)
     public ExtensionJson publish(InputStream content, String tokenValue) throws ErrorResultException {
-        var token = users.useAccessToken(tokenValue);
-        if (token == null || token.getUser() == null) {
-            throw new ErrorResultException("Invalid access token.");
-        }
+        var token = getAccessToken(tokenValue);
 
         // Check whether the user has a valid publisher agreement
         eclipse.checkPublisherAgreement(token.getUser());