Merge pull request #514 from bhagyasakalanka/sms-provider

Modify SMS sender notification API to support config update without provider URL
wso2 · Oct 26, 2023 · e8d07a5 · e8d07a5
2 parents dc29a6f + 246be68
commit e8d07a5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 29 deletions.
diff --git a/...n/java/org/wso2/carbon/identity/api/server/notification/sender/v1/model/SMSSenderAdd.java b/...n/java/org/wso2/carbon/identity/api/server/notification/sender/v1/model/SMSSenderAdd.java
@@ -122,11 +122,9 @@ public SMSSenderAdd providerURL(String providerURL) {
         return this;
     }
 
-    @ApiModelProperty(example = "https://rest.nexmo.com/sms/json", required = true, value = "")
+    @ApiModelProperty(example = "https://rest.nexmo.com/sms/json", value = "")
     @JsonProperty("providerURL")
     @Valid
-    @NotNull(message = "Property providerURL cannot be null.")
-
     public String getProviderURL() {
         return providerURL;
     }

diff --git a/.../wso2/carbon/identity/api/server/notification/sender/v1/model/SMSSenderUpdateRequest.java b/.../wso2/carbon/identity/api/server/notification/sender/v1/model/SMSSenderUpdateRequest.java
@@ -48,13 +48,13 @@ public enum ContentTypeEnum {
 
         private String value;
 
-        ContentTypeEnum(String v) {
-            value = v;
-        }
+    ContentTypeEnum(String v) {
+        value = v;
+    }
 
-        public String value() {
-            return value;
-        }
+    public String value() {
+        return value;
+    }
 
         @Override
         public String toString() {
@@ -103,11 +103,9 @@ public SMSSenderUpdateRequest providerURL(String providerURL) {
         return this;
     }
 
-    @ApiModelProperty(example = "https://rest.nexmo.com/sms/json", required = true, value = "")
+    @ApiModelProperty(example = "https://rest.nexmo.com/sms/json", value = "")
     @JsonProperty("providerURL")
     @Valid
-    @NotNull(message = "Property providerURL cannot be null.")
-
     public String getProviderURL() {
         return providerURL;
     }

diff --git a/...on/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java b/...on/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java
@@ -81,9 +81,6 @@ public Response createEmailSender(EmailSenderAdd emailSenderAdd) {
     @Override
     public Response createSMSSender(SMSSenderAdd smSSenderAdd) {
 
-        if (StringUtils.equals(getTenantDomainFromContext(), MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-            return Response.status(Response.Status.METHOD_NOT_ALLOWED).build();
-        }
         SMSSender smsSender = notificationSenderManagementService.addSMSSender(smSSenderAdd);
         URI location = null;
         try {
@@ -112,9 +109,6 @@ public Response deleteEmailSender(String senderName) {
     @Override
     public Response deleteSMSSender(String senderName) {
 
-        if (StringUtils.equals(getTenantDomainFromContext(), MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-            return Response.status(Response.Status.METHOD_NOT_ALLOWED).build();
-        }
         notificationSenderManagementService.deleteNotificationSender(senderName);
         return Response.noContent().build();
     }
@@ -140,18 +134,12 @@ public Response getEmailSenders() {
     @Override
     public Response getSMSSender(String senderName) {
 
-        if (StringUtils.equals(getTenantDomainFromContext(), MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-            return Response.status(Response.Status.METHOD_NOT_ALLOWED).build();
-        }
         return Response.ok().entity(notificationSenderManagementService.getSMSSender(senderName)).build();
     }
 
     @Override
     public Response getSMSSenders() {
 
-        if (StringUtils.equals(getTenantDomainFromContext(), MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-            return Response.status(Response.Status.METHOD_NOT_ALLOWED).build();
-        }
         return Response.ok().entity(notificationSenderManagementService.getSMSSenders()).build();
     }
 
@@ -169,9 +157,6 @@ public Response updateEmailSender(String senderName, EmailSenderUpdateRequest em
     @Override
     public Response updateSMSSender(String senderName, SMSSenderUpdateRequest smSSenderUpdateRequest) {
 
-        if (StringUtils.equals(getTenantDomainFromContext(), MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-            return Response.status(Response.Status.METHOD_NOT_ALLOWED).build();
-        }
         return Response.ok()
                 .entity(notificationSenderManagementService.updateSMSSender(senderName, smSSenderUpdateRequest))
                 .build();

diff --git a/...on.identity.api.server.notification.sender.v1/src/main/resources/notification-sender.yaml b/...on.identity.api.server.notification.sender.v1/src/main/resources/notification-sender.yaml
@@ -656,7 +656,6 @@ components:
             $ref: '#/components/schemas/Properties'
     SMSSenderAdd:
       required:
-        - providerURL
         - provider
         - contentType
       type: object
@@ -793,7 +792,6 @@ components:
             $ref: '#/components/schemas/Properties'
     SMSSenderUpdateRequest:
       required:
-        - providerURL
         - provider
         - contentType
       type: object