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

Update getOAuth2Clients Rest client method

Browse Source
This commit is contained in:
Igor Kulikov 2021-06-22 14:27:56 +03:00
parent a7a7c801f2
commit 1f9b4c093a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
View File

@ -104,6 +104,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo; import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo;
import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate; import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
import org.thingsboard.server.common.data.oauth2.OAuth2Info; import org.thingsboard.server.common.data.oauth2.OAuth2Info;
import org.thingsboard.server.common.data.oauth2.PlatformType;
import org.thingsboard.server.common.data.ota.ChecksumAlgorithm; import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
import org.thingsboard.server.common.data.ota.OtaPackageType; import org.thingsboard.server.common.data.ota.OtaPackageType;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
@ -1772,7 +1773,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
}).getBody(); }).getBody();
} }
public List<OAuth2ClientInfo> getOAuth2Clients(String pkgName) { public List<OAuth2ClientInfo> getOAuth2Clients(String pkgName, PlatformType platformType) {
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
StringBuilder urlBuilder = new StringBuilder(baseURL); StringBuilder urlBuilder = new StringBuilder(baseURL);
urlBuilder.append("/api/noauth/oauth2Clients"); urlBuilder.append("/api/noauth/oauth2Clients");
@ -1780,6 +1781,15 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
urlBuilder.append("?pkgName={pkgName}"); urlBuilder.append("?pkgName={pkgName}");
params.put("pkgName", pkgName); params.put("pkgName", pkgName);
} }
if (platformType != null) {
if (pkgName != null) {
urlBuilder.append("&");
} else {
urlBuilder.append("?");
}
urlBuilder.append("platform={platform}");
params.put("platform", platformType.name());
}
return restTemplate.exchange( return restTemplate.exchange(
urlBuilder.toString(), urlBuilder.toString(),
HttpMethod.POST, HttpMethod.POST,