feat: add AbstractBlockedAuthRequest; rm jsprint

lvhuichao · lvhuichao · commit fe1db597703b · 2023-03-20T15:13:10.000+08:00
diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java b/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java
@@ -99,6 +99,7 @@ public enum BizError {
     DISABLE_AUTH_CONFIG_FORBIDDEN(403, 5617),
     USER_NOT_EXIST(400, 5618),
     JWT_NOT_FIND(400, 5619),
+    ID_NOT_EXIST(500, 5620),
 
 
     // asset related, code range 5700 - 5799
diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java b/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java
@@ -0,0 +1,19 @@
+package com.openblocks.api.authentication.request;
+
+import static com.openblocks.api.authentication.util.AuthenticationUtils.AUTH_REQUEST_THREAD_POOL;
+
+import com.openblocks.domain.authentication.context.AuthRequestContext;
+import com.openblocks.domain.user.model.AuthUser;
+
+import reactor.core.publisher.Mono;
+
+public abstract class AbstractBlockedAuthRequest implements AuthRequest {
+
+    @Override
+    public final Mono<AuthUser> auth(AuthRequestContext authRequestContext) {
+        return Mono.fromSupplier(() -> authSync(authRequestContext))
+                .subscribeOn(AUTH_REQUEST_THREAD_POOL);
+    }
+
+    protected abstract AuthUser authSync(AuthRequestContext authRequestContext);
+}
diff --git a/server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries b/server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries
@@ -1,5 +1,4 @@
 fast-xml-parser
-jsprint
 jspdf
 jmespath
 jsonpath
diff --git a/server/api-service/openblocks-server/src/test/resources/users.ldif b/server/api-service/openblocks-server/src/test/resources/users.ldif
@@ -1,20 +1,40 @@
 version: 1
-dn: dc=baeldung,dc=com
+dn: dc=openblocks,dc=dev
 objectClass: domain
 objectClass: top
-dc: baeldung
+dc: openblocks
 
-dn: ou=Users,dc=baeldung,dc=com
+dn: ou=Users,dc=openblocks,dc=dev
 objectClass: organizationalUnit
 objectClass: top
 ou: Users
 
-dn: cn=Joe Simms,ou=Users,dc=baeldung,dc=com
+dn: cn=Joe Simms,ou=Users,dc=openblocks,dc=dev
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
 objectClass: person
 objectClass: top
 cn: Joe Simms
 sn: Simms
 uid: user1
-userPassword: 12345
+userPassword: 12345
+
+dn: cn=lv,ou=Users,dc=openblocks,dc=dev
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: lv
+sn: lv
+uid: 1
+userPassword: 1111qqqq
+
+dn: cn=yu,ou=Users,dc=openblocks,dc=dev
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: yu
+sn: yu
+uid: 2
+userPassword: 1111qqqq

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`fast-xml-parser`
`2`		`-jsprint`
`3`	`2`	`jspdf`
`4`	`3`	`jmespath`
`5`	`4`	`jsonpath`