Merge pull request #424 from lowcoder-org/oauth-fixes

Add Handling To Delete An Auth Config Permanently

Author: FalkWolsky

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

@@ -90,8 +90,8 @@ public Mono<ResponseView<Void>> enableAuthConfig(@RequestBody AuthConfigRequest
     }
 
     @DeleteMapping("/config/{id}")
-    public Mono<ResponseView<Void>> disableAuthConfig(@PathVariable("id") String id) {
-        return authenticationApiService.disableAuthConfig(id)
+    public Mono<ResponseView<Void>> disableAuthConfig(@PathVariable("id") String id, @RequestParam(required = false) boolean delete) {
+        return authenticationApiService.disableAuthConfig(id, delete)
                 .thenReturn(ResponseView.success(null));
     }
 

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

@@ -17,7 +17,7 @@ public interface AuthenticationApiService {
 
     Mono<Boolean> enableAuthConfig(AuthConfigRequest authConfigRequest);
 
-    Mono<Boolean> disableAuthConfig(String authId);
+    Mono<Boolean> disableAuthConfig(String authId, boolean delete);
 
     Flux<FindAuthConfig> findAuthConfigs(boolean enableOnly);
 }

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

@@ -41,6 +41,7 @@
 import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import static org.lowcoder.sdk.exception.BizError.*;
@@ -239,12 +240,12 @@ public Mono<Boolean> enableAuthConfig(AuthConfigRequest authConfigRequest) {
     }
 
     @Override
-    public Mono<Boolean> disableAuthConfig(String authId) {
+    public Mono<Boolean> disableAuthConfig(String authId, boolean delete) {
         return checkIfAdmin()
                 .then(checkIfOnlyEffectiveCurrentUserConnections(authId))
                 .then(sessionUserService.getVisitorOrgMemberCache())
                 .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                .doOnNext(organization -> disableAuthConfig(organization, authId))
+                .doOnNext(organization -> disableAuthConfig(organization, authId, delete))
                 .flatMap(organization -> organizationService.update(organization.getId(), organization))
                 .delayUntil(result -> {
                     if (result) {
@@ -309,13 +310,28 @@ private Mono<Void> checkIfOnlyEffectiveCurrentUserConnections(String authId) {
                 .then();
     }
 
-    private void disableAuthConfig(Organization organization, String authId) {
-        Optional.of(organization)
-                .map(Organization::getAuthConfigs)
-                .orElse(Collections.emptyList())
-                .stream()
-                .filter(abstractAuthConfig -> Objects.equals(abstractAuthConfig.getId(), authId))
-                .forEach(abstractAuthConfig -> abstractAuthConfig.setEnable(false));
+    private void disableAuthConfig(Organization organization, String authId, boolean delete) {
+
+        Predicate<AbstractAuthConfig> authConfigPredicate = abstractAuthConfig -> Objects.equals(abstractAuthConfig.getId(), authId);
+
+        if(delete) {
+            List<AbstractAuthConfig> abstractAuthConfigs = Optional.of(organization)
+                    .map(Organization::getAuthConfigs)
+                    .orElse(Collections.emptyList());
+
+            abstractAuthConfigs.removeIf(authConfigPredicate);
+
+            organization.getOrganizationDomain().setConfigs(abstractAuthConfigs);
+
+        } else {
+            Optional.of(organization)
+                    .map(Organization::getAuthConfigs)
+                    .orElse(Collections.emptyList()).stream()
+                    .filter(authConfigPredicate)
+                    .forEach(abstractAuthConfig -> {
+                        abstractAuthConfig.setEnable(false);
+                    });
+        }
     }
 
     /**