RIFFMASTER: BACKEND: add logging in (JWT is being returned)

Backend/Spring/.idea/workspace.xml

@@ -218,7 +218,7 @@
       <workItem from="1686986592460" duration="4445000" />
       <workItem from="1687000973157" duration="670000" />
       <workItem from="1687006511411" duration="604000" />
-      <workItem from="1687011079341" duration="13416000" />
+      <workItem from="1687011079341" duration="14329000" />
     </task>
     <task id="LOCAL-00001" summary="add basic hello world and transfering data to server">
       <created>1679575346987</created>

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/AuthController.java

@@ -58,7 +58,7 @@ public class AuthController {
 
 
 
-    @PostMapping("/riffmaster/login")
+    @PostMapping("/old/login")
     @ResponseBody
     public ResponseEntity<?> login(@RequestBody LoginRequest loginRequest) {
 

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/SecurityController.java

@@ -100,7 +100,11 @@ public class SecurityController {
     @RequestMapping(value = "riffmaster/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> Login(@Valid @RequestBody LoginDto loginDto)
     {
-        Optional<AppUser> user = Optional.ofNullable(this.userService.findByLogin(loginDto.getUsername()));
+        System.out.println("in login endpoint loginDto: " + loginDto.getLogin() + "\n" + loginDto.getPassword());
+
+        Optional<AppUser> user = Optional.ofNullable(this.userService.findByLogin(loginDto.getLogin()));
+
+
 
         if (user.isEmpty())
         {

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/LoginDto.java

@@ -1,23 +1,23 @@
 package pl.dmcs.jwoszczyk.domain;
 
 public class LoginDto {
-    String username;
+    String login;
     String password;
 
-    public LoginDto(String username, String password) {
-        this.username = username;
+    public LoginDto(String login, String password) {
+        this.login = login;
         this.password = password;
     }
 
     public LoginDto() {
     }
 
-    public String getUsername() {
-        return username;
+    public String getLogin() {
+        return login;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setLogin(String login) {
+        this.login = login;
     }
 
     public String getPassword() {

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/AppUserService.java

@@ -58,6 +58,11 @@ public class AppUserService implements IAppUserService{
 
     @org.springframework.transaction.annotation.Transactional
     public AppUser findByLogin(String login) {
+        System.out.println("in userService: login: " + login);
+        System.out.println("        repo returned: " + appUserRepository.findByLogin(login).getLogin());
+        System.out.println("        repo returned: " + appUserRepository.findByLogin(login).getAppUserRole());
+        System.out.println("        repo returned: " + appUserRepository.findByLogin(login).getEmail());
+        System.out.println("        repo returned: " + appUserRepository.findByLogin(login).getPassword());
         return appUserRepository.findByLogin(login);
     }
 

Frontend/RiffMasterFront/.idea/workspace.xml

@@ -6,22 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="d91bc08d-d968-4797-8fb3-ef602a37db2a" name="Changes" comment="RIFFMASTER: add frontend business logic (riff, song)">
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/AuthController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/AuthController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/SecurityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/controller/SecurityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/AppUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/AppUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/AppUserRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/AppUserRole.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/domain/LoginEntity.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/repository/IAppUserRoleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/repository/IAppUserRoleRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/JwtTokenUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/JwtTokenUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/AppUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/AppUserRoleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/IAppUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/IAppUserRoleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/MyAppUserDetailsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/MyAppUserDetailsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/webapp/appUserRole.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/webapp/appUserRole.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/AppUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/AppUserService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/controller/SecurityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/controller/SecurityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/LoginEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/security/JwtTokenUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/security/JwtTokenUtil.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/controller/SecurityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/controller/SecurityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/LoginEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/security/JwtTokenUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/security/JwtTokenUtil.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />