diff --git a/keycloak/sms-provider/src/main/java/org/sunbird/sms/msg91/Msg91SmsProvider.java b/keycloak/sms-provider/src/main/java/org/sunbird/sms/msg91/Msg91SmsProvider.java index 50b8fa41..a3da6f5c 100644 --- a/keycloak/sms-provider/src/main/java/org/sunbird/sms/msg91/Msg91SmsProvider.java +++ b/keycloak/sms-provider/src/main/java/org/sunbird/sms/msg91/Msg91SmsProvider.java @@ -16,7 +16,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.jboss.logging.Logger; -import org.sunbird.keycloak.KeycloakSmsAuthenticatorUtil; import org.sunbird.sms.SMSConfigurationUtil; import org.sunbird.sms.SmsConfigurationConstants; import org.sunbird.sms.provider.ISmsProvider; @@ -82,9 +81,11 @@ private boolean sendSms(String mobileNumber, String smsText) { && !StringUtils.isNullOrEmpty(mobileNumber) && !StringUtils.isNullOrEmpty(authKey) && !StringUtils.isNullOrEmpty(country) && !StringUtils.isNullOrEmpty(smsText)) { + mobileNumber = removePlusFromMobileNumber(mobileNumber); + if (httpMethod.equals(HttpMethod.GET)) { logger.debug("Inside GET"); - path = getCompletePath(BASE_URL + GET_URL, sender, smsRoute, KeycloakSmsAuthenticatorUtil.setDefaultCountryCodeIfZero(mobileNumber), authKey, country, URLEncoder.encode(smsText, "UTF-8")); + path = getCompletePath(BASE_URL + GET_URL, sender, smsRoute, mobileNumber, authKey, country, URLEncoder.encode(smsText, "UTF-8")); logger.debug("Msg91SmsProvider -Executing request - " + path); @@ -162,6 +163,13 @@ private boolean sendSms(String mobileNumber, String smsText) { return false; } + private String removePlusFromMobileNumber(String mobileNumber) { + if (mobileNumber.startsWith("+")){ + return mobileNumber.substring(1); + } + return mobileNumber; + } + private String getCompletePath(String gateWayUrl, String sender, String smsRoute, String mobileNumber, String authKey, String country, String smsText) { String completeUrl = gateWayUrl + "sender=" + sender