RIFFMASTER: BACKEND: add fetching ROLES from DB on register (USER by default)

Backend/Spring/.idea/workspace.xml

@@ -10,21 +10,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8315de53-8c15-472c-a710-45938463dc02" name="Changes" comment="RIFFMASTER: add frontend files">
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/0.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/0.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/12.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/12.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/13.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/13.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/15.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/15.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/2.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/2.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -232,7 +218,7 @@
       <workItem from="1686986592460" duration="4445000" />
       <workItem from="1687000973157" duration="670000" />
       <workItem from="1687006511411" duration="604000" />
-      <workItem from="1687011079341" duration="7518000" />
+      <workItem from="1687011079341" duration="13416000" />
     </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/SecurityController.java

@@ -11,32 +11,39 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import pl.dmcs.jwoszczyk.domain.AppUser;
 import pl.dmcs.jwoszczyk.domain.AppUserRole;
-import pl.dmcs.jwoszczyk.domain.LoginEntity;
+import pl.dmcs.jwoszczyk.domain.LoginDto;
 import pl.dmcs.jwoszczyk.security.JwtTokenUtil;
 import pl.dmcs.jwoszczyk.security.ValidationErrorResponse;
+import pl.dmcs.jwoszczyk.service.IAppUserRoleService;
 import pl.dmcs.jwoszczyk.service.IAppUserService;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
 @CrossOrigin(origins = "http://localhost:4200")
 public class SecurityController {
+
+    //##############################################################_DEPENDENCY INJECTION
     private IAppUserService userService;
+    private IAppUserRoleService userRoleService;
     @Autowired
     private PasswordEncoder passwordEncoder;
 
-    public SecurityController(IAppUserService userService) {
+
+    public SecurityController(IAppUserService userService, IAppUserRoleService userRoleService) {
         this.userService = userService;
+        this.userRoleService = userRoleService;
     }
 
+
+//########################################################################################################################_REGISTER
+
     @RequestMapping(value = "/register", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> Register(@Valid @RequestBody AppUser user, BindingResult bindingResult)
     {
-        // validation check
+        // --------------------------------------------------------------------------------- validation check
+
         if (bindingResult.hasErrors()) {
             List<String> errors = bindingResult.getAllErrors()
                                                 .stream()
@@ -49,7 +56,9 @@ public class SecurityController {
 
             return ResponseEntity.badRequest().body(errorResponse);
         }
-        // duplication check
+
+        // --------------------------------------------------------------------------------- duplication check
+
         boolean usernameUnique = this.userService.isUsernameUnique(user.getLogin());
         boolean emailUnique = this.userService.isEmailUnique(user.getEmail());
 
@@ -64,10 +73,21 @@ public class SecurityController {
 
             return ResponseEntity.badRequest().body(errorResponse);
         }
+        // --------------------------------------------------------------------------------- creating account
 
         String hashedPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(hashedPassword);
 
+        Set<AppUserRole> userRoles = new HashSet<>();
+        userRoles.add(userRoleService.getAppUserRoleByRoleName("ROLE_USER"));
+        user.setAppUserRole(userRoles);
+
+        System.out.println("\n\ncreating account\n" +
+                           "userRoleService.getAppUserRoleByRoleName(\"USER\") = " + userRoleService.getAppUserRoleByRoleName("ROLE_USER").getRoleName() +
+                           "\nuserRoles (set) = " + userRoles.stream().findFirst() + "\n\n"
+                            );
+
+
         this.userService.registerUser(user);
 
         return ResponseEntity
@@ -75,10 +95,12 @@ public class SecurityController {
                 .body("{\"message\": \"Request is valid\"}");
     }
 
-    @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> Login(@Valid @RequestBody LoginEntity loginEntity)
+//########################################################################################################################_LOGIN
+
+    @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(loginEntity.getUsername()));
+        Optional<AppUser> user = Optional.ofNullable(this.userService.findByLogin(loginDto.getUsername()));
 
         if (user.isEmpty())
         {
@@ -92,25 +114,27 @@ public class SecurityController {
         }
         else
         {
-            if (passwordEncoder.matches(loginEntity.getPassword(), user.get().getPassword()))
+            if (passwordEncoder.matches(loginDto.getPassword(), user.get().getPassword()))
             {
                 System.out.println("Login successful");
-                String jwtToken = JwtTokenUtil.generateToken(
-                        user.get().getLogin(),
-                        user.get().getAppUserRoleStringArray()
-                );
-                System.out.println(jwtToken);
 
-//                return ResponseEntity.ok()
-//                        .header("Authorization", "Bearer " + jwtToken)
-//                        .body("Request is valid");
+                // Get the role names as a HashSet of strings
+                Set<String> roleNames = user.get().getAppUserRole().stream()
+                        .map(AppUserRole::getRoleName)
+                        .collect(Collectors.toSet());
+
+                String jwtToken = JwtTokenUtil.generateToken(user.get().getLogin(), roleNames);
+
+                System.out.println(jwtToken);
 
                 return ResponseEntity
                         .status(HttpStatus.OK)
                         .header("Authorization", "Bearer " + jwtToken)
                         .body("{\"message\": \"Request is valid\"," +
                                 "\"Authorization\": \"Bearer " + jwtToken + "\"}");
-            } else {
+            }
+            else
+            {
                 ValidationErrorResponse errorResponse = new ValidationErrorResponse();
                 errorResponse.setMessage("Login Error");
                 List<String> errors = new ArrayList<>();

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

@@ -9,7 +9,6 @@ import jakarta.validation.constraints.Size;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 @Entity
@@ -106,7 +105,7 @@ public class AppUser {
         Set<AppUserRole> appUserRoles = getAppUserRole(); // Assuming you have a method to retrieve the Set<AppUserRole>
 
         String[] rolesArray = appUserRoles.stream()
-                .map(AppUserRole::getRole)
+                .map(AppUserRole::getRoleName)
                 .toArray(String[]::new);
 
         return rolesArray;

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

@@ -10,7 +10,7 @@ public class AppUserRole {
 	@Id
 	@GeneratedValue(strategy= GenerationType.AUTO)
 	private Long id;
-	private String role;
+	private String roleName;
 
 	//#####################################################################_methods
 	public Long getId() {
@@ -19,11 +19,11 @@ public class AppUserRole {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	public String getRole() {
-		return role;
+	public String getRoleName() {
+		return roleName;
 	}
-	public void setRole(String role) {
-		this.role = role;
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
 	}
 	
 }

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

@@ -1,15 +1,15 @@
 package pl.dmcs.jwoszczyk.domain;
 
-public class LoginEntity {
+public class LoginDto {
     String username;
     String password;
 
-    public LoginEntity(String username, String password) {
+    public LoginDto(String username, String password) {
         this.username = username;
         this.password = password;
     }
 
-    public LoginEntity() {
+    public LoginDto() {
     }
 
     public String getUsername() {

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/repository/IAppUserRoleRepository.java

@@ -8,6 +8,6 @@ import pl.dmcs.jwoszczyk.domain.AppUserRole;
 @Transactional
 @Repository
 public interface IAppUserRoleRepository extends JpaRepository<AppUserRole, Long> {
-    AppUserRole findByRole(String role);
+    AppUserRole findByRoleName(String roleName);
 }
 

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/JwtTokenUtil.java

@@ -7,6 +7,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.Set;
 import java.util.function.Function;
 
 @Component
@@ -16,7 +17,7 @@ public class JwtTokenUtil {
     //    private static final long EXPIRATION_TIME = 86400000; // 24 hours in milliseconds
     private static final long EXPIRATION_TIME = 1000 * 30; // 30 sec
 
-    public static String generateToken(String username, String[] roles) {
+    public static String generateToken(String username, Set<String> roles) {
         // Set token expiration time
         Date expirationDate = new Date(System.currentTimeMillis() + EXPIRATION_TIME);
 

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

@@ -33,5 +33,23 @@ public class AppUserRoleService implements IAppUserRoleService {
     public AppUserRole getAppUserRole(long id) {
         return appUserRoleRepository.getOne(id);
     }
+
+    public AppUserRole getAppUserRoleByRoleName(String roleName){
+        System.out.println("in roleService getAppUserRoleByRoleName: " + roleName);
+        return appUserRoleRepository.findByRoleName(roleName);
+    }
+
 }
 
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -9,5 +9,7 @@ public interface IAppUserRoleService {
     List<AppUserRole> listAppUserRole();
     AppUserRole getAppUserRole(long id);
 
+    AppUserRole getAppUserRoleByRoleName(String roleName);
+
 }
 

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

@@ -70,7 +70,7 @@ public class MyAppUserDetailsService implements UserDetailsService {
 		Set<GrantedAuthority> setAuths = new HashSet<GrantedAuthority>();
 		// Build user's authorities
 		for (AppUserRole appUserRole : appUserRoles) {
-			setAuths.add(new SimpleGrantedAuthority(appUserRole.getRole()));
+			setAuths.add(new SimpleGrantedAuthority(appUserRole.getRoleName()));
 		}
 		List<GrantedAuthority> result = new ArrayList<GrantedAuthority>(setAuths);
 		return result;

Backend/Spring/src/main/webapp/appUserRole.jsp

@@ -13,8 +13,8 @@
     </tr>
     <tr>
         <td><form:label path="role"><spring:message code="label.role"/></form:label></td>
-        <td><form:input path="role" /></td>
-        <td><form:errors path="role"/></td>
+        <td><form:input path="roleName" /></td>
+        <td><form:errors path="roleName"/></td>
     </tr>
     
     <tr>

Backend/Spring/target/Spring-1.0-SNAPSHOT/appUserRole.jsp

@@ -13,8 +13,8 @@
     </tr>
     <tr>
         <td><form:label path="role"><spring:message code="label.role"/></form:label></td>
-        <td><form:input path="role" /></td>
-        <td><form:errors path="role"/></td>
+        <td><form:input path="roleName" /></td>
+        <td><form:errors path="roleName"/></td>
     </tr>
     
     <tr>

Frontend/RiffMasterFront/.idea/workspace.xml

@@ -6,20 +6,22 @@
   <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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SecurityConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SecurityConfiguration.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/repository/IAppUserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/repository/IAppUserRepository.java" 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/src/main/java/pl/dmcs/jwoszczyk/service/IAppUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/service/IAppUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/AppUser.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/domain/AppUser.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/repository/IAppUserRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/repository/IAppUserRepository.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/service/AppUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/service/AppUserService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/service/IAppUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/Spring-1.0-SNAPSHOT/WEB-INF/classes/pl/dmcs/jwoszczyk/service/IAppUserService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/AppUser.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/domain/AppUser.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/repository/IAppUserRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/repository/IAppUserRepository.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/service/AppUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/service/AppUserService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/service/IAppUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/target/classes/pl/dmcs/jwoszczyk/service/IAppUserService.class" 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/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" />