Merged Feature/generic oauth #875

Author: ludomikula

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2GenericAuthConfig.java

@@ -4,6 +4,9 @@
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.SCOPE_PLACEHOLDER;
+
 /**
  * This class is for Generic Auth Provider
  */
@@ -20,4 +23,14 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {
     private String userInfoEndpoint;
     private String scope;
     private Boolean userInfoIntrospection;
+
+    @Override
+    public String replaceAuthUrlClientIdPlaceholder(String url)
+    {
+        return super.replaceAuthUrlClientIdPlaceholder(url)
+                .replace(BASE_URL_PLACEHOLDER, authorizationEndpoint)
+                .replace(SCOPE_PLACEHOLDER, scope);
+    }
+
+
 }

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java

@@ -38,7 +38,7 @@ public String getAuthorizeUrl() {
             case AuthTypeConstants.GITHUB -> replaceAuthUrlClientIdPlaceholder(Oauth2Constants.GITHUB_AUTHORIZE_URL);
             case AuthTypeConstants.ORY -> replaceAuthUrlClientIdPlaceholder(Oauth2Constants.ORY_AUTHORIZE_URL);
             case AuthTypeConstants.KEYCLOAK -> replaceAuthUrlClientIdPlaceholder(Oauth2Constants.KEYCLOAK_AUTHORIZE_URL);
-            case AuthTypeConstants.GENERIC -> ((Oauth2GenericAuthConfig)this).getAuthorizationEndpoint();
+            case AuthTypeConstants.GENERIC -> replaceAuthUrlClientIdPlaceholder(Oauth2Constants.GENERIC_AUTHORIZE_URL);
             default -> null;
         };
     }

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java

@@ -41,4 +41,13 @@ public class Oauth2Constants {
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
             + "&state=" + STATE_PLACEHOLDER
             + "&scope=" + SCOPE_PLACEHOLDER;
+
+    public static final String GENERIC_AUTHORIZE_URL = BASE_URL_PLACEHOLDER
+            + "?response_type=code"
+            + "&client_id=" + CLIENT_ID_PLACEHOLDER
+            + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
+            + "&state=" + STATE_PLACEHOLDER
+            + "&scope=" + SCOPE_PLACEHOLDER
+            + "&access_type=offline"
+            + "&prompt=select_account";
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

@@ -418,12 +418,6 @@ private boolean addOrUpdateNewAuthConfig(Organization organization, AbstractAuth
                 .stream()
                 .collect(Collectors.toMap(AbstractAuthConfig::getId, Function.identity()));
 
-        boolean authTypeAlreadyExists = authConfigMap.values().stream()
-                .anyMatch(config -> !config.getId().equals(newAuthConfig.getId()) && config.getAuthType().equals(newAuthConfig.getAuthType()));
-        if(authTypeAlreadyExists) {
-            return false;
-        }
-
         // Under the organization, the source can uniquely identify the whole auth config.
         AbstractAuthConfig old = authConfigMap.get(newAuthConfig.getId());
         if (old != null) {

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java

@@ -19,7 +19,6 @@ public class AuthConfigFactoryImpl implements AuthConfigFactory {
 
     @Override
     public AbstractAuthConfig build(AuthConfigRequest authConfigRequest, boolean enable) {
-        buildOauth2GenericAuthConfig(authConfigRequest, enable);
         return switch (authConfigRequest.getAuthType()) {
             case AuthTypeConstants.FORM -> buildEmailAuthConfig(authConfigRequest, enable);
             case AuthTypeConstants.GITHUB -> buildOauth2SimpleAuthConfig(GITHUB, GITHUB_NAME, authConfigRequest, enable);