Stagging file to solve conflict

MonuChaudhary14 · MonuChaudhary14 · commit a3c00785e4b3 · 2025-10-11T16:16:40.000+05:30
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -3,7 +3,6 @@
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
-
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
     <property name="localeLanguage" value=""/>
@@ -12,8 +11,7 @@
     <module name="SuppressionFilter">
         <property name="file" value="config/checkstyle/suppressions.xml"/>
     </module>
-    <!--Add more checks from google style guide:-->
-    <!--https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml-->
+
     <module name="TreeWalker">
         <property name="tabWidth" value="2"/>
         <module name="PackageName">
@@ -24,7 +22,7 @@
             <property name="illegalClasses" value="java.util.logging.Logger"/>
         </module>
         <module name="RedundantImport"/>
-        <module name="AvoidStarImport"/>
+        <module name="AvoidStarImport"/> <!-- already blocks star imports -->
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>
@@ -33,10 +31,8 @@
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="WhitespaceAfter">
-        </module>
-        <module name="WhitespaceAround">
-        </module>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
 
         <module name="ModifierOrder"/>
         <module name="RedundantModifier"/>
@@ -55,37 +51,30 @@
         </module>
         <module name="NPathComplexity"/>
 
-
         <module name="ArrayTypeStyle"/>
         <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="2"/>
-            <property name="arrayInitIndent" value="2"/>
-            <property name="lineWrappingIndentation" value="2"/>
+            <property name="basicOffset" value="4"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="arrayInitIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
         </module>
 
         <module name="JavadocMethod">
             <property name="severity" value="ignore"/>
         </module>
-
         <module name="JavadocType">
             <property name="severity" value="ignore"/>
         </module>
-
         <module name="JavadocVariable">
             <property name="severity" value="ignore"/>
         </module>
-
     </module>
 
     <module name="LineLength">
         <property name="ignorePattern" value="^ *\* *@see.+$"/>
         <property name="max" value="136"/>
     </module>
 
-    <module name="NewlineAtEndOfFile">
-        <property name="lineSeparator" value="lf"/>
-    </module>
     <module name="FileTabCharacter"/>
-</module>
+</module>
diff --git a/pom.xml b/pom.xml
@@ -74,6 +74,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+            <version>4.0.0-M3</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/org/spacehub/configuration/SecurityConfiguration.java b/src/main/java/org/spacehub/configuration/SecurityConfiguration.java
@@ -29,7 +29,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
     http
       .csrf(AbstractHttpConfigurer::disable)
       .authorizeHttpRequests(auth -> auth
-        .requestMatchers("/api/v1/registration/**").permitAll()
+        .requestMatchers("/api/v1/**").permitAll()
         .anyRequest().authenticated()
       )
       .httpBasic(AbstractHttpConfigurer::disable)
diff --git a/src/main/java/org/spacehub/controller/UserController.java b/src/main/java/org/spacehub/controller/UserController.java
@@ -1,22 +1,29 @@
 package org.spacehub.controller;
 
 import org.spacehub.entities.User;
-import org.spacehub.service.VerificationService;
 import org.spacehub.entities.RegistrationRequest;
+import org.spacehub.service.OTPService;
+import org.spacehub.service.VerificationService;
 import org.spacehub.service.RegistrationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping(path = "api/v1/registration")
+@RequestMapping(path = "api/v1")
 public class UserController {
 
   private final VerificationService verificationService;
   private final RegistrationService registrationService;
 
+  @Autowired
+  private OTPService otpService;
+
   public UserController(VerificationService verificationService, RegistrationService registrationService) {
     this.verificationService = verificationService;
     this.registrationService = registrationService;
@@ -29,7 +36,7 @@ public ResponseEntity<String> login(@RequestBody User user) {
     return ResponseEntity.ok(token);
   }
 
-  @PostMapping
+  @PostMapping("/registration")
   public ResponseEntity<String> register(@RequestBody RegistrationRequest request) {
     try {
       String result = registrationService.register(request);
@@ -40,4 +47,24 @@ public ResponseEntity<String> register(@RequestBody RegistrationRequest request)
       return ResponseEntity.internalServerError().body("Registration failed");
     }
   }
+
+  @GetMapping("/sendotp")
+  public ResponseEntity<String> sendOTP(@RequestParam(required = false) String email) {
+    try {
+      otpService.sendOTP(email);
+      return ResponseEntity.ok("OTP sent successfully to " + (email != null ? email : "default email"));
+    } catch (Exception e) {
+      return ResponseEntity.status(500).body("Error sending OTP: " + e.getMessage());
+    }
+  }
+
+  @GetMapping("/validateotp")
+  public ResponseEntity<String> validateOTP(@RequestParam String otp) {
+    boolean valid = otpService.validateOTP(otp);
+    if (valid) {
+      return ResponseEntity.ok("OTP is valid");
+    } else {
+      return ResponseEntity.status(400).body("OTP is invalid or expired");
+    }
+  }
 }
diff --git a/src/main/java/org/spacehub/service/OTPService.java b/src/main/java/org/spacehub/service/OTPService.java
@@ -0,0 +1,64 @@
+package org.spacehub.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.util.Random;
+
+@Service
+public class OTPService {
+
+    @Autowired
+    private JavaMailSender mailSender;
+
+    private final String DEFAULT_EMAIL = "monuchaudharypoonia@gmail.com";
+
+    private String prev_OTP;
+    private Instant send_Time;
+
+    public void sendOTP(String email) {
+        if (email == null || email.isEmpty()) {
+            email = DEFAULT_EMAIL;
+        }
+
+        int num = new Random().nextInt(1000000);
+        String otp = String.format("%06d", num);
+
+        this.prev_OTP = otp;
+        this.send_Time = Instant.now();
+
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setFrom(DEFAULT_EMAIL);
+        message.setTo(email);
+        message.setSubject("OTP Verification");
+        message.setText("Your OTP is: " + otp);
+
+        mailSender.send(message);
+    }
+
+    public boolean validateOTP(String otp) {
+        if (prev_OTP == null || send_Time == null) {
+            return false;
+        }
+
+        long timeTakenMillis = Instant.now().toEpochMilli() - send_Time.toEpochMilli();
+
+        if (timeTakenMillis > 3000000) {
+            this.prev_OTP = null;
+            this.send_Time = null;
+            return false;
+        }
+
+        boolean isValid = prev_OTP.equals(otp);
+
+        if (isValid) {
+            this.prev_OTP = null;
+            this.send_Time = null;
+        }
+
+        return isValid;
+    }
+}
diff --git a/src/main/java/org/spacehub/service/RegistrationService.java b/src/main/java/org/spacehub/service/RegistrationService.java
@@ -19,13 +19,16 @@ public class RegistrationService {
   private final EmailValidator emailValidator;
   private final UserRepository userRepository;
   private final ConfirmationTokenService confirmationTokenService;
+  private final OTPService otpService;
 
-  public RegistrationService(PasswordEncoder passwordEncoder, EmailValidator emailValidator, UserRepository userRepository,
-                             ConfirmationTokenService confirmationTokenService) {
+  public RegistrationService(PasswordEncoder passwordEncoder, EmailValidator emailValidator,
+                             UserRepository userRepository, ConfirmationTokenService confirmationTokenService,
+                             OTPService otpService) {
     this.passwordEncoder = passwordEncoder;
     this.emailValidator = emailValidator;
     this.userRepository = userRepository;
     this.confirmationTokenService = confirmationTokenService;
+    this.otpService = otpService;
   }
 
   @Transactional
@@ -54,6 +57,8 @@ public String register(RegistrationRequest request) {
       newUser
     );
     confirmationTokenService.saveConfirmationToken(confirmationToken);
+
+    otpService.sendOTP(newUser.getEmail());
     return token;
   }
 }
diff --git a/src/main/java/org/spacehub/service/UserNameService.java b/src/main/java/org/spacehub/service/UserNameService.java
@@ -17,67 +17,69 @@
 @Service
 public class UserNameService {
 
-  private static final Logger logger = LoggerFactory.getLogger(UserNameService.class);
+    private static final Logger logger = LoggerFactory.getLogger(UserNameService.class);
 
-  // Base64-encoded secret key
-  private static final String SECRET_KEY = "7de8e1761eeac40efc9314980ebd00fbd55978f497b50ffee42902bba14d0596";
+    private static final String SECRET_KEY = "7de8e1761eeac40efc9314980ebd00fbd55978f497b50ffee42902bba14d0596";
 
-  private SecretKey getSigningKey() {
-    byte[] keyBytes = Base64.getDecoder().decode(SECRET_KEY);
-    return Keys.hmacShaKeyFor(keyBytes);
-  }
+    private SecretKey getSigningKey() {
+        byte[] keyBytes = Base64.getDecoder().decode(SECRET_KEY);
+        return Keys.hmacShaKeyFor(keyBytes);
+    }
+
+    public String generateToken(UserDetails userDetails) {
+        return generateToken(Map.of(), userDetails);
+    }
+
+    public String generateToken(Map<String, Object> extraClaims, UserDetails userDetails) {
+        SecretKey key = getSigningKey();
+        long nowMillis = System.currentTimeMillis();
+        long expMillis = nowMillis + 1000L * 60 * 60 * 24;
+        Map<String, Object> payload = Map.of(
+            "username", userDetails.getUsername(),
+            "iat", nowMillis / 1000,
+            "exp", expMillis / 1000
+        );
+
+        if (extraClaims != null && !extraClaims.isEmpty()) {
+            payload = new java.util.HashMap<>(payload);
+            payload.putAll(extraClaims);
+        }
 
-  public String generateToken(UserDetails userDetails) {
-    return generateToken(Map.of(), userDetails);
-  }
+        return Jwts.builder()
+            .setHeaderParam("typ", "JWT")
+            .setClaims(payload)
+            .signWith(key)
+            .compact();
+    }
 
-  public String generateToken(Map<String, Object> extraClaims, UserDetails userDetails) {
-    SecretKey key = getSigningKey();
-    long nowMillis = System.currentTimeMillis();
-    long expMillis = nowMillis + 1000L * 60 * 60 * 24;
-    Map<String, Object> payload = Map.of(
-      "username", userDetails.getUsername(),
-      "iat", nowMillis / 1000,
-      "exp", expMillis / 1000
-    );
-    if (extraClaims != null && !extraClaims.isEmpty()) {
-      payload = new java.util.HashMap<>(payload);
-      payload.putAll(extraClaims);
+    public String extractUsername(String token) {
+        return extractClaim(token, Claims::getSubject);
     }
-    return Jwts.builder()
-      .setHeaderParam("typ", "JWT")
-      .setClaims(payload)
-      .signWith(key)
-      .compact();
-  }
-  public String extractUsername(String token) {
-    return extractClaim(token, Claims::getSubject);
-  }
 
-  public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
-    try {
-      Claims claims = (Claims) Jwts.parser()
-        .setSigningKey(getSigningKey());
-      return claimsResolver.apply(claims);
-    } catch (Exception e) {
-      logger.warn("Failed to extract claim from token: {}", e.getMessage());
-      return null;
+    public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
+        try {
+            Claims claims = (Claims) Jwts.parser()
+                .setSigningKey(getSigningKey());
+            return claimsResolver.apply(claims);
+        }
+        catch (Exception e) {
+            logger.warn("Failed to extract claim from token: {}", e.getMessage());
+            return null;
+        }
     }
-  }
 
-  public boolean isTokenValid(String token, UserDetails userDetails) {
-    final String username = extractUsername(token);
-    return username != null && username.equals(userDetails.getUsername()) && !isTokenExpired(token);
-  }
+    public boolean isTokenValid(String token, UserDetails userDetails) {
+        final String username = extractUsername(token);
+        return username != null && username.equals(userDetails.getUsername()) && !isTokenExpired(token);
+    }
 
-  private boolean isTokenExpired(String token) {
-    Date expiration = extractClaim(token, Claims::getExpiration);
-    return expiration == null || expiration.before(new Date());
-  }
+    private boolean isTokenExpired(String token) {
+        Date expiration = extractClaim(token, Claims::getExpiration);
+        return expiration == null || expiration.before(new Date());
+    }
 
-  public boolean validToken(String token, UserDetails userDetails) {
-    final String username = extractUsername(token);
-    return username != null && username.equals(userDetails.getUsername());
-  }
+    public boolean validToken(String token, UserDetails userDetails) {
+        final String username = extractUsername(token);
+        return username != null && username.equals(userDetails.getUsername());
+    }
 }
-
diff --git a/src/main/java/org/spacehub/service/VerificationService.java b/src/main/java/org/spacehub/service/VerificationService.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti`
`29`	`29`	`http`
`30`	`30`	`.csrf(AbstractHttpConfigurer::disable)`
`31`	`31`	`.authorizeHttpRequests(auth -> auth`
`32`		`- .requestMatchers("/api/v1/registration/**").permitAll()`
	`32`	`+ .requestMatchers("/api/v1/**").permitAll()`
`33`	`33`	`.anyRequest().authenticated()`
`34`	`34`	`)`
`35`	`35`	`.httpBasic(AbstractHttpConfigurer::disable)`