dashboard: ready to merge, authentication

Author: thomasm1

.DS_Store

@@ -32,12 +32,6 @@
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.1.0-jre</version>
-        </dependency>
 
         <!--cloud -->
 <!--        <dependency>-->
@@ -106,12 +100,12 @@
             <artifactId>guava</artifactId>
             <version>31.0.1-jre</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-docker-compose</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-docker-compose</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

client-mapl-dashboard/pom.xml

@@ -10,7 +10,7 @@
 import app.mapl.repositories.RoleEntityRepository;
 import app.mapl.repositories.UsersRepository;
 import app.mapl.repositories.WeblinksRepository;
-import app.mapl.util.ReadWriteFile;
+import app.mapl.util.FileReadWrite;
 import app.mapl.util.constants.Datum;
 import app.mapl.util.config.logger.CliLogger;
 import lombok.RequiredArgsConstructor;
@@ -148,8 +148,8 @@ void printBookmarks() {
     void writeUserData() throws IOException {
         for (User u : users) {
             System.out.println("|__________|  WRITING USER  TO FILE |_______|  /n" + u);
-            ReadWriteFile.writeUser(u);
-            ReadWriteFile.writeUsers(users);
+            FileReadWrite.writeUser(u);
+            FileReadWrite.writeUsers(users);
         }
     }
 

client-mapl-dashboard/src/main/java/app/mapl/BootstrapData.java

@@ -5,7 +5,7 @@
 import app.mapl.models.*;
 import app.mapl.service.WeblinksService;
 import app.mapl.util.DownloadSequential;
-import app.mapl.util.ReadWriteFile;
+import app.mapl.util.FileReadWrite;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -18,7 +18,7 @@
 
 @Slf4j
 @Component
-public class FileDataStore extends ReadWriteFile {
+public class FileDataStore extends FileReadWrite {
  	WeblinksService bookmarks;
 	 FileDataStore(WeblinksService bookmarkservice) {
 		this.bookmarks = bookmarkservice;
@@ -59,7 +59,7 @@ public static void loadData() throws FileNotFoundException, UnsupportedEncodingE
 		static List<User> loadUsers() throws FileNotFoundException, UnsupportedEncodingException {
 //		users[0] = UserManager.getInstance().createUser(500,  "user0", "password", "Smith", "Tom", UserType.USER, "[email protected]",  "5055087707" ,"http://www.dailytech.net", "1000");
  	List<String> data = new ArrayList<>();
-			ReadWriteFile.readFromFilename(data,  FILE_IN_USERS);
+			FileReadWrite.readFromFilename(data,  FILE_IN_USERS);
 			log.info("TEST_USERS::::::: "+FILE_IN_USERS+data.toString());
 			for (String row : data) {
 				String[] values = row.split(",");
@@ -85,7 +85,7 @@ static List<User> loadUsers() throws FileNotFoundException, UnsupportedEncodingE
 		public static List<Weblink> loadWeblinks() throws FileNotFoundException, UnsupportedEncodingException {
 //			bookmarks[0][0] = BookmarkManager.getInstance().createWeblink(2000,  "http://www.javaworld.com/article/2072759/core-java/taming-tiger--part-2.html","http://www.javaworld.com" );
 			List<String>  data = new ArrayList<>();
-			ReadWriteFile.readFromFilename(data, FILE_IN_WEBLINKS);
+			FileReadWrite.readFromFilename(data, FILE_IN_WEBLINKS);
 
 			for (String row : data) {
 				String[] values = row.split(",");
@@ -103,7 +103,7 @@ public static List<Weblink> loadWeblinks() throws FileNotFoundException, Unsuppo
 		public static List<Coin> loadCoins() throws FileNotFoundException, UnsupportedEncodingException {
 //		Coin coin1 = CoinManager.getInstance().createCoin(5000, CoinMake.TESLA, "Cyber-Truck", 37000.99, 0);
 			List<String> data =new ArrayList<>();
-			ReadWriteFile.readFromFilename(data, FILE_IN_COINS);
+			FileReadWrite.readFromFilename(data, FILE_IN_COINS);
 			for (String row: data) {
 				String[] values = row.split(",");
 				Coin coin = new Coin(Integer.parseInt(values[0]), values[1], values[2], Double.parseDouble(values[3]), Integer.parseInt(values[4]));
@@ -146,7 +146,7 @@ public static void saveLocalUserBookmark(User user, Bookmark bookmark) {
 				if(!url.endsWith(".pdf")) {
 					String website = DownloadSequential.downloadFromUrl(((Weblink) bookmark).getUrl());
 					if(website != null) {
-						ReadWriteFile.writeWebpage(website, bookmark.getId());
+						FileReadWrite.writeWebpage(website, bookmark.getId());
 					}
 				}
 			} catch (Exception e) {

client-mapl-dashboard/src/main/java/app/mapl/FileDataStore.java

@@ -42,7 +42,7 @@ public UserDashController( UsersService usersService ) {
     }
 
 
-    @GetMapping("/v1thomas")
+    @GetMapping("/v1/register")
     public String register(Model model) {
         UserRequest userAccount = new UserRequest();
         model.addAttribute("registerDto", userAccount);
@@ -68,7 +68,7 @@ public String consoleHome(Model model ) throws JsonProcessingException {
         model.addAttribute("versionNumber",ver);
 
 
-        List<UserResponse> users =  usersService.getUsers();
+        List<UserResponse> users =  usersService.getUsersResponse();
         model.addAttribute("users", users);
         model.addAttribute("map", map);
 

client-mapl-dashboard/src/main/java/app/mapl/controllers/UserDashController.java

@@ -34,7 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static app.mapl.util.Utilities.getResponse;
+import static app.mapl.models.auth.AuthenticationFilter.getResponse;
 import static java.util.Collections.emptyMap;
 import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.OK;
@@ -55,8 +55,8 @@ public class UsersController {
 
     private UsersService usersService;
     AuthenticationManager authenticationManager;
-    public static final String USER_PATH = "/api/users";
-    public static final String USER_PATH_ID = USER_PATH + "/{userId}";
+    public static final String USER_PATH = "/api";
+    public static final String USER_PATH_ID = USER_PATH + "/users/{userId}";
 
     @Autowired
     public UsersController( UsersService usersService ) { 
@@ -86,12 +86,6 @@ public ResponseEntity<LoginDto> loginUser(@RequestParam String usernameOrEmail,
 
         return new ResponseEntity<>(ldto,HttpStatus.CREATED);
     }
-    @PostMapping("/auth/test")
-    public ResponseEntity<?> test(@RequestBody UserRequest userRequest ) {
-        Authentication authenticate = authenticationManager.authenticate(UsernamePasswordAuthenticationToken.unauthenticated(userRequest.getEmail(), userRequest.getPassword()));
-        return ResponseEntity.ok().body(Map.of("user", authenticate));
-    }
-
     @Operation(
             summary = "Create User REST API  registerUser",
             description = "Create User REST API is used to save user in a database"
@@ -104,17 +98,24 @@ public ResponseEntity<?> test(@RequestBody UserRequest userRequest ) {
     public ResponseEntity<Response> registerUser(@RequestBody @Valid UserRequest user, HttpServletRequest request) {
         usersService.createUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getPassword());
         return ResponseEntity.created(getUri()).body( getResponse(request, emptyMap(), "AccountCreated", CREATED));
-            }
+    }
 
     @Operation(
             summary = "Verify Account REST API",
             description = "Verify Account REST API is used to verify a user account"
     )
-    @GetMapping("verify/account")
+    @GetMapping("/auth/verify/account")
     public ResponseEntity<Response> verifyAccount(@RequestParam("key") String key, HttpServletRequest request){
         usersService.verifyAccountKey(key);
         return ResponseEntity.ok().body(  getResponse(request, emptyMap(), "Account Verified.", OK));
     }
+
+    @PostMapping("/auth/test")
+    public ResponseEntity<?> test(@RequestBody UserRequest userRequest ) {
+        Authentication authenticate = authenticationManager.authenticate(UsernamePasswordAuthenticationToken.unauthenticated(userRequest.getEmail(), userRequest.getPassword()));
+        return ResponseEntity.ok().body(Map.of("user", authenticate));
+    }
+
     @Operation(
             summary = "Save User REST API",
             description = "Save User REST API is used to save a user in the database"
@@ -123,7 +124,7 @@ public ResponseEntity<Response> verifyAccount(@RequestParam("key") String key, H
             responseCode = "201",
             description = "HTTP Status 201 CREATED"
     )
-    @PostMapping(value = "/api/userEntity", consumes = "application/json")
+    @PostMapping(value = "/users/userEntity", consumes = "application/json")
     public ResponseEntity<Response> saveUser(@RequestBody @Valid  UserRequest user, HttpServletRequest request){
         User savedUser = usersService.createUserRole(
                 user.getFirstName(),
@@ -144,12 +145,14 @@ private URI getUri() {
             responseCode = "200",
             description = "HTTP Status 200 SUCCESS"
     )
-    @GetMapping(USER_PATH)
+    @GetMapping(USER_PATH+"/users")
     public ResponseEntity<List<UserResponse>> getUsers() {
         List<UserResponse> users = new ArrayList<>();
+
         try {
-            users = usersService.getUsers();
-        } catch (Exception e) {
+            users = usersService.getUsersResponse();
+
+        }   catch (Exception e) {
             System.out.println(e.getMessage());
         }
         return new ResponseEntity<>(users,
@@ -166,7 +169,7 @@ public ResponseEntity<List<UserResponse>> getUsers() {
     )
     // http://localhost:8080/api/users/1
     @GetMapping(value = USER_PATH_ID)
-    public ResponseEntity<UserResponse> getUser(@PathVariable("userId") int userId) {
+    public ResponseEntity<UserDto> getUser(@PathVariable("userId") int userId) {
         if(usersService.getUser(userId).isEmpty()) {
             throw new ResourceNotFoundException("User " + userId + "not found");
         }
@@ -186,16 +189,16 @@ public ResponseEntity<APIResponseDto> getUserById(@PathVariable("id") Long userE
             responseCode = "200",
             description = "HTTP Status 200 SUCCESS"
     )
-    @GetMapping(value = USER_PATH+ "/email/{email}")
-    public ResponseEntity<UserResponse> getUserByEmail(@PathVariable("email") String email) {
+    @GetMapping(value = USER_PATH+ "/users/email/{email}")
+    public ResponseEntity<UserDto> getUserByEmail(@PathVariable("email") String email) {
         if(usersService.getUser(email).isEmpty()) {
             throw new ResourceNotFoundException("User " + email + "not found");
         }
         return new ResponseEntity<>(usersService.getUser(email).get(), OK);
     }
 
     /// Non-Register Creation Request
-    @PostMapping(USER_PATH)
+    @PostMapping(USER_PATH+"/users")
     public ResponseEntity createUser(@RequestBody UserRequest user) {
         ResponseEntity<UserResponse> savedUser = usersService.saveUser(user);
 
@@ -214,7 +217,7 @@ public ResponseEntity createUser(@RequestBody UserRequest user) {
             responseCode = "200",
             description = "HTTP Status 200 SUCCESS"
     )
-    @PutMapping(value = USER_PATH + "/{userId}", consumes = "application/json")  // userId in body
+    @PutMapping(value = USER_PATH + "/users/{userId}", consumes = "application/json")  // userId in body
     public ResponseEntity<UserDto> updateUser(@PathVariable("userId") int userId, @RequestBody UserDto userDto) {
         Optional<UserDto> updated = usersService.updateUser(userDto);
         return updated.map(dto -> new ResponseEntity<>(

client-mapl-dashboard/src/main/java/app/mapl/controllers/UsersController.java

@@ -1,8 +1,15 @@
 package app.mapl.exception;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.actuate.web.exchanges.HttpExchange.Response;
 import org.springframework.http.HttpStatus;
 
+import java.nio.file.AccessDeniedException;
+import java.util.List;
+import java.util.Map;
+
 public class ApiException extends RuntimeException {
     private final HttpStatus status;
     private final String message;
@@ -28,4 +35,14 @@ public HttpStatus getStatus() {
     public String getMessage() {
         return message;
     }
+
+
+    public static void handleErrorResponse(HttpServletRequest request, HttpServletResponse response, Exception exception) {
+        if (exception instanceof AccessDeniedException) {
+            response.setStatus(HttpStatus.FORBIDDEN.value());
+            return;
+        }
+        throw new RuntimeException(response.toString());
+    }
+
 }

client-mapl-dashboard/src/main/java/app/mapl/exception/ApiException.java

@@ -1,17 +1,44 @@
 package app.mapl.mapper;
 
+import app.mapl.models.auth.CredentialEntity;
+import app.mapl.models.auth.RoleEntity;
 import app.mapl.models.auth.User;
+import app.mapl.models.auth.UserRequest;
+import app.mapl.models.auth.UserResponse;
 import app.mapl.models.dto.UserDto;
 import org.mapstruct.*;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING)
 public interface UserMapper {
     User toUser(UserDto userDto);  // REQUEST FROM UI
 
     UserDto toDto(User user); // RESPONSE TO UI
 
+    User userRequestToUser(UserRequest userRequest); // REQUEST FROM UI
+
+
     @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
     User partialUpdate(UserDto userResponse, @MappingTarget User user);
 
+    default UserResponse userToUserResponse(User user) {
+        UserResponse userResponse = new UserResponse();
+        userResponse.setUserId(user.getUserId());
+        userResponse.setEmail(user.getEmail());
+        userResponse.setFirstName(user.getFirstName());
+        userResponse.setLastName(user.getLastName());
+        userResponse.setUserType(user.getUserType());
+        userResponse.setBio(user.getBio());
+        userResponse.setPhone(user.getPhone());
+        userResponse.setAuthenticated(user.isAuthenticated());
+        userResponse.setOrganizationCode(user.getOrganizationCode());
+        userResponse.setDashboardCode(user.getDashboardCode());
+        userResponse.setRoles((Set<RoleEntity>) new ArrayList<RoleEntity>((Collection<? extends RoleEntity>) user.getRole()));
+        return userResponse;
+    };
+
 }

client-mapl-dashboard/src/main/java/app/mapl/mapper/UserMapper.java

@@ -8,19 +8,23 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.actuate.web.exchanges.HttpExchange.Response;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
-import static app.mapl.util.Utilities.handleErrorResponse;
+import static app.mapl.exception.ApiException.handleErrorResponse;
 import static com.fasterxml.jackson.core.JsonParser.Feature.AUTO_CLOSE_SOURCE;
+import static java.time.LocalTime.now;
 import static org.springframework.boot.actuate.endpoint.web.WebEndpointHttpMethod.POST;
 import static org.springframework.security.authentication.UsernamePasswordAuthenticationToken.unauthenticated;
 
@@ -39,20 +43,19 @@ public AuthenticationFilter(AuthenticationManager authenticationManager, UsersSe
     public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, IOException , ServletException {
 
         try {
-            var user = new ObjectMapper().configure(AUTO_CLOSE_SOURCE, true).readValue(request.getInputStream(), UserDto.class);  // LoginRequest
+            var user = new ObjectMapper().configure(AUTO_CLOSE_SOURCE, true).readValue(request.getInputStream(), LoginRequest.class);  //
             userService.updateLoginAttempt(user.getEmail(), LoginType.LOGIN_ATTEMPT);
             var authentication = unauthenticated(user.getEmail(), user.getPassword());
+            return getAuthenticationManager().authenticate(authentication);
         } catch (Exception exception) {
-            throw new BadCredentialsException("Invalid username or password");
+//            throw new BadCredentialsException("Invalid username or password");
+            handleErrorResponse(request, response, new BadCredentialsException("User not found"));
+            return null; //new UsernamePasswordAuthenticationToken(user.getEmail(), user.getPassword(), user.getRoles());
+           } finally {
+            log.info("Login attempt at {}", now());
+            return null;
         }
-            UserDto user = userService.updateLoginAttempt(request.getParameter("email"), LoginType.valueOf(request.getParameter("password")));
-            if (user == null) {
-//                log.error(exception.getMessage());
-                handleErrorResponse(request, response, new BadCredentialsException("User not found"));
-//            throw new BadCredentialsException("User not found");
-            }
 
-            return null; //new UsernamePasswordAuthenticationToken(user.getEmail(), user.getPassword(), user.getRoles());
 
     }
 
@@ -76,10 +79,16 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
     }
 
     private void sendResponse(HttpServletRequest request, HttpServletResponse response, UserDto user) {
+        jwtService.addCookie(response, user, TokenType.ACCESS_TOKEN);
+        jwtService.addCookie(response, user, TokenType.REFRESH_TOKEN);
     }
 
-    private void sendQrCode(HttpServletRequest request, UserDto user) {
+    private Response sendQrCode(HttpServletRequest request, UserDto user) {
+        return getResponse(request,Map.of("user", (List<String>) user), "qrCode, please enter", HttpStatus.OK);
     }
+    public static Response getResponse(HttpServletRequest request, Map<String, List<String>> data, String message, HttpStatus status) {
+        return null; //new Response(status, null);
 
+    }
 
 }