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

Get System OAuth2 config without tenantId

Browse Source
This commit is contained in:
vzikratyi 2020-06-25 16:45:50 +03:00
parent d22237796e
commit 0149c4b652
3 changed files with 9 additions and 9 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

@ -65,7 +65,7 @@ public class OAuth2Controller extends BaseController {
checkOAuth2ConfigPermissions(Operation.READ); checkOAuth2ConfigPermissions(Operation.READ);
OAuth2ClientsParams oAuth2ClientsParams = null; OAuth2ClientsParams oAuth2ClientsParams = null;
if (Authority.SYS_ADMIN.equals(authority)) { if (Authority.SYS_ADMIN.equals(authority)) {
oAuth2ClientsParams = oauth2Service.getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID); oAuth2ClientsParams = oauth2Service.getSystemOAuth2ClientsParams();
} else if (Authority.TENANT_ADMIN.equals(authority)) { } else if (Authority.TENANT_ADMIN.equals(authority)) {
oAuth2ClientsParams = oauth2Service.getTenantOAuth2ClientsParams(getCurrentUser().getTenantId()); oAuth2ClientsParams = oauth2Service.getTenantOAuth2ClientsParams(getCurrentUser().getTenantId());
} }

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

@ -36,7 +36,7 @@ public interface OAuth2Service {
OAuth2ClientsParams saveTenantOAuth2ClientsParams(TenantId tenantId, OAuth2ClientsParams oAuth2ClientsParams); OAuth2ClientsParams saveTenantOAuth2ClientsParams(TenantId tenantId, OAuth2ClientsParams oAuth2ClientsParams);
OAuth2ClientsParams getSystemOAuth2ClientsParams(TenantId tenantId); OAuth2ClientsParams getSystemOAuth2ClientsParams();
OAuth2ClientsParams getTenantOAuth2ClientsParams(TenantId tenantId); OAuth2ClientsParams getTenantOAuth2ClientsParams(TenantId tenantId);

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

@ -145,7 +145,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
cacheWriteLock.unlock(); cacheWriteLock.unlock();
} }
return getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID); return getSystemOAuth2ClientsParams();
} }
@Override @Override
@ -301,12 +301,12 @@ public class OAuth2ServiceImpl implements OAuth2Service {
} }
@Override @Override
public OAuth2ClientsParams getSystemOAuth2ClientsParams(TenantId tenantId) { public OAuth2ClientsParams getSystemOAuth2ClientsParams() {
return clientsParams.get(tenantId); return clientsParams.get(TenantId.SYS_TENANT_ID);
} }
private OAuth2ClientsParams getSystemOAuth2ClientsParamsFromDb(TenantId tenantId) { private OAuth2ClientsParams getSystemOAuth2ClientsParamsFromDb() {
AdminSettings oauth2ClientsParamsSettings = adminSettingsService.findAdminSettingsByKey(tenantId, OAUTH2_CLIENT_REGISTRATIONS_PARAMS); AdminSettings oauth2ClientsParamsSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, OAUTH2_CLIENT_REGISTRATIONS_PARAMS);
String json = null; String json = null;
if (oauth2ClientsParamsSettings != null) { if (oauth2ClientsParamsSettings != null) {
json = oauth2ClientsParamsSettings.getJsonValue().get(SYSTEM_SETTINGS_OAUTH2_VALUE).asText(); json = oauth2ClientsParamsSettings.getJsonValue().get(SYSTEM_SETTINGS_OAUTH2_VALUE).asText();
@ -320,7 +320,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
} }
private Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() { private Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() {
OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParamsFromDb(TenantId.SYS_TENANT_ID); OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParamsFromDb();
ListenableFuture<Map<String, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute(); ListenableFuture<Map<String, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute();
try { try {
return Futures.transform(jsonFuture, return Futures.transform(jsonFuture,
@ -389,7 +389,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
AdminSettings oauth2ClientsSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, constructAdminSettingsDomainKey(domainName)); AdminSettings oauth2ClientsSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, constructAdminSettingsDomainKey(domainName));
OAuth2ClientsDomainParams result; OAuth2ClientsDomainParams result;
OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID); OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams();
OAuth2ClientsDomainParams systemOAuth2ClientsDomainParams = systemOAuth2ClientsParams != null ? OAuth2ClientsDomainParams systemOAuth2ClientsDomainParams = systemOAuth2ClientsParams != null ?
systemOAuth2ClientsParams.getClientsDomainsParams().stream() systemOAuth2ClientsParams.getClientsDomainsParams().stream()
.filter(oAuth2ClientsDomainParams -> domainName.equals(oAuth2ClientsDomainParams.getDomainName())) .filter(oAuth2ClientsDomainParams -> domainName.equals(oAuth2ClientsDomainParams.getDomainName()))