Skip to content

feat: add AbstractBlockedAuthRequest; rm jsprint #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neon-balcony merged 2 commits into from
Mar 20, 2023
Merged

feat: add AbstractBlockedAuthRequest; rm jsprint #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe1db59
feat: add AbstractBlockedAuthRequest; rm jsprint
lvhuichao Mar 20, 2023
4f13e4d
Merge branch 'develop' into github_develop
lvhuichao Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions ...r/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 0 additions & 1 deletion server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
fast-xml-parser
jsprint
jspdf
jmespath
jsonpath
Expand Down
30 changes: 25 additions & 5 deletions server/api-service/openblocks-server/src/test/resources/users.ldif
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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