7x31/databasir
1
0
Fork 0
mirror of https://github.com/vran-dev/databasir.git synced 2025-10-18 21:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: checkstyle

Browse Source
This commit is contained in:
vran
2022-03-02 20:11:15 +08:00
parent 57fbdbbd22
commit dfeaac5292
9 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/main/java/com/databasir/core/domain/app/OAuthAppService.java → core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java
View File

@@ -4,13 +4,13 @@ import com.databasir.core.domain.DomainErrors;
import com.databasir.core.domain.app.converter.OAuthAppPojoConverter;
import com.databasir.core.domain.app.converter.OAuthAppResponseConverter;
import com.databasir.core.domain.app.data.*;
import com.databasir.core.domain.app.handler.OAuthHandler;
import com.databasir.core.domain.app.handler.OpenAuthHandler;
import com.databasir.core.domain.app.handler.OAuthProcessContext;
import com.databasir.core.domain.app.handler.OAuthProcessResult;
import com.databasir.core.domain.user.data.UserCreateRequest;
import com.databasir.core.domain.user.data.UserDetailResponse;
import com.databasir.core.domain.user.service.UserService;
import com.databasir.dao.impl.OAuthAppDao;
import com.databasir.dao.impl.OauthAppDao;
import com.databasir.dao.tables.pojos.OauthAppPojo;
import lombok.RequiredArgsConstructor;
import org.springframework.dao.DuplicateKeyException;
@@ -27,23 +27,23 @@ import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
public class OAuthAppService {
public class OpenAuthAppService {
private final List<OAuthHandler> oAuthHandlers;
private final List<OpenAuthHandler> openAuthHandlers;
private final OAuthAppDao oAuthAppDao;
private final OauthAppDao oauthAppDao;
private final UserService userService;
private final OAuthAppResponseConverter oAuthAppResponseConverter;
private final OAuthAppResponseConverter oauthAppResponseConverter;
private final OAuthAppPojoConverter oAuthAppPojoConverter;
private final OAuthAppPojoConverter oauthAppPojoConverter;
public UserDetailResponse oauthCallback(String registrationId, Map<String, String[]> params) {
// match handler
OauthAppPojo app = oAuthAppDao.selectByRegistrationId(registrationId);
OAuthHandler oAuthHandler = oAuthHandlers.stream()
OauthAppPojo app = oauthAppDao.selectByRegistrationId(registrationId);
OpenAuthHandler openAuthHandler = openAuthHandlers.stream()
.filter(handler -> handler.support(app.getAppType()))
.findFirst()
.orElseThrow(() -> new UsernameNotFoundException("暂不支持该类型登陆"));
@@ -53,7 +53,7 @@ public class OAuthAppService {
.callbackParameters(params)
.registrationId(registrationId)
.build();
OAuthProcessResult result = oAuthHandler.process(context);
OAuthProcessResult result = openAuthHandler.process(context);
// get or create new user
return userService.get(result.getEmail())
@@ -71,41 +71,41 @@ public class OAuthAppService {
}
public List<OAuthAppResponse> listAll() {
List<OauthAppPojo> apps = oAuthAppDao.selectAll();
List<OauthAppPojo> apps = oauthAppDao.selectAll();
return apps.stream()
.map(oAuthAppResponseConverter::to)
.map(oauthAppResponseConverter::to)
.collect(Collectors.toList());
}
public void deleteById(Integer id) {
if (oAuthAppDao.existsById(id)) {
oAuthAppDao.deleteById(id);
if (oauthAppDao.existsById(id)) {
oauthAppDao.deleteById(id);
}
}
public void updateById(OAuthAppUpdateRequest request) {
OauthAppPojo pojo = oAuthAppPojoConverter.of(request);
OauthAppPojo pojo = oauthAppPojoConverter.of(request);
try {
oAuthAppDao.updateById(pojo);
oauthAppDao.updateById(pojo);
} catch (DuplicateKeyException e) {
throw DomainErrors.REGISTRATION_ID_DUPLICATE.exception();
}
}
public Integer create(OAuthAppCreateRequest request) {
OauthAppPojo pojo = oAuthAppPojoConverter.of(request);
OauthAppPojo pojo = oauthAppPojoConverter.of(request);
try {
return oAuthAppDao.insertAndReturnId(pojo);
return oauthAppDao.insertAndReturnId(pojo);
} catch (DuplicateKeyException e) {
throw DomainErrors.REGISTRATION_ID_DUPLICATE.exception();
}
}
public Page<OAuthAppPageResponse> listPage(Pageable page, OAuthAppPageCondition condition) {
return oAuthAppDao.selectByPage(page, condition.toCondition()).map(oAuthAppPojoConverter::toPageResponse);
return oauthAppDao.selectByPage(page, condition.toCondition()).map(oauthAppPojoConverter::toPageResponse);
}
public Optional<OAuthAppDetailResponse> getOne(Integer id) {
return oAuthAppDao.selectOptionalById(id).map(oAuthAppPojoConverter::toDetailResponse);
return oauthAppDao.selectOptionalById(id).map(oauthAppPojoConverter::toDetailResponse);
}
}

11
core/src/main/java/com/databasir/core/domain/app/handler/GithubOauthHandler.java → core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java
View File

@@ -1,11 +1,10 @@
package com.databasir.core.domain.app.handler;
import com.databasir.core.domain.DomainErrors;
import com.databasir.core.domain.app.exception.DatabasirAuthenticationException;
import com.databasir.core.infrastructure.remote.github.GithubRemoteService;
import com.databasir.dao.enums.OAuthAppType;
import com.databasir.dao.impl.OAuthAppDao;
import com.databasir.dao.impl.OauthAppDao;
import com.databasir.dao.tables.pojos.OauthAppPojo;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.RequiredArgsConstructor;
@@ -18,11 +17,11 @@ import java.util.Map;
@Component
@RequiredArgsConstructor
public class GithubOauthHandler implements OAuthHandler {
public class GithubOpenAuthHandler implements OpenAuthHandler {
private final GithubRemoteService githubRemoteService;
private final OAuthAppDao oAuthAppDao;
private final OauthAppDao oauthAppDao;
@Override
public boolean support(String oauthAppType) {
@@ -31,7 +30,7 @@ public class GithubOauthHandler implements OAuthHandler {
@Override
public String authorization(String registrationId) {
OauthAppPojo app = oAuthAppDao.selectByRegistrationId(registrationId);
OauthAppPojo app = oauthAppDao.selectByRegistrationId(registrationId);
String authUrl = app.getAuthUrl();
String clientId = app.getClientId();
String authorizeUrl = authUrl + "/login/oauth/authorize";
@@ -46,7 +45,7 @@ public class GithubOauthHandler implements OAuthHandler {
@Override
public OAuthProcessResult process(OAuthProcessContext context) {
OauthAppPojo authApp = oAuthAppDao.selectByRegistrationId(context.getRegistrationId());
OauthAppPojo authApp = oauthAppDao.selectByRegistrationId(context.getRegistrationId());
String clientId = authApp.getClientId();
String clientSecret = authApp.getClientSecret();
String baseUrl = authApp.getResourceUrl();

2
core/src/main/java/com/databasir/core/domain/app/handler/OAuthHandler.java → core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java
View File

@@ -1,6 +1,6 @@
package com.databasir.core.domain.app.handler;
public interface OAuthHandler {
public interface OpenAuthHandler {
boolean support(String oauthAppType);

6
core/src/main/java/com/databasir/core/domain/login/service/LoginService.java
View File

@@ -111,10 +111,12 @@ public class LoginService {
data.setUsername(user.getUsername());
data.setAccessToken(login.getAccessToken());
data.setAvatar(user.getAvatar());
long expireAt = login.getAccessTokenExpireAt().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
long expireAt = login.getAccessTokenExpireAt()
.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
data.setAccessTokenExpireAt(expireAt);
data.setRefreshToken(login.getRefreshToken());
List<UserRolePojo> rolePojoList = userRoleDao.selectByUserIds(Collections.singletonList(user.getId()));
List<UserRolePojo> rolePojoList =
userRoleDao.selectByUserIds(Collections.singletonList(user.getId()));
List<UserLoginResponse.RoleResponse> roles = rolePojoList
.stream()
.map(ur -> {