server+webui: use dynamic /login endpoint

eclipse · Dec 10, 2024 · 1abe659 · 1abe659
1 parent da3ee40
commit 1abe659
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/server/src/main/java/org/eclipse/openvsx/OVSXConfig.java b/server/src/main/java/org/eclipse/openvsx/OVSXConfig.java
@@ -26,6 +26,8 @@ public void setAuth(AuthConfig authConfig) {
 
     public static class AuthConfig {
 
+        private String provider = "github";
+
         /**
          * Configuration example:
          * <pre><code>
@@ -38,6 +40,14 @@ public static class AuthConfig {
          */
         private Map<String, AttributeNames> attributeNames = emptyMap();
 
+        public String getProvider() {
+            return provider;
+        }
+
+        public void setProvider(String provider) {
+            this.provider = provider;
+        }
+
         public Map<String, AttributeNames> getAttributeNames() {
             return attributeNames;
         }

diff --git a/server/src/main/java/org/eclipse/openvsx/UserAPI.java b/server/src/main/java/org/eclipse/openvsx/UserAPI.java
@@ -53,17 +53,20 @@ public class UserAPI {
     private final UserService users;
     private final EclipseService eclipse;
     private final StorageUtilService storageUtil;
+    private final OVSXConfig config;
 
     public UserAPI(
             RepositoryService repositories,
             UserService users,
             EclipseService eclipse,
-            StorageUtilService storageUtil
+            StorageUtilService storageUtil,
+            OVSXConfig config
     ) {
         this.repositories = repositories;
         this.users = users;
         this.eclipse = eclipse;
         this.storageUtil = storageUtil;
+        this.config = config;
     }
 
     /**
@@ -73,7 +76,7 @@ public UserAPI(
         path = "/login"
     )
     public ModelAndView login(ModelMap model) {
-        return new ModelAndView("redirect:/oauth2/authorization/github", model);
+        return new ModelAndView("redirect:/oauth2/authorization/" + config.getAuth().getProvider(), model);
     }
 
     /**

diff --git a/webui/src/extension-registry-service.ts b/webui/src/extension-registry-service.ts
@@ -25,7 +25,7 @@ export class ExtensionRegistryService {
     }
 
     getLoginUrl(): string {
-        return createAbsoluteURL([this.serverUrl, 'oauth2', 'authorization', 'github']);
+        return createAbsoluteURL([this.serverUrl, 'login']);
     }
 
     getLogoutUrl(): string {