Merge branch 'main' into feat/OTP-generation-mechanism

prs/prs-rest-server/src/main/resources/application.properties

@@ -2,3 +2,12 @@
 springdoc.api-docs.enabled=true
 springdoc.api-docs.path=/v3/api-docs
 springdoc.swagger-ui.path=/swagger-ui.html
+
+twilio.account.sid=${TWILIO_ACCOUNT_SID}
+twilio.auth.token=${TWILIO_AUTH_TOKEN}
+twilio.phone.number=${TWILIO_PHONE_NUMBER}
+otp.salt=${OTP_SALT}
+
+
+
+

prs/prs-service-impl/pom.xml

@@ -25,6 +25,13 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <!--- twillor -->
+        <dependency>
+            <groupId>com.twilio.sdk</groupId>
+            <artifactId>twilio</artifactId>
+            <version>10.6.4</version>
+        </dependency>
+
     </dependencies>
 
 </project>

prs/prs-service-impl/src/main/java/com/adorsys/webank/exceptions/FailedToSendOTPException.java

@@ -0,0 +1,7 @@
+package com.adorsys.webank.exceptions;
+
+public class FailedToSendOTPException extends RuntimeException {
+    public FailedToSendOTPException(String message) {
+        super(message);
+    }
+}

prs/prs-service-impl/src/main/java/com/adorsys/webank/serviceimpl/OtpServiceImpl.java

@@ -3,14 +3,43 @@
 import com.adorsys.webank.service.OtpServiceApi;
 import org.springframework.stereotype.Service;
 import com.adorsys.webank.exceptions.HashComputationException;
+import com.adorsys.webank.exceptions.FailedToSendOTPException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Base64;
+import com.twilio.Twilio;
+import com.twilio.rest.api.v2010.account.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import jakarta.annotation.PostConstruct;
+import com.twilio.type.PhoneNumber;
+
 
 @Service
 public class OtpServiceImpl implements OtpServiceApi {
+    private static final Logger logger = LoggerFactory.getLogger(OtpServiceImpl.class);
+
+    // Twilio credentials
+    @Value("${twilio.account.sid}")
+    private String accountSid;
+
+    @Value("${twilio.auth.token}")
+    private String authToken;
+
+    @Value("${twilio.phone.number}")
+    private String fromPhoneNumber;
+
+    @Value("${otp.salt}")
+    private String salt;
+
+    @PostConstruct
+    public void initTwilio() {
+        Twilio.init(accountSid, authToken); // Initialize Twilio once
+    }
+
 
     @Override
     public String generateOtp() {
@@ -20,16 +49,33 @@ public String generateOtp() {
     }
 
     @Override
-     public String sendOtp(String phoneNumber, String publicKey) {
-        String otp = generateOtp();
+    public String sendOtp(String phoneNumber, String publicKey) {
+        if (phoneNumber == null || !phoneNumber.matches("\\+?[1-9]\\d{1,14}")) {
+            logger.error("Invalid phone number format.");
+            throw new IllegalArgumentException("Invalid phone number format");
+        }
+
+        try {
 
-        String salt = "5";
+            String otp = generateOtp();
+            String otpHash = computeHash(otp, phoneNumber,publicKey, salt);
 
-        String otpHash = computeHash(otp, phoneNumber,publicKey, salt);
+            // Send OTP via Twilio
+            Message message = Message.creator(
+                    new PhoneNumber(phoneNumber),
+                    new PhoneNumber(fromPhoneNumber),
+                    "Your OTP is: " + otp
+            ).create();
 
-     return otpHash + ":" + otp;
-    }
+            logger.info("OTP sent successfully to {}. SID: {}", phoneNumber, message.getSid());
 
+            return otpHash;
+
+        } catch (Exception e) {
+            logger.error("Failed to send OTP: {}", e.getMessage());
+            throw new FailedToSendOTPException("Failed to send OTP");
+        }
+    }
 
     @Override
     public boolean validateOtp(String phoneNumber, String otp) {
@@ -51,4 +97,4 @@ public String computeHash(String otp, String phoneNumber, String publicKey, Stri
             throw new HashComputationException("Error computing hash");
         }
     }
-}
+}