Removed deprecated functions

Author: somiljain2006

.idea/misc.xml

@@ -3,6 +3,7 @@
         "-//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=""/>
@@ -11,7 +12,8 @@
     <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">
@@ -22,7 +24,7 @@
             <property name="illegalClasses" value="java.util.logging.Logger"/>
         </module>
         <module name="RedundantImport"/>
-        <module name="AvoidStarImport"/> <!-- already blocks star imports -->
+        <module name="AvoidStarImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>
@@ -31,8 +33,10 @@
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
+        <module name="WhitespaceAfter">
+        </module>
+        <module name="WhitespaceAround">
+        </module>
 
         <module name="ModifierOrder"/>
         <module name="RedundantModifier"/>
@@ -51,30 +55,37 @@
         </module>
         <module name="NPathComplexity"/>
 
+
         <module name="ArrayTypeStyle"/>
         <module name="Indentation">
-            <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"/>
+            <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"/>
         </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>

config/checkstyle/checkstyle.xml

@@ -8,8 +8,8 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class RegistrationRequest {
-    private String firstName;
-    private String lastName;
-    private String email;
-    private String password;
+  private String firstName;
+  private String lastName;
+  private String email;
+  private String password;
 }

src/main/java/org/spacehub/entities/RegistrationRequest.java

@@ -1,10 +1,8 @@
 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.HashMap;
 import java.util.Map;
@@ -13,51 +11,57 @@
 @Service
 public class OTPService {
 
-    @Autowired
-    private JavaMailSender mailSender;
+  private final JavaMailSender mailSender;
 
-    private final String DEFAULT_EMAIL = "[email protected]";
-    private final Map<String, String> otpMap = new HashMap<>();
-    private final Map<String, Instant> sendTimeMap = new HashMap<>();
+  private final Map<String, String> otpMap = new HashMap<>();
+  private final Map<String, Instant> sendTimeMap = new HashMap<>();
 
-    private static final int expirySeconds = 300;
-    private static final int cooldownSeconds = 60;
+  private static final int expirySeconds = 300;
+  private static final int cooldownSeconds = 60;
 
-    public void sendOTP(String email) {
-        if (email == null || email.isEmpty()) {
-            email = DEFAULT_EMAIL;
-        }
+  public OTPService(JavaMailSender mailSender) {
+    this.mailSender = mailSender;
+  }
 
-        int num = new Random().nextInt(1000000);
-        String otp = String.format("%06d", num);
+  public void sendOTP(String email) {
+    String DEFAULT_EMAIL = "[email protected]";
+    if (email == null || email.isEmpty()) {
+      email = DEFAULT_EMAIL;
+    }
 
-        otpMap.put(email, otp);
-        sendTimeMap.put(email, Instant.now());
+    int num = new Random().nextInt(1000000);
+    String otp = String.format("%06d", num);
 
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setFrom(DEFAULT_EMAIL);
-        message.setTo(email);
-        message.setSubject("OTP Verification");
-        message.setText("Your OTP is: " + otp);
+    otpMap.put(email, otp);
+    sendTimeMap.put(email, Instant.now());
 
-        mailSender.send(message);
-    }
+    SimpleMailMessage message = new SimpleMailMessage();
+    message.setFrom(DEFAULT_EMAIL);
+    message.setTo(email);
+    message.setSubject("OTP Verification");
+    message.setText("Your OTP is: " + otp);
 
-    public boolean validateOTP(String otp) {
-        return otpMap.containsValue(otp);
-    }
+    mailSender.send(message);
+  }
 
-    public boolean canSendOTP(String email) {
-        Instant lastSent = sendTimeMap.get(email);
-        if (lastSent == null) return true;
-        return Instant.now().isAfter(lastSent.plusSeconds(cooldownSeconds));
-    }
+  public boolean validateOTP(String otp) {
+    return otpMap.containsValue(otp);
+  }
 
+  public boolean canSendOTP(String email) {
+    Instant lastSent = sendTimeMap.get(email);
+    if (lastSent == null) {
+      return true;
+    }
+    return Instant.now().isAfter(lastSent.plusSeconds(cooldownSeconds));
+  }
 
-    public long cooldownTime(String email) {
-        Instant lastSent = sendTimeMap.get(email);
-        if (lastSent == null) return 0;
-        long diff = Instant.now().getEpochSecond() - lastSent.getEpochSecond();
-        return Math.max(0, cooldownSeconds - diff);
+  public long cooldownTime(String email) {
+    Instant lastSent = sendTimeMap.get(email);
+    if (lastSent == null) {
+      return 0;
     }
+    long diff = Instant.now().getEpochSecond() - lastSent.getEpochSecond();
+    return Math.max(0, cooldownSeconds - diff);
+  }
 }

src/main/java/org/spacehub/service/OTPService.java

@@ -3,83 +3,57 @@
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
-
 import javax.crypto.SecretKey;
-import java.util.Base64;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
-import java.util.Map;
 import java.util.function.Function;
 
 @Service
 public class UserNameService {
 
-    private static final Logger logger = LoggerFactory.getLogger(UserNameService.class);
-
-    private static final String SECRET_KEY = "7de8e1761eeac40efc9314980ebd00fbd55978f497b50ffee42902bba14d0596";
-
-    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);
-        }
-
-        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 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());
-    }
-
-    public boolean validToken(String token, UserDetails userDetails) {
-        final String username = extractUsername(token);
-        return username != null && username.equals(userDetails.getUsername());
-    }
+  private static final String SECRET_KEY = "7de8e1761eeac40efc9314980ebd00fbd55978f497b50ffee42902bba14d0596";
+
+  private SecretKey getSigningKey() {
+    byte[] keyBytes = SECRET_KEY.getBytes(StandardCharsets.UTF_8);
+    return Keys.hmacShaKeyFor(keyBytes);
+  }
+
+  public String generateToken(UserDetails userDetails) {
+
+    long nowMillis = System.currentTimeMillis();
+    long expMillis = nowMillis + 1000L * 60 * 60 * 24; // 24h
+
+    return Jwts.builder()
+      .claim("sub", userDetails.getUsername())
+      .claim("iat", nowMillis / 1000L)
+      .claim("exp", expMillis / 1000L)
+      .signWith(getSigningKey())
+      .compact();
+
+  }
+
+  public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
+    Claims claims = Jwts.parser()
+      .verifyWith(getSigningKey())
+      .build()
+      .parseSignedClaims(token)
+      .getPayload();
+    return claimsResolver.apply(claims);
+  }
+
+  public String extractUsername(String token) {
+    return extractClaim(token, Claims::getSubject);
+  }
+
+  public boolean validToken(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.before(new Date());
+  }
 }

src/main/java/org/spacehub/service/UserNameService.java

@@ -1,19 +1,18 @@
-spring.datasource.url=${SPRING_DATASOURCE_URL}
-spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
-spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.username=somiljain
+spring.datasource.password=password
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.database=postgresql
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-server.address=0.0.0.0
-server.port=8080
+spring.jpa.database=postgresql
+server.port=3000
 
 spring.mail.host=smtp.gmail.com
 spring.mail.port=587
-spring.mail.username=${SPRING_EMAIL}
-spring.mail.password=${SPRING_EMAIL_PASSWORD}
+spring.mail.username=[email protected]
+spring.mail.password=ltnmoqbpmkmdhhtd
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true