Add endpointType to client certificate

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIProvider.java

@@ -802,7 +802,7 @@ String addBlockCondition(String conditionType, String conditionValue, boolean co
      * @throws APIManagementException API Management Exception.
      */
     int addClientCertificate(String userName, ApiTypeWrapper apiTypeWrapper, String certificate, String alias,
-                             String tierName, String organization) throws APIManagementException;
+                             String tierName, String endpointType, String organization) throws APIManagementException;
 
     /**
      * Method to remove the certificate which mapped to the given alias, endpoint from publisher and gateway nodes.
@@ -965,7 +965,7 @@ ClientCertificateDTO getClientCertificate(String alias, ApiTypeWrapper apiTypeWr
      * @throws APIManagementException API Management Exception.
      */
     int updateClientCertificate(String certificate, String alias, ApiTypeWrapper apiTypeWrapper, String tier,
-                                int tenantId, String organization) throws APIManagementException;
+                                String endpointType, int tenantId, String organization) throws APIManagementException;
 
     /**
      * Retrieve the certificate which matches the given alias.

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/dto/ClientCertificateDTO.java

@@ -28,8 +28,12 @@ public class ClientCertificateDTO {
     private String certificate;
     private String uniqueId;
     private String tierName;
+    private String endpointType;
     private APIIdentifier apiIdentifier;
 
+    public ClientCertificateDTO() {
+    }
+
     /**
      * To get the identifier of the API related with client certificate.
      *
@@ -65,6 +69,23 @@ public void setTierName(String tierName) {
         this.tierName = tierName;
     }
 
+    /**
+     * To get the endpoint type of the certificate.
+     * @return endpoint type.
+     */
+    public String getEndpointType() {
+        return endpointType;
+    }
+
+    /**
+     * To set the endpoint type for the current certificate.
+     *
+     * @param endpointType endpoint type (whether PRODUCTION or SANDBOX).
+     */
+    public void setEndpointType(String endpointType) {
+        this.endpointType = endpointType;
+    }
+
     /**
      * To get the alias of the certificate.
      *

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java

@@ -3907,14 +3907,15 @@ public int addCertificate(String userName, String certificate, String alias, Str
 
     @Override
     public int addClientCertificate(String userName, ApiTypeWrapper apiTypeWrapper, String certificate, String alias,
-                                    String tierName, String organization) throws APIManagementException {
+                                    String tierName, String endpointType, String organization)
+            throws APIManagementException {
         checkAccessControlPermission(userNameWithoutChange, apiTypeWrapper.getAccessControl(),
                 apiTypeWrapper.getAccessControlRoles());
         ResponseCode responseCode = ResponseCode.INTERNAL_SERVER_ERROR;
 
         int tenantId = APIUtil.getInternalOrganizationId(organization);
-        responseCode = certificateManager
-                .addClientCertificate(apiTypeWrapper.getId(), certificate, alias, tierName, tenantId, organization);
+        responseCode = certificateManager.addClientCertificate(apiTypeWrapper.getId(), certificate,
+                alias, tierName, endpointType, tenantId, organization);
         return responseCode.getResponseCode();
     }
 
@@ -4058,11 +4059,12 @@ public int updateCertificate(String certificateString, String alias) throws APIM
 
     @Override
     public int updateClientCertificate(String certificate, String alias, ApiTypeWrapper apiTypeWrapper,
-                                       String tier, int tenantId, String organization) throws APIManagementException {
+                                       String tier, String endpointType, int tenantId, String organization)
+            throws APIManagementException {
         checkAccessControlPermission(userNameWithoutChange, apiTypeWrapper.getAccessControl(),
                 apiTypeWrapper.getAccessControlRoles());
         ResponseCode responseCode = certificateManager
-                .updateClientCertificate(certificate, alias, tier, tenantId, organization);
+                .updateClientCertificate(certificate, alias, tier, endpointType, tenantId, organization);
         return responseCode != null ?
                 responseCode.getResponseCode() :
                 ResponseCode.INTERNAL_SERVER_ERROR.getResponseCode();

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/UserAwareAPIProvider.java

@@ -102,8 +102,9 @@ public SubscribedAPI getSubscriptionByUUID(String uuid) throws APIManagementExce
 
     @Override
     public int addClientCertificate(String userName, ApiTypeWrapper apiTypeWrapper, String certificate, String alias,
-                                    String tierName, String organization) throws APIManagementException {
-        return super.addClientCertificate(userName, apiTypeWrapper, certificate, alias, tierName, organization);
+                                    String tierName, String endpointType, String organization) throws APIManagementException {
+        return super.addClientCertificate(userName, apiTypeWrapper, certificate, alias, tierName, endpointType,
+                organization);
     }
 
     @Override
@@ -156,8 +157,10 @@ public int updateCertificate(String certificateString, String alias) throws APIM
 
     @Override
     public int updateClientCertificate(String certificate, String alias, ApiTypeWrapper apiIdentifier,
-                                       String tier, int tenantId, String organization) throws APIManagementException {
-        return super.updateClientCertificate(certificate, alias, apiIdentifier, tier, tenantId, organization);
+                                       String tier, String endpointType, int tenantId, String organization)
+            throws APIManagementException {
+        return super.updateClientCertificate(certificate, alias, apiIdentifier, tier, endpointType,
+                tenantId, organization);
     }
 
     @Override

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/certificatemgt/CertificateManager.java

@@ -182,7 +182,7 @@ public interface CertificateManager {
      * certificate is expired.
      */
     ResponseCode addClientCertificate(Identifier apiIdentifier, String certificate, String alias, String tierName,
-                                      int tenantId, String organization);
+                                      String endpointType, int tenantId, String organization);
 
     /**
      * Method to delete the client certificate from publisher node.
@@ -236,8 +236,8 @@ List<ClientCertificateDTO> searchClientCertificates(int tenantId, String alias,
      * @param organization : Organization
      * @return : true if update succeeds, false if fails
      */
-    ResponseCode updateClientCertificate(String certificate, String alias, String tier, int tenantId,
-            String organization) throws APIManagementException;
+    ResponseCode updateClientCertificate(String certificate, String alias, String tier, String endpointType,
+                                         int tenantId, String organization) throws APIManagementException;
 
     /**
      * To get the count of the client certificates updated for the particular tenant.

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/certificatemgt/CertificateManagerImpl.java

@@ -114,7 +114,7 @@ public ResponseCode addCertificateToParentNode(String certificate, String alias,
 
     @Override
     public ResponseCode addClientCertificate(Identifier apiIdentifier, String certificate, String alias,
-                                             String tierName, int tenantId, String organization) {
+                                             String tierName, String endpointType, int tenantId, String organization) {
 
         ResponseCode responseCode;
         try {
@@ -124,7 +124,8 @@ public ResponseCode addClientCertificate(Identifier apiIdentifier, String certif
                     responseCode = ResponseCode.ALIAS_EXISTS_IN_TRUST_STORE;
                 } else {
                     certificateMgtDAO
-                            .addClientCertificate(certificate, apiIdentifier, alias, tierName, tenantId, organization);
+                            .addClientCertificate(certificate, apiIdentifier, alias, tierName, endpointType,
+                                    tenantId, organization);
                 }
             }
         } catch (CertificateManagementException e) {
@@ -454,8 +455,8 @@ public ResponseCode updateCertificate(String certificate, String alias) throws A
     }
 
     @Override
-    public ResponseCode updateClientCertificate(String certificate, String alias, String tier, int tenantId,
-            String organization) throws APIManagementException {
+    public ResponseCode updateClientCertificate(String certificate, String alias, String tier, String endpointType,
+                                                int tenantId, String organization) throws APIManagementException {
 
         ResponseCode responseCode = ResponseCode.SUCCESS;
         if (StringUtils.isNotEmpty(certificate)) {
@@ -464,7 +465,7 @@ public ResponseCode updateClientCertificate(String certificate, String alias, St
         try {
             if (responseCode.getResponseCode() == ResponseCode.SUCCESS.getResponseCode()) {
                 boolean isSuccess = certificateMgtDAO
-                        .updateClientCertificate(certificate, alias, tier, tenantId, organization);
+                        .updateClientCertificate(certificate, alias, tier, endpointType, tenantId, organization);
                 if (isSuccess) {
                     responseCode = ResponseCode.SUCCESS;
                 } else {

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java

@@ -16990,6 +16990,7 @@ public void addAPIRevision(APIRevision apiRevision) throws APIManagementExceptio
                         clientCertificateDTO.setAlias(rs.getString(1));
                         clientCertificateDTO.setCertificate(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream(2)));
                         clientCertificateDTO.setTierName(rs.getString(3));
+                        clientCertificateDTO.setEndpointType(rs.getString(4));
                         clientCertificateDTOS.add(clientCertificateDTO);
                     }
                 }
@@ -17004,6 +17005,7 @@ public void addAPIRevision(APIRevision apiRevision) throws APIManagementExceptio
                     insertClientCertificateStatement.setBoolean(5, false);
                     insertClientCertificateStatement.setString(6, clientCertificateDTO.getTierName());
                     insertClientCertificateStatement.setString(7, apiRevision.getRevisionUUID());
+                    insertClientCertificateStatement.setString(8, clientCertificateDTO.getEndpointType());
                     insertClientCertificateStatement.addBatch();
                 }
                 insertClientCertificateStatement.executeBatch();
@@ -17908,6 +17910,7 @@ public void restoreAPIRevision(APIRevision apiRevision) throws APIManagementExce
                         clientCertificateDTO.setAlias(rs.getString(1));
                         clientCertificateDTO.setCertificate(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream(2)));
                         clientCertificateDTO.setTierName(rs.getString(3));
+                        clientCertificateDTO.setEndpointType(rs.getString(4));
                         clientCertificateDTOS.add(clientCertificateDTO);
                     }
                 }
@@ -17922,6 +17925,7 @@ public void restoreAPIRevision(APIRevision apiRevision) throws APIManagementExce
                     insertClientCertificateStatement.setBoolean(5, false);
                     insertClientCertificateStatement.setString(6, clientCertificateDTO.getTierName());
                     insertClientCertificateStatement.setString(7, "Current API");
+                    insertClientCertificateStatement.setString(8, clientCertificateDTO.getEndpointType());
                     insertClientCertificateStatement.addBatch();
                 }
                 insertClientCertificateStatement.executeBatch();
@@ -18222,6 +18226,7 @@ public void addAPIProductRevision(APIRevision apiRevision) throws APIManagementE
                         clientCertificateDTO.setAlias(rs.getString(1));
                         clientCertificateDTO.setCertificate(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream(2)));
                         clientCertificateDTO.setTierName(rs.getString(3));
+                        clientCertificateDTO.setEndpointType(rs.getString(4));
                         clientCertificateDTOS.add(clientCertificateDTO);
                     }
                 }
@@ -18236,6 +18241,7 @@ public void addAPIProductRevision(APIRevision apiRevision) throws APIManagementE
                     insertClientCertificateStatement.setBoolean(5, false);
                     insertClientCertificateStatement.setString(6, clientCertificateDTO.getTierName());
                     insertClientCertificateStatement.setString(7, apiRevision.getRevisionUUID());
+                    insertClientCertificateStatement.setString(8, clientCertificateDTO.getEndpointType());
                     insertClientCertificateStatement.addBatch();
                 }
                 insertClientCertificateStatement.executeBatch();
@@ -18458,6 +18464,7 @@ public void restoreAPIProductRevision(APIRevision apiRevision) throws APIManagem
                         clientCertificateDTO.setAlias(rs.getString(1));
                         clientCertificateDTO.setCertificate(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream(2)));
                         clientCertificateDTO.setTierName(rs.getString(3));
+                        clientCertificateDTO.setEndpointType(rs.getString(4));
                         clientCertificateDTOS.add(clientCertificateDTO);
                     }
                 }
@@ -18472,6 +18479,8 @@ public void restoreAPIProductRevision(APIRevision apiRevision) throws APIManagem
                     insertClientCertificateStatement.setBoolean(5, false);
                     insertClientCertificateStatement.setString(6, clientCertificateDTO.getTierName());
                     insertClientCertificateStatement.setString(7, "Current API");
+                    insertClientCertificateStatement.setString(8,
+                            clientCertificateDTO.getEndpointType());
                     insertClientCertificateStatement.addBatch();
                 }
                 insertClientCertificateStatement.executeBatch();

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/CertificateMgtDAO.java

@@ -73,7 +73,7 @@ public static CertificateMgtDAO getInstance() {
 
 
     private boolean addClientCertificate(Connection connection, String certificate, Identifier apiIdentifier,
-                                         String alias, String tierName,
+                                         String alias, String tierName, String endpointType,
                                          int tenantId, String organization) throws SQLException {
 
         boolean result;
@@ -87,6 +87,7 @@ private boolean addClientCertificate(Connection connection, String certificate,
             preparedStatement.setString(6, apiIdentifier.getVersion());
             preparedStatement.setString(7, organization);
             preparedStatement.setString(8, tierName);
+            preparedStatement.setString(9, endpointType);
             result = preparedStatement.executeUpdate() >= 1;
         }
         return result;
@@ -103,8 +104,8 @@ private boolean addClientCertificate(Connection connection, String certificate,
      * @return true if the update succeeds, unless false.
      * @throws CertificateManagementException Certificate Management Exception.
      */
-    public boolean updateClientCertificate(String certificate, String alias, String tier, int tenantId,
-            String organization) throws CertificateManagementException {
+    public boolean updateClientCertificate(String certificate, String alias, String tier, String endpointType,
+                                           int tenantId, String organization) throws CertificateManagementException {
 
         List<ClientCertificateDTO> clientCertificateDTOList = getClientCertificates(tenantId, alias, null,
                 organization);
@@ -124,13 +125,16 @@ public boolean updateClientCertificate(String certificate, String alias, String
         if (StringUtils.isNotEmpty(tier)) {
             clientCertificateDTO.setTierName(tier);
         }
+        if (StringUtils.isNotEmpty(tier)) {
+            clientCertificateDTO.setEndpointType(endpointType);
+        }
         try (Connection connection = APIMgtDBUtil.getConnection()) {
             try {
                 connection.setAutoCommit(false);
                 deleteClientCertificate(connection, null, alias, tenantId);
                 addClientCertificate(connection, clientCertificateDTO.getCertificate(),
                         clientCertificateDTO.getApiIdentifier(), alias, clientCertificateDTO.getTierName(),
-                        tenantId, organization);
+                        clientCertificateDTO.getEndpointType(), tenantId, organization);
                 connection.commit();
             } catch (SQLException e) {
                 handleConnectionRollBack(connection);
@@ -296,6 +300,7 @@ public List<ClientCertificateDTO> getClientCertificates(int tenantId, String ali
                 alias = resultSet.getString("ALIAS");
                 ClientCertificateDTO clientCertificateDTO = new ClientCertificateDTO();
                 clientCertificateDTO.setTierName(resultSet.getString("TIER_NAME"));
+                clientCertificateDTO.setEndpointType(resultSet.getString("ENDPOINT_TYPE"));
                 clientCertificateDTO.setAlias(alias);
                 clientCertificateDTO.setCertificate(
                         APIMgtDBUtil.getStringFromInputStream(resultSet.getBinaryStream("CERTIFICATE")));
@@ -742,19 +747,21 @@ private void handleException(String message, Throwable e) throws CertificateMana
      * @param certificate   : Client certificate that need to be added.
      * @param apiIdentifier : API which the client certificate is uploaded against.
      * @param alias         : Alias for the new certificate.
+     * @param endpointType  : Type of endpoint of the certificate
      * @param tenantId      : The Id of the tenant who uploaded the certificate.
      * @param organization  : Organization
      * @return : True if the information is added successfully, false otherwise.
      * @throws CertificateManagementException if existing entry is found for the given endpoint or alias.
      */
     public boolean addClientCertificate(String certificate, Identifier apiIdentifier, String alias, String tierName,
-                                        int tenantId, String organization) throws CertificateManagementException {
+                                        String endpointType, int tenantId, String organization)
+            throws CertificateManagementException {
 
         try (Connection connection = APIMgtDBUtil.getConnection()) {
             try {
                 connection.setAutoCommit(false);
                 boolean status = addClientCertificate(connection, certificate, apiIdentifier, alias, tierName,
-                        tenantId, organization);
+                        endpointType, tenantId, organization);
                 connection.commit();
                 return status;
             } catch (SQLException e) {