dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
vzikratyi 2020-06-22 16:19:03 +03:00
parent 7fcf8a9894
commit 6e7d0c633f
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
View File

@ -39,7 +39,7 @@ public class OAuth2Controller extends BaseController {
@ResponseBody @ResponseBody
public OAuth2ClientRegistration getClientRegistrationById(@PathVariable(REGISTRATION_ID) String registrationId) throws ThingsboardException { public OAuth2ClientRegistration getClientRegistrationById(@PathVariable(REGISTRATION_ID) String registrationId) throws ThingsboardException {
try { try {
return oauth2Service.getClientRegistrationByRegistrationId(registrationId); return oauth2Service.getClientRegistration(registrationId);
} catch (Exception e) { } catch (Exception e) {
throw handleException(e); throw handleException(e);
} }

2
application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationSuccessHandler.java
View File

@ -64,7 +64,7 @@ public class Oauth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
try { try {
OAuth2AuthenticationToken token = (OAuth2AuthenticationToken) authentication; OAuth2AuthenticationToken token = (OAuth2AuthenticationToken) authentication;
OAuth2ClientRegistration clientRegistration = oAuth2Service.getClientRegistrationByRegistrationId(token.getAuthorizedClientRegistrationId()); OAuth2ClientRegistration clientRegistration = oAuth2Service.getClientRegistration(token.getAuthorizedClientRegistrationId());
OAuth2ClientMapper mapper = oauth2ClientMapperProvider.getOAuth2ClientMapperByType(clientRegistration.getMapperConfig().getType()); OAuth2ClientMapper mapper = oauth2ClientMapperProvider.getOAuth2ClientMapperByType(clientRegistration.getMapperConfig().getType());
SecurityUser securityUser = mapper.getOrCreateUserByClientPrincipal(token, clientRegistration.getMapperConfig()); SecurityUser securityUser = mapper.getOrCreateUserByClientPrincipal(token, clientRegistration.getMapperConfig());

2
common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
View File

@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration;
import java.util.List; import java.util.List;
public interface OAuth2Service { public interface OAuth2Service {
OAuth2ClientRegistration getClientRegistrationByRegistrationId(String registrationId); OAuth2ClientRegistration getClientRegistration(String registrationId);
List<OAuth2ClientInfo> getOAuth2Clients(); List<OAuth2ClientInfo> getOAuth2Clients();
} }

2
dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
View File

@ -18,7 +18,7 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
@Override @Override
public ClientRegistration findByRegistrationId(String registrationId) { public ClientRegistration findByRegistrationId(String registrationId) {
OAuth2ClientRegistration localClientRegistration = oAuth2Service.getClientRegistrationByRegistrationId(registrationId); OAuth2ClientRegistration localClientRegistration = oAuth2Service.getClientRegistration(registrationId);
return localClientRegistration == null ? return localClientRegistration == null ?
null : toSpringClientRegistration(localClientRegistration); null : toSpringClientRegistration(localClientRegistration);
} }

2
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
View File

@ -53,7 +53,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
} }
@Override @Override
public OAuth2ClientRegistration getClientRegistrationByRegistrationId(String registrationId) { public OAuth2ClientRegistration getClientRegistration(String registrationId) {
if (oauth2Configuration == null || !oauth2Configuration.isEnabled()) return null; if (oauth2Configuration == null || !oauth2Configuration.isEnabled()) return null;
OAuth2Client oAuth2Client = oauth2Configuration.getClients() == null ? null : oauth2Configuration.getClients().get(registrationId); OAuth2Client oAuth2Client = oauth2Configuration.getClients() == null ? null : oauth2Configuration.getClients().get(registrationId);
if (oAuth2Client != null){ if (oAuth2Client != null){