Browse Source

Made method 'getAllOAuth2Params' public

pull/3557/head
vzikratyi 6 years ago
parent
commit
328c827744
  1. 3
      common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
  2. 4
      dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java

3
common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java

@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration;
import org.thingsboard.server.common.data.oauth2.OAuth2ClientsParams;
import java.util.List;
import java.util.Map;
public interface OAuth2Service {
Pair<TenantId, OAuth2ClientRegistration> getClientRegistrationWithTenant(String registrationId);
@ -46,4 +47,6 @@ public interface OAuth2Service {
boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId);
Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams();
}

4
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java

@ -315,7 +315,9 @@ public class OAuth2ServiceImpl implements OAuth2Service {
return clientsParams.get(tenantId);
}
private Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() {
// TODO this is just for test, maybe there's a better way to test it without exporting to interface
@Override
public Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() {
OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParamsFromDb();
ListenableFuture<Map<String, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute();
try {

Loading…
Cancel
Save