Service for getting user data by username and readme updated.

Author: herilmuratovic

README.md

@@ -5,7 +5,7 @@ Spring Boot project with demonstration of OTP authentication technique.
 
 ## Running the project
 
-1. Create database with name **test**
+1. Create database with name **otp**
 2. Open terminal and navigate to your project
 3. Type command **mvn install**
 4. Type command **mvn spring-boot:run**
@@ -34,12 +34,13 @@ Response: `{ id_token: "token_hash" }`
 
 1. Generate OTP and send it to e-mail <br>
 Route: /api/otp/generate <br>
-Method: GET <br><br>
+Method: POST <br><br>
+Empty request body in this case.
 
 2. Validate OTP <br>
 Route: /api/otp/validate <br>
 Method: POST <br>
-Example Payload: { "otp": "your otp number" }
+Example Request Payload: { "otp": "your otp number" }
 <br>
 
 

src/main/java/com/starter/springboot/services/OtpService.java

@@ -17,16 +17,19 @@ public class OtpService {
 
     private OtpGenerator otpGenerator;
     private EmailService emailService;
+    private UserService userService;
 
     /**
      * Constructor dependency injector
      * @param otpGenerator - otpGenerator dependency
      * @param emailService - email service dependency
+     * @param userService - user service dependency
      */
-    public OtpService(OtpGenerator otpGenerator, EmailService emailService)
+    public OtpService(OtpGenerator otpGenerator, EmailService emailService, UserService userService)
     {
         this.otpGenerator = otpGenerator;
         this.emailService = emailService;
+        this.userService = userService;
     }
 
     /**
@@ -48,7 +51,7 @@ public Boolean generateOtp(String key)
         LOGGER.info("Generated OTP: {}", otpValue);
 
         // fetch user e-mail from database
-        String userEmail = "[email protected]";
+        String userEmail = userService.findEmailByUsername(key);
         List<String> recipients = new ArrayList<>();
         recipients.add(userEmail);
 

src/main/java/com/starter/springboot/services/UserService.java

@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class UserService {
@@ -22,4 +23,18 @@ public List<User> findAllUsers() {
         return this.userRepository.findAll();
     }
 
+    /**
+     * Method for getting e-mail by username (key)
+     *
+     * @param username - provided username
+     * @return e-mail
+     */
+    public String findEmailByUsername(String username)
+    {
+        Optional<User> user = userRepository.findByUsername(username);
+        if (user.isPresent()) {
+            return user.get().getEmail();
+        }
+        return null;
+    }
 }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
         restart:
             enabled: true
     datasource:
-        url: jdbc:mysql://localhost/test?useUnicode=true&characterEncoding=utf8&useSSL=false
+        url: jdbc:mysql://localhost/otp?useUnicode=true&characterEncoding=utf8&useSSL=false
         name:
         username: root
         password: root

src/main/resources/liquibase/seeds/user.csv

@@ -1,2 +1,2 @@
 "id";"first_name";"last_name";"username";"email";"password";"enabled";"last_password_reset_date"
-"1";"Administrator";"";"admin";"admin@admin.com";"$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC";true;NULL
+"1";"Administrator";"";"admin";"heril.muratovic@logate.com";"$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC";true;NULL