简柏林 / thingskit · Commits

Commit bfc3e75fc9707aacee3970252ae0b3ae8fd928d4

Authored by vzikratyi
1 parent d5cfccc1

Unpacked Domain objects from ClientParams

Inline Side-by-side
Showing 6 changed files with 66 additions and 110 deletions
@@ -16,21 +16,17 @@ @@ -16,21 +16,17 @@
16 package org.thingsboard.server.controller; 16 package org.thingsboard.server.controller;
17 17
18 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
19 -import org.springframework.beans.factory.annotation.Autowired;  
20 import org.springframework.http.HttpStatus; 19 import org.springframework.http.HttpStatus;
21 import org.springframework.security.access.prepost.PreAuthorize; 20 import org.springframework.security.access.prepost.PreAuthorize;
22 import org.springframework.web.bind.annotation.*; 21 import org.springframework.web.bind.annotation.*;
23 -import org.thingsboard.server.common.data.Dashboard;  
24 import org.thingsboard.server.common.data.EntityType; 22 import org.thingsboard.server.common.data.EntityType;
25 import org.thingsboard.server.common.data.audit.ActionType; 23 import org.thingsboard.server.common.data.audit.ActionType;
26 import org.thingsboard.server.common.data.exception.ThingsboardException; 24 import org.thingsboard.server.common.data.exception.ThingsboardException;
27 -import org.thingsboard.server.common.data.id.DashboardId;  
28 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId; 25 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId;
29 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId; 26 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
30 import org.thingsboard.server.common.data.id.TenantId; 27 import org.thingsboard.server.common.data.id.TenantId;
31 import org.thingsboard.server.common.data.oauth2.*; 28 import org.thingsboard.server.common.data.oauth2.*;
32 import org.thingsboard.server.common.data.security.Authority; 29 import org.thingsboard.server.common.data.security.Authority;
33 -import org.thingsboard.server.dao.oauth2.OAuth2Service;  
34 import org.thingsboard.server.queue.util.TbCoreComponent; 30 import org.thingsboard.server.queue.util.TbCoreComponent;
35 import org.thingsboard.server.service.security.permission.Operation; 31 import org.thingsboard.server.service.security.permission.Operation;
36 import org.thingsboard.server.service.security.permission.Resource; 32 import org.thingsboard.server.service.security.permission.Resource;
@@ -61,14 +57,14 @@ public class OAuth2Controller extends BaseController { @@ -61,14 +57,14 @@ public class OAuth2Controller extends BaseController {
61 @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") 57 @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
62 @RequestMapping(value = "/oauth2/config", method = RequestMethod.GET, produces = "application/json") 58 @RequestMapping(value = "/oauth2/config", method = RequestMethod.GET, produces = "application/json")
63 @ResponseBody 59 @ResponseBody
64 - public OAuth2ClientsParams getCurrentClientsParams() throws ThingsboardException { 60 + public List<OAuth2ClientsDomainParams> getCurrentClientsParams() throws ThingsboardException {
65 try { 61 try {
66 Authority authority = getCurrentUser().getAuthority(); 62 Authority authority = getCurrentUser().getAuthority();
67 checkOAuth2ConfigPermissions(Operation.READ); 63 checkOAuth2ConfigPermissions(Operation.READ);
68 if (Authority.SYS_ADMIN.equals(authority)) { 64 if (Authority.SYS_ADMIN.equals(authority)) {
69 - return oAuth2Service.findClientsParamsByTenantId(TenantId.SYS_TENANT_ID); 65 + return oAuth2Service.findDomainsParamsByTenantId(TenantId.SYS_TENANT_ID);
70 } else if (Authority.TENANT_ADMIN.equals(authority)) { 66 } else if (Authority.TENANT_ADMIN.equals(authority)) {
71 - return oAuth2Service.findClientsParamsByTenantId(getCurrentUser().getTenantId()); 67 + return oAuth2Service.findDomainsParamsByTenantId(getCurrentUser().getTenantId());
72 } else { 68 } else {
73 throw new IllegalStateException("Authority " + authority + " cannot get client registrations."); 69 throw new IllegalStateException("Authority " + authority + " cannot get client registrations.");
74 } 70 }
@@ -80,7 +76,7 @@ public class OAuth2Controller extends BaseController { @@ -80,7 +76,7 @@ public class OAuth2Controller extends BaseController {
80 @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") 76 @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
81 @RequestMapping(value = "/oauth2/config", method = RequestMethod.POST) 77 @RequestMapping(value = "/oauth2/config", method = RequestMethod.POST)
82 @ResponseStatus(value = HttpStatus.OK) 78 @ResponseStatus(value = HttpStatus.OK)
83 - public OAuth2ClientsParams saveClientParams(@RequestBody OAuth2ClientsParams clientsParams) throws ThingsboardException { 79 + public List<OAuth2ClientsDomainParams> saveClientParams(@RequestBody List<OAuth2ClientsDomainParams> domainsParams) throws ThingsboardException {
84 try { 80 try {
85 TenantId tenantId; 81 TenantId tenantId;
86 Authority authority = getCurrentUser().getAuthority(); 82 Authority authority = getCurrentUser().getAuthority();
@@ -91,13 +87,13 @@ public class OAuth2Controller extends BaseController { @@ -91,13 +87,13 @@ public class OAuth2Controller extends BaseController {
91 } else { 87 } else {
92 throw new IllegalStateException("Authority " + authority + " cannot save client registrations."); 88 throw new IllegalStateException("Authority " + authority + " cannot save client registrations.");
93 } 89 }
94 - List<ClientRegistrationDto> clientRegistrationDtos = clientsParams.getOAuth2DomainDtos().stream() 90 + List<ClientRegistrationDto> clientRegistrationDtos = domainsParams.stream()
95 .flatMap(domainParams -> domainParams.getClientRegistrations().stream()) 91 .flatMap(domainParams -> domainParams.getClientRegistrations().stream())
96 .collect(Collectors.toList()); 92 .collect(Collectors.toList());
97 for (ClientRegistrationDto clientRegistrationDto : clientRegistrationDtos) { 93 for (ClientRegistrationDto clientRegistrationDto : clientRegistrationDtos) {
98 checkEntity(clientRegistrationDto.getId(), () -> tenantId, Resource.OAUTH2_CONFIGURATION); 94 checkEntity(clientRegistrationDto.getId(), () -> tenantId, Resource.OAUTH2_CONFIGURATION);
99 } 95 }
100 - return oAuth2Service.saveClientsParams(tenantId, clientsParams); 96 + return oAuth2Service.saveDomainsParams(tenantId, domainsParams);
101 } catch (Exception e) { 97 } catch (Exception e) {
102 throw handleException(e); 98 throw handleException(e);
103 } 99 }
@@ -19,7 +19,7 @@ import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId; @@ -19,7 +19,7 @@ import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId;
19 import org.thingsboard.server.common.data.id.TenantId; 19 import org.thingsboard.server.common.data.id.TenantId;
20 import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo; 20 import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo;
21 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration; 21 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration;
22 -import org.thingsboard.server.common.data.oauth2.OAuth2ClientsParams; 22 +import org.thingsboard.server.common.data.oauth2.OAuth2ClientsDomainParams;
23 23
24 import java.util.List; 24 import java.util.List;
25 import java.util.UUID; 25 import java.util.UUID;
@@ -27,9 +27,9 @@ import java.util.UUID; @@ -27,9 +27,9 @@ import java.util.UUID;
27 public interface OAuth2Service { 27 public interface OAuth2Service {
28 List<OAuth2ClientInfo> getOAuth2Clients(String domainName); 28 List<OAuth2ClientInfo> getOAuth2Clients(String domainName);
29 29
30 - OAuth2ClientsParams saveClientsParams(TenantId tenantId, OAuth2ClientsParams clientsParams); 30 + List<OAuth2ClientsDomainParams> saveDomainsParams(TenantId tenantId, List<OAuth2ClientsDomainParams> domainsParams);
31 31
32 - OAuth2ClientsParams findClientsParamsByTenantId(TenantId tenantId); 32 + List<OAuth2ClientsDomainParams> findDomainsParamsByTenantId(TenantId tenantId);
33 33
34 OAuth2ClientRegistration findClientRegistration(UUID id); 34 OAuth2ClientRegistration findClientRegistration(UUID id);
35 35
1 -/**  
2 - * Copyright © 2016-2020 The Thingsboard Authors  
3 - *  
4 - * Licensed under the Apache License, Version 2.0 (the "License");  
5 - * you may not use this file except in compliance with the License.  
6 - * You may obtain a copy of the License at  
7 - *  
8 - * http://www.apache.org/licenses/LICENSE-2.0  
9 - *  
10 - * Unless required by applicable law or agreed to in writing, software  
11 - * distributed under the License is distributed on an "AS IS" BASIS,  
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
13 - * See the License for the specific language governing permissions and  
14 - * limitations under the License.  
15 - */  
16 -package org.thingsboard.server.common.data.oauth2;  
17 -  
18 -import lombok.*;  
19 -import org.thingsboard.server.common.data.id.TenantId;  
20 -  
21 -import java.util.Collection;  
22 -import java.util.List;  
23 -import java.util.Objects;  
24 -  
25 -@EqualsAndHashCode  
26 -@Data  
27 -@ToString  
28 -@Builder(toBuilder = true)  
29 -@NoArgsConstructor  
30 -@AllArgsConstructor  
31 -public class OAuth2ClientsParams {  
32 - private List<OAuth2ClientsDomainParams> oAuth2DomainDtos;  
33 -}  
@@ -66,21 +66,21 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se @@ -66,21 +66,21 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
66 66
67 @Override 67 @Override
68 @Transactional 68 @Transactional
69 - public OAuth2ClientsParams saveClientsParams(TenantId tenantId, OAuth2ClientsParams clientsParams) {  
70 - log.trace("Executing saveClientsParams [{}] [{}]", tenantId, clientsParams);  
71 - clientParamsValidator.accept(tenantId, clientsParams);  
72 - List<OAuth2ClientRegistration> inputClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, clientsParams); 69 + public List<OAuth2ClientsDomainParams> saveDomainsParams(TenantId tenantId, List<OAuth2ClientsDomainParams> domainsParams) {
  70 + log.trace("Executing saveDomainsParams [{}] [{}]", tenantId, domainsParams);
  71 + clientParamsValidator.accept(tenantId, domainsParams);
  72 + List<OAuth2ClientRegistration> inputClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, domainsParams);
73 List<OAuth2ClientRegistration> savedClientRegistrations = inputClientRegistrations.stream() 73 List<OAuth2ClientRegistration> savedClientRegistrations = inputClientRegistrations.stream()
74 .map(clientRegistration -> clientRegistrationDao.save(clientRegistration.getTenantId(), clientRegistration)) 74 .map(clientRegistration -> clientRegistrationDao.save(clientRegistration.getTenantId(), clientRegistration))
75 .collect(Collectors.toList()); 75 .collect(Collectors.toList());
76 - return OAuth2Utils.toOAuth2ClientsParams(savedClientRegistrations); 76 + return OAuth2Utils.toDomainsParams(savedClientRegistrations);
77 } 77 }
78 78
79 @Override 79 @Override
80 - public OAuth2ClientsParams findClientsParamsByTenantId(TenantId tenantId) {  
81 - log.trace("Executing findClientsParamsByTenantId [{}]", tenantId); 80 + public List<OAuth2ClientsDomainParams> findDomainsParamsByTenantId(TenantId tenantId) {
  81 + log.trace("Executing findDomainsParamsByTenantId [{}]", tenantId);
82 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 82 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
83 - return OAuth2Utils.toOAuth2ClientsParams(clientRegistrationDao.findByTenantId(tenantId.getId())); 83 + return OAuth2Utils.toDomainsParams(clientRegistrationDao.findByTenantId(tenantId.getId()));
84 } 84 }
85 85
86 @Override 86 @Override
@@ -135,12 +135,11 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se @@ -135,12 +135,11 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
135 } 135 }
136 } 136 }
137 137
138 - private final BiConsumer<TenantId, OAuth2ClientsParams> clientParamsValidator = (tenantId, clientsParams) -> {  
139 - if (clientsParams == null || clientsParams.getOAuth2DomainDtos() == null  
140 - || clientsParams.getOAuth2DomainDtos().isEmpty()) { 138 + private final BiConsumer<TenantId, List<OAuth2ClientsDomainParams>> clientParamsValidator = (tenantId, domainsParams) -> {
  139 + if (domainsParams == null || domainsParams.isEmpty()) {
141 throw new DataValidationException("Domain params should be specified!"); 140 throw new DataValidationException("Domain params should be specified!");
142 } 141 }
143 - for (OAuth2ClientsDomainParams domainParams : clientsParams.getOAuth2DomainDtos()) { 142 + for (OAuth2ClientsDomainParams domainParams : domainsParams) {
144 if (StringUtils.isEmpty(domainParams.getDomainName())) { 143 if (StringUtils.isEmpty(domainParams.getDomainName())) {
145 throw new DataValidationException("Domain name should be specified!"); 144 throw new DataValidationException("Domain name should be specified!");
146 } 145 }
@@ -38,8 +38,8 @@ public class OAuth2Utils { @@ -38,8 +38,8 @@ public class OAuth2Utils {
38 return client; 38 return client;
39 } 39 }
40 40
41 - public static List<OAuth2ClientRegistration> toClientRegistrations(TenantId tenantId, OAuth2ClientsParams clientsParams) {  
42 - return clientsParams.getOAuth2DomainDtos().stream() 41 + public static List<OAuth2ClientRegistration> toClientRegistrations(TenantId tenantId, List<OAuth2ClientsDomainParams> domainsParams) {
  42 + return domainsParams.stream()
43 .flatMap(domainParams -> domainParams.getClientRegistrations().stream() 43 .flatMap(domainParams -> domainParams.getClientRegistrations().stream()
44 .map(clientRegistrationDto -> OAuth2Utils.toClientRegistration(tenantId, domainParams.getDomainName(), 44 .map(clientRegistrationDto -> OAuth2Utils.toClientRegistration(tenantId, domainParams.getDomainName(),
45 domainParams.getRedirectUriTemplate(), clientRegistrationDto) 45 domainParams.getRedirectUriTemplate(), clientRegistrationDto)
@@ -47,7 +47,7 @@ public class OAuth2Utils { @@ -47,7 +47,7 @@ public class OAuth2Utils {
47 .collect(Collectors.toList()); 47 .collect(Collectors.toList());
48 } 48 }
49 49
50 - public static OAuth2ClientsParams toOAuth2ClientsParams(List<OAuth2ClientRegistration> clientRegistrations) { 50 + public static List<OAuth2ClientsDomainParams> toDomainsParams(List<OAuth2ClientRegistration> clientRegistrations) {
51 Map<String, OAuth2ClientsDomainParams> domainParamsMap = new HashMap<>(); 51 Map<String, OAuth2ClientsDomainParams> domainParamsMap = new HashMap<>();
52 for (OAuth2ClientRegistration clientRegistration : clientRegistrations) { 52 for (OAuth2ClientRegistration clientRegistration : clientRegistrations) {
53 String domainName = clientRegistration.getDomainName(); 53 String domainName = clientRegistration.getDomainName();
@@ -57,7 +57,7 @@ public class OAuth2Utils { @@ -57,7 +57,7 @@ public class OAuth2Utils {
57 domainParams.getClientRegistrations() 57 domainParams.getClientRegistrations()
58 .add(toClientRegistrationDto(clientRegistration)); 58 .add(toClientRegistrationDto(clientRegistration));
59 } 59 }
60 - return new OAuth2ClientsParams(new ArrayList<>(domainParamsMap.values())); 60 + return new ArrayList<>(domainParamsMap.values());
61 } 61 }
62 62
63 public static ClientRegistrationDto toClientRegistrationDto(OAuth2ClientRegistration oAuth2ClientRegistration) { 63 public static ClientRegistrationDto toClientRegistrationDto(OAuth2ClientRegistration oAuth2ClientRegistration) {
@@ -15,27 +15,21 @@ @@ -15,27 +15,21 @@
15 */ 15 */
16 package org.thingsboard.server.dao.service; 16 package org.thingsboard.server.dao.service;
17 17
18 -import org.apache.commons.lang3.tuple.Pair;  
19 import org.junit.After; 18 import org.junit.After;
20 import org.junit.Assert; 19 import org.junit.Assert;
21 import org.junit.Before; 20 import org.junit.Before;
22 import org.junit.Test; 21 import org.junit.Test;
23 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
24 -import org.thingsboard.server.common.data.DataConstants;  
25 import org.thingsboard.server.common.data.Tenant; 23 import org.thingsboard.server.common.data.Tenant;
26 -import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId;  
27 import org.thingsboard.server.common.data.id.TenantId; 24 import org.thingsboard.server.common.data.id.TenantId;
28 import org.thingsboard.server.common.data.oauth2.*; 25 import org.thingsboard.server.common.data.oauth2.*;
29 import org.thingsboard.server.dao.attributes.AttributesService; 26 import org.thingsboard.server.dao.attributes.AttributesService;
30 -import org.thingsboard.server.dao.exception.DataValidationException;  
31 import org.thingsboard.server.dao.oauth2.OAuth2Service; 27 import org.thingsboard.server.dao.oauth2.OAuth2Service;
32 import org.thingsboard.server.dao.oauth2.OAuth2Utils; 28 import org.thingsboard.server.dao.oauth2.OAuth2Utils;
33 29
34 -import javax.transaction.Transactional;  
35 import java.io.IOException; 30 import java.io.IOException;
36 import java.util.*; 31 import java.util.*;
37 import java.util.stream.Collectors; 32 import java.util.stream.Collectors;
38 -import java.util.stream.Stream;  
39 33
40 import static org.thingsboard.server.dao.oauth2.OAuth2Utils.ALLOW_OAUTH2_CONFIGURATION; 34 import static org.thingsboard.server.dao.oauth2.OAuth2Utils.ALLOW_OAUTH2_CONFIGURATION;
41 import static org.thingsboard.server.dao.oauth2.OAuth2Utils.toClientRegistrations; 35 import static org.thingsboard.server.dao.oauth2.OAuth2Utils.toClientRegistrations;
@@ -91,10 +85,10 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -91,10 +85,10 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
91 @Test 85 @Test
92 public void testCreateNewSystemParams() { 86 public void testCreateNewSystemParams() {
93 OAuth2ClientRegistration clientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID); 87 OAuth2ClientRegistration clientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID);
94 - OAuth2ClientsParams savedClientsParams = oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(clientRegistration)));  
95 - Assert.assertNotNull(savedClientsParams); 88 + List<OAuth2ClientsDomainParams> savedDomainsParams = oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toDomainsParams(Collections.singletonList(clientRegistration)));
  89 + Assert.assertNotNull(savedDomainsParams);
96 90
97 - List<OAuth2ClientRegistration> savedClientRegistrations = OAuth2Utils.toClientRegistrations(TenantId.SYS_TENANT_ID, savedClientsParams); 91 + List<OAuth2ClientRegistration> savedClientRegistrations = OAuth2Utils.toClientRegistrations(TenantId.SYS_TENANT_ID, savedDomainsParams);
98 Assert.assertEquals(1, savedClientRegistrations.size()); 92 Assert.assertEquals(1, savedClientRegistrations.size());
99 93
100 OAuth2ClientRegistration savedClientRegistration = savedClientRegistrations.get(0); 94 OAuth2ClientRegistration savedClientRegistration = savedClientRegistrations.get(0);
@@ -107,13 +101,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -107,13 +101,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
107 @Test 101 @Test
108 public void testFindSystemParamsByTenant() { 102 public void testFindSystemParamsByTenant() {
109 OAuth2ClientRegistration clientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID); 103 OAuth2ClientRegistration clientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID);
110 - oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(clientRegistration))); 104 + oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toDomainsParams(Collections.singletonList(clientRegistration)));
111 105
112 - OAuth2ClientsParams foundClientsParams = oAuth2Service.findClientsParamsByTenantId(TenantId.SYS_TENANT_ID);  
113 - Assert.assertEquals(1, foundClientsParams.getOAuth2DomainDtos().size()); 106 + List<OAuth2ClientsDomainParams> foundDomainsParams = oAuth2Service.findDomainsParamsByTenantId(TenantId.SYS_TENANT_ID);
  107 + Assert.assertEquals(1, foundDomainsParams.size());
114 Assert.assertEquals(1, oAuth2Service.findAllClientRegistrations().size()); 108 Assert.assertEquals(1, oAuth2Service.findAllClientRegistrations().size());
115 109
116 - List<OAuth2ClientRegistration> foundClientRegistrations = OAuth2Utils.toClientRegistrations(TenantId.SYS_TENANT_ID, foundClientsParams); 110 + List<OAuth2ClientRegistration> foundClientRegistrations = OAuth2Utils.toClientRegistrations(TenantId.SYS_TENANT_ID, foundDomainsParams);
117 OAuth2ClientRegistration foundClientRegistration = foundClientRegistrations.get(0); 111 OAuth2ClientRegistration foundClientRegistration = foundClientRegistrations.get(0);
118 Assert.assertNotNull(foundClientRegistration); 112 Assert.assertNotNull(foundClientRegistration);
119 clientRegistration.setId(foundClientRegistration.getId()); 113 clientRegistration.setId(foundClientRegistration.getId());
@@ -124,10 +118,10 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -124,10 +118,10 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
124 @Test 118 @Test
125 public void testCreateNewTenantParams() { 119 public void testCreateNewTenantParams() {
126 OAuth2ClientRegistration clientRegistration = validClientRegistration(tenantId); 120 OAuth2ClientRegistration clientRegistration = validClientRegistration(tenantId);
127 - OAuth2ClientsParams savedClientsParams = oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(clientRegistration)));  
128 - Assert.assertNotNull(savedClientsParams); 121 + List<OAuth2ClientsDomainParams> savedDomainsParams = oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Collections.singletonList(clientRegistration)));
  122 + Assert.assertNotNull(savedDomainsParams);
129 123
130 - List<OAuth2ClientRegistration> savedClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, savedClientsParams); 124 + List<OAuth2ClientRegistration> savedClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, savedDomainsParams);
131 Assert.assertEquals(1, savedClientRegistrations.size()); 125 Assert.assertEquals(1, savedClientRegistrations.size());
132 126
133 OAuth2ClientRegistration savedClientRegistration = savedClientRegistrations.get(0); 127 OAuth2ClientRegistration savedClientRegistration = savedClientRegistrations.get(0);
@@ -142,13 +136,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -142,13 +136,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
142 @Test 136 @Test
143 public void testFindTenantParams() { 137 public void testFindTenantParams() {
144 OAuth2ClientRegistration clientRegistration = validClientRegistration(tenantId); 138 OAuth2ClientRegistration clientRegistration = validClientRegistration(tenantId);
145 - oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(clientRegistration))); 139 + oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Collections.singletonList(clientRegistration)));
146 140
147 - OAuth2ClientsParams foundClientsParams = oAuth2Service.findClientsParamsByTenantId(tenantId);  
148 - Assert.assertEquals(1, foundClientsParams.getOAuth2DomainDtos().size()); 141 + List<OAuth2ClientsDomainParams> foundDomainsParams = oAuth2Service.findDomainsParamsByTenantId(tenantId);
  142 + Assert.assertEquals(1, foundDomainsParams.size());
149 Assert.assertEquals(1, oAuth2Service.findAllClientRegistrations().size()); 143 Assert.assertEquals(1, oAuth2Service.findAllClientRegistrations().size());
150 144
151 - List<OAuth2ClientRegistration> foundClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, foundClientsParams); 145 + List<OAuth2ClientRegistration> foundClientRegistrations = OAuth2Utils.toClientRegistrations(tenantId, foundDomainsParams);
152 OAuth2ClientRegistration foundClientRegistration = foundClientRegistrations.get(0); 146 OAuth2ClientRegistration foundClientRegistration = foundClientRegistrations.get(0);
153 147
154 Assert.assertNotNull(foundClientRegistration); 148 Assert.assertNotNull(foundClientRegistration);
@@ -162,19 +156,19 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -162,19 +156,19 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
162 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId); 156 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId);
163 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID); 157 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID);
164 158
165 - OAuth2ClientsParams savedTenantClientsParams = oAuth2Service.saveClientsParams(tenantId,  
166 - OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(tenantClientRegistration)));  
167 - OAuth2ClientsParams savedSysAdminClientsParams = oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID,  
168 - OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(sysAdminClientRegistration))); 159 + List<OAuth2ClientsDomainParams> savedTenantDomainsParams = oAuth2Service.saveDomainsParams(tenantId,
  160 + OAuth2Utils.toDomainsParams(Collections.singletonList(tenantClientRegistration)));
  161 + List<OAuth2ClientsDomainParams> savedSysAdminDomainsParams = oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID,
  162 + OAuth2Utils.toDomainsParams(Collections.singletonList(sysAdminClientRegistration)));
169 163
170 Assert.assertEquals(2, oAuth2Service.findAllClientRegistrations().size()); 164 Assert.assertEquals(2, oAuth2Service.findAllClientRegistrations().size());
171 165
172 - Assert.assertEquals(savedTenantClientsParams, oAuth2Service.findClientsParamsByTenantId(tenantId));  
173 - Assert.assertEquals(savedSysAdminClientsParams, oAuth2Service.findClientsParamsByTenantId(TenantId.SYS_TENANT_ID)); 166 + Assert.assertEquals(savedTenantDomainsParams, oAuth2Service.findDomainsParamsByTenantId(tenantId));
  167 + Assert.assertEquals(savedSysAdminDomainsParams, oAuth2Service.findDomainsParamsByTenantId(TenantId.SYS_TENANT_ID));
174 168
175 - OAuth2ClientRegistration savedTenantClientRegistration = toClientRegistrations(tenantId, savedTenantClientsParams).get(0); 169 + OAuth2ClientRegistration savedTenantClientRegistration = toClientRegistrations(tenantId, savedTenantDomainsParams).get(0);
176 Assert.assertEquals(savedTenantClientRegistration, oAuth2Service.findClientRegistration(savedTenantClientRegistration.getUuidId())); 170 Assert.assertEquals(savedTenantClientRegistration, oAuth2Service.findClientRegistration(savedTenantClientRegistration.getUuidId()));
177 - OAuth2ClientRegistration savedSysAdminClientRegistration = toClientRegistrations(TenantId.SYS_TENANT_ID, savedSysAdminClientsParams).get(0); 171 + OAuth2ClientRegistration savedSysAdminClientRegistration = toClientRegistrations(TenantId.SYS_TENANT_ID, savedSysAdminDomainsParams).get(0);
178 Assert.assertEquals(savedSysAdminClientRegistration, oAuth2Service.findClientRegistration(savedSysAdminClientRegistration.getUuidId())); 172 Assert.assertEquals(savedSysAdminClientRegistration, oAuth2Service.findClientRegistration(savedSysAdminClientRegistration.getUuidId()));
179 } 173 }
180 174
@@ -184,8 +178,8 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -184,8 +178,8 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
184 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId, testDomainName); 178 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId, testDomainName);
185 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID, testDomainName); 179 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID, testDomainName);
186 180
187 - oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(tenantClientRegistration)));  
188 - oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(sysAdminClientRegistration))); 181 + oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Collections.singletonList(tenantClientRegistration)));
  182 + oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toDomainsParams(Collections.singletonList(sysAdminClientRegistration)));
189 183
190 List<OAuth2ClientInfo> oAuth2Clients = oAuth2Service.getOAuth2Clients(testDomainName); 184 List<OAuth2ClientInfo> oAuth2Clients = oAuth2Service.getOAuth2Clients(testDomainName);
191 185
@@ -201,8 +195,8 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -201,8 +195,8 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
201 String testDomainName = "test_domain"; 195 String testDomainName = "test_domain";
202 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId, testDomainName); 196 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId, testDomainName);
203 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID, testDomainName); 197 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID, testDomainName);
204 - oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(tenantClientRegistration)));  
205 - oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(sysAdminClientRegistration))); 198 + oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Collections.singletonList(tenantClientRegistration)));
  199 + oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toDomainsParams(Collections.singletonList(sysAdminClientRegistration)));
206 List<OAuth2ClientInfo> oAuth2Clients = oAuth2Service.getOAuth2Clients("random-domain"); 200 List<OAuth2ClientInfo> oAuth2Clients = oAuth2Service.getOAuth2Clients("random-domain");
207 Assert.assertTrue(oAuth2Clients.isEmpty()); 201 Assert.assertTrue(oAuth2Clients.isEmpty());
208 } 202 }
@@ -212,13 +206,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -212,13 +206,13 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
212 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId); 206 OAuth2ClientRegistration tenantClientRegistration = validClientRegistration(tenantId);
213 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID); 207 OAuth2ClientRegistration sysAdminClientRegistration = validClientRegistration(TenantId.SYS_TENANT_ID);
214 208
215 - OAuth2ClientsParams savedTenantClientsParams = oAuth2Service.saveClientsParams(tenantId,  
216 - OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(tenantClientRegistration)));  
217 - OAuth2ClientsParams savedSysAdminClientsParams = oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID,  
218 - OAuth2Utils.toOAuth2ClientsParams(Collections.singletonList(sysAdminClientRegistration))); 209 + List<OAuth2ClientsDomainParams> savedTenantDomainsParams = oAuth2Service.saveDomainsParams(tenantId,
  210 + OAuth2Utils.toDomainsParams(Collections.singletonList(tenantClientRegistration)));
  211 + List<OAuth2ClientsDomainParams> savedSysAdminDomainsParams = oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID,
  212 + OAuth2Utils.toDomainsParams(Collections.singletonList(sysAdminClientRegistration)));
219 213
220 - OAuth2ClientRegistration savedTenantRegistration = toClientRegistrations(tenantId, savedTenantClientsParams).get(0);  
221 - OAuth2ClientRegistration savedSysAdminRegistration = toClientRegistrations(TenantId.SYS_TENANT_ID, savedSysAdminClientsParams).get(0); 214 + OAuth2ClientRegistration savedTenantRegistration = toClientRegistrations(tenantId, savedTenantDomainsParams).get(0);
  215 + OAuth2ClientRegistration savedSysAdminRegistration = toClientRegistrations(TenantId.SYS_TENANT_ID, savedSysAdminDomainsParams).get(0);
222 216
223 oAuth2Service.deleteClientRegistrationById(tenantId, savedTenantRegistration.getId()); 217 oAuth2Service.deleteClientRegistrationById(tenantId, savedTenantRegistration.getId());
224 List<OAuth2ClientRegistration> foundRegistrations = oAuth2Service.findAllClientRegistrations(); 218 List<OAuth2ClientRegistration> foundRegistrations = oAuth2Service.findAllClientRegistrations();
@@ -228,39 +222,39 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest { @@ -228,39 +222,39 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
228 222
229 @Test 223 @Test
230 public void testDeleteTenantOAuth2ClientRegistrations() { 224 public void testDeleteTenantOAuth2ClientRegistrations() {
231 - oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Arrays.asList( 225 + oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Arrays.asList(
232 validClientRegistration(tenantId, "domain"), 226 validClientRegistration(tenantId, "domain"),
233 validClientRegistration(tenantId, "domain"), 227 validClientRegistration(tenantId, "domain"),
234 validClientRegistration(tenantId, "domain") 228 validClientRegistration(tenantId, "domain")
235 ))); 229 )));
236 Assert.assertEquals(3, oAuth2Service.findAllClientRegistrations().size()); 230 Assert.assertEquals(3, oAuth2Service.findAllClientRegistrations().size());
237 - Assert.assertEquals(1, oAuth2Service.findClientsParamsByTenantId(tenantId).getOAuth2DomainDtos().size()); 231 + Assert.assertEquals(1, oAuth2Service.findDomainsParamsByTenantId(tenantId).size());
238 232
239 oAuth2Service.deleteClientRegistrationsByTenantId(tenantId); 233 oAuth2Service.deleteClientRegistrationsByTenantId(tenantId);
240 Assert.assertEquals(0, oAuth2Service.findAllClientRegistrations().size()); 234 Assert.assertEquals(0, oAuth2Service.findAllClientRegistrations().size());
241 - Assert.assertEquals(0, oAuth2Service.findClientsParamsByTenantId(tenantId).getOAuth2DomainDtos().size()); 235 + Assert.assertEquals(0, oAuth2Service.findDomainsParamsByTenantId(tenantId).size());
242 } 236 }
243 237
244 @Test 238 @Test
245 public void testDeleteTenantDomainOAuth2ClientRegistrations() { 239 public void testDeleteTenantDomainOAuth2ClientRegistrations() {
246 - oAuth2Service.saveClientsParams(tenantId, OAuth2Utils.toOAuth2ClientsParams(Arrays.asList( 240 + oAuth2Service.saveDomainsParams(tenantId, OAuth2Utils.toDomainsParams(Arrays.asList(
247 validClientRegistration(tenantId, "domain1"), 241 validClientRegistration(tenantId, "domain1"),
248 validClientRegistration(tenantId, "domain1"), 242 validClientRegistration(tenantId, "domain1"),
249 validClientRegistration(tenantId, "domain2") 243 validClientRegistration(tenantId, "domain2")
250 ))); 244 )));
251 - oAuth2Service.saveClientsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toOAuth2ClientsParams(Arrays.asList( 245 + oAuth2Service.saveDomainsParams(TenantId.SYS_TENANT_ID, OAuth2Utils.toDomainsParams(Arrays.asList(
252 validClientRegistration(TenantId.SYS_TENANT_ID, "domain2") 246 validClientRegistration(TenantId.SYS_TENANT_ID, "domain2")
253 ))); 247 )));
254 Assert.assertEquals(4, oAuth2Service.findAllClientRegistrations().size()); 248 Assert.assertEquals(4, oAuth2Service.findAllClientRegistrations().size());
255 - OAuth2ClientsParams tenantClientsParams = oAuth2Service.findClientsParamsByTenantId(tenantId);  
256 - List<OAuth2ClientRegistration> tenantClientRegistrations = toClientRegistrations(tenantId, tenantClientsParams);  
257 - Assert.assertEquals(2, tenantClientsParams.getOAuth2DomainDtos().size()); 249 + List<OAuth2ClientsDomainParams> tenantDomainsParams = oAuth2Service.findDomainsParamsByTenantId(tenantId);
  250 + List<OAuth2ClientRegistration> tenantClientRegistrations = toClientRegistrations(tenantId, tenantDomainsParams);
  251 + Assert.assertEquals(2, tenantDomainsParams.size());
258 Assert.assertEquals(3, tenantClientRegistrations.size()); 252 Assert.assertEquals(3, tenantClientRegistrations.size());
259 253
260 oAuth2Service.deleteClientRegistrationsByDomain(tenantId, "domain1"); 254 oAuth2Service.deleteClientRegistrationsByDomain(tenantId, "domain1");
261 Assert.assertEquals(2, oAuth2Service.findAllClientRegistrations().size()); 255 Assert.assertEquals(2, oAuth2Service.findAllClientRegistrations().size());
262 - Assert.assertEquals(1, oAuth2Service.findClientsParamsByTenantId(tenantId).getOAuth2DomainDtos().size());  
263 - Assert.assertEquals(1, toClientRegistrations(tenantId, oAuth2Service.findClientsParamsByTenantId(tenantId)).size()); 256 + Assert.assertEquals(1, oAuth2Service.findDomainsParamsByTenantId(tenantId).size());
  257 + Assert.assertEquals(1, toClientRegistrations(tenantId, oAuth2Service.findDomainsParamsByTenantId(tenantId)).size());
264 } 258 }
265 259
266 private void updateTenantAllowOAuth2Setting(Boolean allowOAuth2) throws IOException { 260 private void updateTenantAllowOAuth2Setting(Boolean allowOAuth2) throws IOException {