简柏林 / thingskit · Commits

Commit e2791a289b8f4af35cbeb97c43e1095072e4cdda

Authored by vzikratyi
1 parent ea9d18e3

Removed EntityId for OAuth2Config

Inline Side-by-side
Showing 8 changed files with 14 additions and 42 deletions
@@ -431,9 +431,6 @@ public abstract class BaseController { @@ -431,9 +431,6 @@ public abstract class BaseController {
431 case WIDGET_TYPE: 431 case WIDGET_TYPE:
432 checkWidgetTypeId(new WidgetTypeId(entityId.getId()), operation); 432 checkWidgetTypeId(new WidgetTypeId(entityId.getId()), operation);
433 return; 433 return;
434 - case OAUTH2_CLIENT_REGISTRATION_INFO:  
435 - case OAUTH2_CLIENT_REGISTRATION_TEMPLATE:  
436 - return;  
437 default: 434 default:
438 throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType()); 435 throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType());
439 } 436 }
@@ -25,6 +25,8 @@ import org.thingsboard.server.common.data.exception.ThingsboardException; @@ -25,6 +25,8 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
25 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId; 25 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
26 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate; 26 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
27 import org.thingsboard.server.queue.util.TbCoreComponent; 27 import org.thingsboard.server.queue.util.TbCoreComponent;
  28 +import org.thingsboard.server.service.security.permission.Operation;
  29 +import org.thingsboard.server.service.security.permission.Resource;
28 30
29 import java.util.List; 31 import java.util.List;
30 32
@@ -40,6 +42,7 @@ public class OAuth2ConfigTemplateController extends BaseController { @@ -40,6 +42,7 @@ public class OAuth2ConfigTemplateController extends BaseController {
40 @ResponseStatus(value = HttpStatus.OK) 42 @ResponseStatus(value = HttpStatus.OK)
41 public OAuth2ClientRegistrationTemplate saveClientRegistrationTemplate(@RequestBody OAuth2ClientRegistrationTemplate clientRegistrationTemplate) throws ThingsboardException { 43 public OAuth2ClientRegistrationTemplate saveClientRegistrationTemplate(@RequestBody OAuth2ClientRegistrationTemplate clientRegistrationTemplate) throws ThingsboardException {
42 try { 44 try {
  45 + accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_TEMPLATE, Operation.WRITE);
43 return oAuth2ConfigTemplateService.saveClientRegistrationTemplate(clientRegistrationTemplate); 46 return oAuth2ConfigTemplateService.saveClientRegistrationTemplate(clientRegistrationTemplate);
44 } catch (Exception e) { 47 } catch (Exception e) {
45 throw handleException(e); 48 throw handleException(e);
@@ -52,21 +55,10 @@ public class OAuth2ConfigTemplateController extends BaseController { @@ -52,21 +55,10 @@ public class OAuth2ConfigTemplateController extends BaseController {
52 public void deleteClientRegistrationTemplate(@PathVariable(CLIENT_REGISTRATION_TEMPLATE_ID) String strClientRegistrationTemplateId) throws ThingsboardException { 55 public void deleteClientRegistrationTemplate(@PathVariable(CLIENT_REGISTRATION_TEMPLATE_ID) String strClientRegistrationTemplateId) throws ThingsboardException {
53 checkParameter(CLIENT_REGISTRATION_TEMPLATE_ID, strClientRegistrationTemplateId); 56 checkParameter(CLIENT_REGISTRATION_TEMPLATE_ID, strClientRegistrationTemplateId);
54 try { 57 try {
  58 + accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_TEMPLATE, Operation.DELETE);
55 OAuth2ClientRegistrationTemplateId clientRegistrationTemplateId = new OAuth2ClientRegistrationTemplateId(toUUID(strClientRegistrationTemplateId)); 59 OAuth2ClientRegistrationTemplateId clientRegistrationTemplateId = new OAuth2ClientRegistrationTemplateId(toUUID(strClientRegistrationTemplateId));
56 oAuth2ConfigTemplateService.deleteClientRegistrationTemplateById(clientRegistrationTemplateId); 60 oAuth2ConfigTemplateService.deleteClientRegistrationTemplateById(clientRegistrationTemplateId);
57 -  
58 - logEntityAction(clientRegistrationTemplateId,  
59 - null,  
60 - null,  
61 - ActionType.DELETED, null, strClientRegistrationTemplateId);  
62 -  
63 } catch (Exception e) { 61 } catch (Exception e) {
64 -  
65 - logEntityAction(emptyId(EntityType.OAUTH2_CLIENT_REGISTRATION_TEMPLATE),  
66 - null,  
67 - null,  
68 - ActionType.DELETED, e, strClientRegistrationTemplateId);  
69 -  
70 throw handleException(e); 62 throw handleException(e);
71 } 63 }
72 } 64 }
@@ -76,6 +68,7 @@ public class OAuth2ConfigTemplateController extends BaseController { @@ -76,6 +68,7 @@ public class OAuth2ConfigTemplateController extends BaseController {
76 @ResponseBody 68 @ResponseBody
77 public List<OAuth2ClientRegistrationTemplate> getClientRegistrationTemplates() throws ThingsboardException { 69 public List<OAuth2ClientRegistrationTemplate> getClientRegistrationTemplates() throws ThingsboardException {
78 try { 70 try {
  71 + accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_TEMPLATE, Operation.READ);
79 return oAuth2ConfigTemplateService.findAllClientRegistrationTemplates(); 72 return oAuth2ConfigTemplateService.findAllClientRegistrationTemplates();
80 } catch (Exception e) { 73 } catch (Exception e) {
81 throw handleException(e); 74 throw handleException(e);
@@ -24,6 +24,8 @@ import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo; @@ -24,6 +24,8 @@ import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo;
24 import org.thingsboard.server.common.data.oauth2.OAuth2ClientsParams; 24 import org.thingsboard.server.common.data.oauth2.OAuth2ClientsParams;
25 import org.thingsboard.server.common.data.oauth2.SchemeType; 25 import org.thingsboard.server.common.data.oauth2.SchemeType;
26 import org.thingsboard.server.queue.util.TbCoreComponent; 26 import org.thingsboard.server.queue.util.TbCoreComponent;
  27 +import org.thingsboard.server.service.security.permission.Operation;
  28 +import org.thingsboard.server.service.security.permission.Resource;
27 import org.thingsboard.server.utils.MiscUtils; 29 import org.thingsboard.server.utils.MiscUtils;
28 30
29 import javax.servlet.http.HttpServletRequest; 31 import javax.servlet.http.HttpServletRequest;
@@ -49,6 +51,7 @@ public class OAuth2Controller extends BaseController { @@ -49,6 +51,7 @@ public class OAuth2Controller extends BaseController {
49 @ResponseBody 51 @ResponseBody
50 public OAuth2ClientsParams getCurrentOAuth2Params() throws ThingsboardException { 52 public OAuth2ClientsParams getCurrentOAuth2Params() throws ThingsboardException {
51 try { 53 try {
  54 + accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_INFO, Operation.READ);
52 return oAuth2Service.findOAuth2Params(); 55 return oAuth2Service.findOAuth2Params();
53 } catch (Exception e) { 56 } catch (Exception e) {
54 throw handleException(e); 57 throw handleException(e);
@@ -60,6 +63,7 @@ public class OAuth2Controller extends BaseController { @@ -60,6 +63,7 @@ public class OAuth2Controller extends BaseController {
60 @ResponseStatus(value = HttpStatus.OK) 63 @ResponseStatus(value = HttpStatus.OK)
61 public OAuth2ClientsParams saveOAuth2Params(@RequestBody OAuth2ClientsParams oauth2Params) throws ThingsboardException { 64 public OAuth2ClientsParams saveOAuth2Params(@RequestBody OAuth2ClientsParams oauth2Params) throws ThingsboardException {
62 try { 65 try {
  66 + accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_INFO, Operation.WRITE);
63 oAuth2Service.saveOAuth2Params(oauth2Params); 67 oAuth2Service.saveOAuth2Params(oauth2Params);
64 return oAuth2Service.findOAuth2Params(); 68 return oAuth2Service.findOAuth2Params();
65 } catch (Exception e) { 69 } catch (Exception e) {
@@ -32,8 +32,8 @@ public enum Resource { @@ -32,8 +32,8 @@ public enum Resource {
32 USER(EntityType.USER), 32 USER(EntityType.USER),
33 WIDGETS_BUNDLE(EntityType.WIDGETS_BUNDLE), 33 WIDGETS_BUNDLE(EntityType.WIDGETS_BUNDLE),
34 WIDGET_TYPE(EntityType.WIDGET_TYPE), 34 WIDGET_TYPE(EntityType.WIDGET_TYPE),
35 - OAUTH2_CONFIGURATION_INFO(EntityType.OAUTH2_CLIENT_REGISTRATION_INFO),  
36 - OAUTH2_CONFIGURATION_TEMPLATE(EntityType.OAUTH2_CLIENT_REGISTRATION_TEMPLATE), 35 + OAUTH2_CONFIGURATION_INFO(),
  36 + OAUTH2_CONFIGURATION_TEMPLATE(),
37 TENANT_PROFILE(EntityType.TENANT_PROFILE), 37 TENANT_PROFILE(EntityType.TENANT_PROFILE),
38 DEVICE_PROFILE(EntityType.DEVICE_PROFILE); 38 DEVICE_PROFILE(EntityType.DEVICE_PROFILE);
39 39
@@ -62,10 +62,6 @@ public class EntityIdFactory { @@ -62,10 +62,6 @@ public class EntityIdFactory {
62 return new WidgetsBundleId(uuid); 62 return new WidgetsBundleId(uuid);
63 case WIDGET_TYPE: 63 case WIDGET_TYPE:
64 return new WidgetTypeId(uuid); 64 return new WidgetTypeId(uuid);
65 - case OAUTH2_CLIENT_REGISTRATION_INFO:  
66 - return new OAuth2ClientRegistrationInfoId(uuid);  
67 - case OAUTH2_CLIENT_REGISTRATION_TEMPLATE:  
68 - return new OAuth2ClientRegistrationTemplateId(uuid);  
69 case DEVICE_PROFILE: 65 case DEVICE_PROFILE:
70 return new DeviceProfileId(uuid); 66 return new DeviceProfileId(uuid);
71 case TENANT_PROFILE: 67 case TENANT_PROFILE:
@@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id; @@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id;
17 17
18 import com.fasterxml.jackson.annotation.JsonCreator; 18 import com.fasterxml.jackson.annotation.JsonCreator;
19 import com.fasterxml.jackson.annotation.JsonProperty; 19 import com.fasterxml.jackson.annotation.JsonProperty;
20 -import org.thingsboard.server.common.data.EntityType;  
21 20
22 import java.util.UUID; 21 import java.util.UUID;
23 22
24 -public class OAuth2ClientRegistrationId extends UUIDBased implements EntityId { 23 +public class OAuth2ClientRegistrationId extends UUIDBased {
25 24
26 @JsonCreator 25 @JsonCreator
27 public OAuth2ClientRegistrationId(@JsonProperty("id") UUID id) { 26 public OAuth2ClientRegistrationId(@JsonProperty("id") UUID id) {
@@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationId extends UUIDBased implements EntityId { @@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationId extends UUIDBased implements EntityId {
31 public static OAuth2ClientRegistrationId fromString(String clientRegistrationId) { 30 public static OAuth2ClientRegistrationId fromString(String clientRegistrationId) {
32 return new OAuth2ClientRegistrationId(UUID.fromString(clientRegistrationId)); 31 return new OAuth2ClientRegistrationId(UUID.fromString(clientRegistrationId));
33 } 32 }
34 -  
35 - @Override  
36 - public EntityType getEntityType() {  
37 - return EntityType.OAUTH2_CLIENT_REGISTRATION;  
38 - }  
39 } 33 }
@@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id; @@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id;
17 17
18 import com.fasterxml.jackson.annotation.JsonCreator; 18 import com.fasterxml.jackson.annotation.JsonCreator;
19 import com.fasterxml.jackson.annotation.JsonProperty; 19 import com.fasterxml.jackson.annotation.JsonProperty;
20 -import org.thingsboard.server.common.data.EntityType;  
21 20
22 import java.util.UUID; 21 import java.util.UUID;
23 22
24 -public class OAuth2ClientRegistrationInfoId extends UUIDBased implements EntityId { 23 +public class OAuth2ClientRegistrationInfoId extends UUIDBased {
25 24
26 @JsonCreator 25 @JsonCreator
27 public OAuth2ClientRegistrationInfoId(@JsonProperty("id") UUID id) { 26 public OAuth2ClientRegistrationInfoId(@JsonProperty("id") UUID id) {
@@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationInfoId extends UUIDBased implements EntityI @@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationInfoId extends UUIDBased implements EntityI
31 public static OAuth2ClientRegistrationInfoId fromString(String clientRegistrationInfoId) { 30 public static OAuth2ClientRegistrationInfoId fromString(String clientRegistrationInfoId) {
32 return new OAuth2ClientRegistrationInfoId(UUID.fromString(clientRegistrationInfoId)); 31 return new OAuth2ClientRegistrationInfoId(UUID.fromString(clientRegistrationInfoId));
33 } 32 }
34 -  
35 - @Override  
36 - public EntityType getEntityType() {  
37 - return EntityType.OAUTH2_CLIENT_REGISTRATION_INFO;  
38 - }  
39 } 33 }
@@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id; @@ -17,11 +17,10 @@ package org.thingsboard.server.common.data.id;
17 17
18 import com.fasterxml.jackson.annotation.JsonCreator; 18 import com.fasterxml.jackson.annotation.JsonCreator;
19 import com.fasterxml.jackson.annotation.JsonProperty; 19 import com.fasterxml.jackson.annotation.JsonProperty;
20 -import org.thingsboard.server.common.data.EntityType;  
21 20
22 import java.util.UUID; 21 import java.util.UUID;
23 22
24 -public class OAuth2ClientRegistrationTemplateId extends UUIDBased implements EntityId { 23 +public class OAuth2ClientRegistrationTemplateId extends UUIDBased {
25 24
26 @JsonCreator 25 @JsonCreator
27 public OAuth2ClientRegistrationTemplateId(@JsonProperty("id") UUID id) { 26 public OAuth2ClientRegistrationTemplateId(@JsonProperty("id") UUID id) {
@@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationTemplateId extends UUIDBased implements Ent @@ -31,9 +30,4 @@ public class OAuth2ClientRegistrationTemplateId extends UUIDBased implements Ent
31 public static OAuth2ClientRegistrationTemplateId fromString(String clientRegistrationTemplateId) { 30 public static OAuth2ClientRegistrationTemplateId fromString(String clientRegistrationTemplateId) {
32 return new OAuth2ClientRegistrationTemplateId(UUID.fromString(clientRegistrationTemplateId)); 31 return new OAuth2ClientRegistrationTemplateId(UUID.fromString(clientRegistrationTemplateId));
33 } 32 }
34 -  
35 - @Override  
36 - public EntityType getEntityType() {  
37 - return EntityType.OAUTH2_CLIENT_REGISTRATION_TEMPLATE;  
38 - }  
39 } 33 }