Merge pull request #72 from ADORSYS-GIS/feat/prevent-duplicate-accounts

Feat/prevent duplicate accounts
ADORSYS-GIS · Feb 25, 2025 · 791cd74 · 791cd74
2 parents c319458 + 1716194
commit 791cd74
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 57 deletions.
diff --git a/prs/prs-rest-server/src/main/resources/application.properties b/prs/prs-rest-server/src/main/resources/application.properties
@@ -18,8 +18,3 @@ jwt.issuer=${JWT_ISSUER}
 jwt.expiration-time-ms=${JWT_EXPIRATION_TIME_MS}
 
 server.forward-headers-strategy=framework
-
-spring.redis.host=${SPRING_REDIS_HOST:localhost}
-spring.redis.port=${SPRING_REDIS_PORT:6379}
-spring.redis.password=${SPRING_REDIS_PASSWORD:your_password}
-spring.redis.timeout=${SPRING_REDIS_TIMEOUT:2000}
diff --git a/prs/prs-service-impl/pom.xml b/prs/prs-service-impl/pom.xml
@@ -68,16 +68,7 @@
             <artifactId>java-json-canonicalization</artifactId>
             <version>1.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-redis -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <version>3.4.2</version>
-        </dependency>
+
 
     </dependencies>
 

diff --git a/prs/prs-service-impl/src/main/java/com/adorsys/webank/config/RedisConfig.java b/prs/prs-service-impl/src/main/java/com/adorsys/webank/config/RedisConfig.java
diff --git a/prs/prs-service-impl/src/main/java/com/adorsys/webank/serviceimpl/OtpServiceImpl.java b/prs/prs-service-impl/src/main/java/com/adorsys/webank/serviceimpl/OtpServiceImpl.java
@@ -8,15 +8,12 @@
 import com.nimbusds.jose.jwk.ECKey;
 import com.nimbusds.jose.jwk.JWK;
 import com.twilio.Twilio;
-import com.twilio.rest.api.v2010.account.Message;
-import com.twilio.type.PhoneNumber;
 import jakarta.annotation.PostConstruct;
 import org.erdtman.jcs.JsonCanonicalizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.nio.charset.StandardCharsets;
@@ -51,7 +48,6 @@ public class OtpServiceImpl implements OtpServiceApi {
     private String SERVER_PUBLIC_KEY_JSON;
 
     @Autowired
-    private RedisTemplate<String, String> redisTemplate;
 
     @PostConstruct
     public void initTwilio() {
@@ -72,9 +68,6 @@ public String sendOtp(JWK devicePub, String phoneNumber) {
         }
 
         try {
-            // Check if the phone number exists in Redis cache
-            if (phoneNumber.length() != 11) {
-                log.info("Phone number {} not found in cache.", phoneNumber);
 
                 String otp = generateOtp();
                 log.info("OTP sent to phone number:{}", otp);
@@ -91,20 +84,16 @@ public String sendOtp(JWK devicePub, String phoneNumber) {
                 String otpHash = computeHash(input);
                 log.info("OTP hash:{}", otpHash);
 
-                // Send OTP via Twilio (if desired, uncomment this part)
-                // Message message = Message.creator(
-                //        new PhoneNumber(phoneNumber),
-                //        new PhoneNumber(fromPhoneNumber),
-                //        "Your OTP is: " + otp
-                // ).create();
+//                 Send OTP via Twilio (if desired, uncomment this part)
+//                 Message message = Message.creator(
+//                        new PhoneNumber(phoneNumber),
+//                        new PhoneNumber(fromPhoneNumber),
+//                        "Your OTP is: " + otp
+//                 ).create();
 
                 log.info("Message sent to phone number: {}", phoneNumber);
 
                 return otpHash;
-            } else {
-                log.warn("Phone number {} exists in the cache.", phoneNumber);
-                return "Phone number {} exists in the cache.";
-            }
 
         } catch (Exception e) {
             throw new FailedToSendOTPException("Failed to send OTP");