New feature

README.md

@@ -45,3 +45,35 @@ Run both Back-end & Front-end in one place:
 ```
 mvn spring-boot:run
 ```
+Redoing it again using command line. ok lets do.
+
+Working on a line 50.
+
+Working on a line 52.
+Working on a line 53 in master.
+Working on line 54 for rebase.
+
+Working on line 56 for a rebase.
+
+Working on a line 54 on feature branch.
+
+working on line 60.
+
+Working on a line 54 on feature branch.
+
+working on line 60.
+
+Working on 62.
+
+Working on line 68.
+....
+....
+....
+....
+....
+....
+
+
+
+
+

pom.xml

@@ -54,6 +54,12 @@
 <artifactId>spring-security-test</artifactId>
 <scope>test</scope>
 </dependency>
+
+<dependency>
+<groupId>jakarta.xml.bind</groupId>
+<artifactId>jakarta.xml.bind-api</artifactId>
+<version>2.3.2</version>
+</dependency>
 </dependencies>
 
 <build>

src/main/java/com/bezkoder/spring/security/mongodb/controllers/AuthController.java

@@ -7,6 +7,7 @@
 
 import javax.validation.Valid;
 
+import com.bezkoder.spring.security.mongodb.payload.response.JwtResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
@@ -63,17 +64,16 @@ public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest login
 
  UserDetailsImpl userDetails = (UserDetailsImpl) authentication.getPrincipal();
 
- ResponseCookie jwtCookie = jwtUtils.generateJwtCookie(userDetails);
+ String jwtCookie = jwtUtils.generateJwtCookie(authentication);
 
- List<String> roles = userDetails.getAuthorities().stream()
- .map(item -> item.getAuthority())
- .collect(Collectors.toList());
+// List<String> roles = userDetails.getAuthorities().stream()
+// .map(item -> item.getAuthority())
+// .collect(Collectors.toList());
 
- return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, jwtCookie.toString())
- .body(new UserInfoResponse(userDetails.getId(),
- userDetails.getUsername(),
- userDetails.getEmail(),
- roles));
+ return ResponseEntity.ok(new JwtResponse(jwtCookie,
+ userDetails.getId(),
+ userDetails.getUsername(),
+ userDetails.getEmail()));
  }
 
  @PostMapping("/signup")
@@ -95,37 +95,37 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signUpRe
  signUpRequest.getEmail(),
  encoder.encode(signUpRequest.getPassword()));
 
- Set<String> strRoles = signUpRequest.getRoles();
- Set<Role> roles = new HashSet<>();
-
- if (strRoles == null) {
- Role userRole = roleRepository.findByName(ERole.ROLE_USER)
- .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
- roles.add(userRole);
- } else {
- strRoles.forEach(role -> {
- switch (role) {
- case "admin":
- Role adminRole = roleRepository.findByName(ERole.ROLE_ADMIN)
- .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
- roles.add(adminRole);
-
- break;
- case "mod":
- Role modRole = roleRepository.findByName(ERole.ROLE_MODERATOR)
- .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
- roles.add(modRole);
-
- break;
- default:
- Role userRole = roleRepository.findByName(ERole.ROLE_USER)
- .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
- roles.add(userRole);
- }
- });
- }
-
- user.setRoles(roles);
+// Set<String> strRoles = signUpRequest.getRoles();
+// Set<Role> roles = new HashSet<>();
+//
+// if (strRoles == null) {
+// Role userRole = roleRepository.findByName(ERole.ROLE_USER)
+// .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
+// roles.add(userRole);
+// } else {
+// strRoles.forEach(role -> {
+// switch (role) {
+// case "admin":
+// Role adminRole = roleRepository.findByName(ERole.ROLE_ADMIN)
+// .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
+// roles.add(adminRole);
+//
+// break;
+// case "mod":
+// Role modRole = roleRepository.findByName(ERole.ROLE_MODERATOR)
+// .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
+// roles.add(modRole);
+//
+// break;
+// default:
+// Role userRole = roleRepository.findByName(ERole.ROLE_USER)
+// .orElseThrow(() -> new RuntimeException("Error: Role is not found."));
+// roles.add(userRole);
+// }
+// });
+// }
+//
+// user.setRoles(roles);
  userRepository.save(user);
 
  return ResponseEntity.ok(new MessageResponse("User registered successfully!"));

src/main/java/com/bezkoder/spring/security/mongodb/controllers/TodoController.java

@@ -0,0 +1,2 @@
+package com.bezkoder.spring.security.mongodb.controllers;public class TodoController {
+}

src/main/java/com/bezkoder/spring/security/mongodb/models/Todo.java

@@ -0,0 +1,2 @@
+package com.bezkoder.spring.security.mongodb.models;public class Todo {
+}

src/main/java/com/bezkoder/spring/security/mongodb/payload/response/JwtResponse.java

@@ -0,0 +1,2 @@
+package com.bezkoder.spring.security.mongodb.payload.response;public class JwtResponse {
+}

src/main/java/com/bezkoder/spring/security/mongodb/payload/response/UserInfoResponse.java

@@ -8,7 +8,7 @@ public class UserInfoResponse {
  private String email;
  private List<String> roles;
 
- public UserInfoResponse(String id, String username, String email, List<String> roles) {
+ public UserInfoResponse(String id, String username, String email) {
  this.id = id;
  this.username = username;
  this.email = email;

src/main/java/com/bezkoder/spring/security/mongodb/repository/TodoRepository.java

@@ -0,0 +1,2 @@
+package com.bezkoder.spring.security.mongodb.repository;public interface TodoRepository {
+}

src/main/java/com/bezkoder/spring/security/mongodb/security/jwt/AuthTokenFilter.java

@@ -14,6 +14,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import com.bezkoder.spring.security.mongodb.security.services.UserDetailsServiceImpl;
@@ -50,7 +51,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
  }
 
  private String parseJwt(HttpServletRequest request) {
- String jwt = jwtUtils.getJwtFromCookies(request);
- return jwt;
+ String headerAuth = request.getHeader("Authorization");
+ if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) {
+ return headerAuth.substring(7, headerAuth.length());
+ }
+ return null;
+ }
  }
-}
+

src/main/resources/application.properties

@@ -1,8 +1,8 @@
-spring.data.mongodb.database=bezkoder_db
-spring.data.mongodb.host=localhost
-spring.data.mongodb.port=27017
+spring.data.mongodb.uri=mongodb+srv://aakash23:imesh100@mycluster.ixv47ta.mongodb.net/?retryWrites=true&w=majority
+spring.data.mongodb.database=todos
+spring.mvc.dispatch-options-request=true
 
 # App Properties
-bezkoder.app.jwtCookieName= bezkoder
-bezkoder.app.jwtSecret= bezKoderSecretKey
+bezkoder.app.jwtCookieName= aakash23
+bezkoder.app.jwtSecret= springbootversion2
 bezkoder.app.jwtExpirationMs= 86400000