diff --git a/src/main/java/com/safeqr/app/gmail/controller/GmailController.java b/src/main/java/com/safeqr/app/gmail/controller/GmailController.java index 126c907..06dbc67 100644 --- a/src/main/java/com/safeqr/app/gmail/controller/GmailController.java +++ b/src/main/java/com/safeqr/app/gmail/controller/GmailController.java @@ -104,7 +104,7 @@ public class GmailController { @GetMapping(value = API_URL_GMAIL_GET_SCANNED_EMAILS, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getUserScannedEmails(@RequestHeader(name = "X-USER-ID") String userId) { - logger.info("Invoking GET User scanned Emails endpoint"); + logger.info("User Id Invoking GET User scanned Emails endpoint: {}", userId); return ResponseEntity.ok(gmailService.fetchScannedGmail(userId)); } @GetMapping(value = API_URL_GMAIL_GET_EMAILS, produces = MediaType.APPLICATION_JSON_VALUE) @@ -112,7 +112,7 @@ public class GmailController { @RequestHeader(name = "refreshToken") String refreshToken, @RequestHeader(name = "X-USER-ID") String userId ) { - logger.info("Invoking GET Scan User Emails endpoints"); + logger.info("User Id Invoking GET Scan User Emails endpoints: {}", userId); if (accessToken == null || accessToken.isEmpty()) { return new ResponseEntity<>("Access token is missing", HttpStatus.BAD_REQUEST); } diff --git a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java index 8f87704..2397e98 100644 --- a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java +++ b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java @@ -52,7 +52,7 @@ public class QRCodeTypeController { @PostMapping(value = API_URL_QRCODE_SCAN, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity scanQRCode(@RequestBody QRCodePayload payload, @RequestHeader(required = false, name = HEADER_USER_ID) String userId) { - logger.info("Invoking scan endpoint"); + logger.info("User Id Invoking scan endpoint: {}", userId); return ResponseEntity.ok(qrCodeTypeService.scanQRCode(userId, payload)); } diff --git a/src/main/java/com/safeqr/app/qrcode/entity/WifiEntity.java b/src/main/java/com/safeqr/app/qrcode/entity/WifiEntity.java index d5b9837..71c9fbf 100644 --- a/src/main/java/com/safeqr/app/qrcode/entity/WifiEntity.java +++ b/src/main/java/com/safeqr/app/qrcode/entity/WifiEntity.java @@ -2,6 +2,7 @@ package com.safeqr.app.qrcode.entity; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -31,6 +32,7 @@ public class WifiEntity { private String ssid; private String password; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private String encryption; private boolean hidden; } diff --git a/src/main/java/com/safeqr/app/qrcode/service/WifiVerificationService.java b/src/main/java/com/safeqr/app/qrcode/service/WifiVerificationService.java index 9bf8a4b..f7b1335 100644 --- a/src/main/java/com/safeqr/app/qrcode/service/WifiVerificationService.java +++ b/src/main/java/com/safeqr/app/qrcode/service/WifiVerificationService.java @@ -60,6 +60,11 @@ public class WifiVerificationService { } public String getClassification(String encryptionType) { + // Check if encryptionType is null + if (encryptionType == null) { + return CLASSIFY_UNSAFE; + } + if (encryptionType.equalsIgnoreCase("WPA") || encryptionType.equalsIgnoreCase("WPA2") || encryptionType.equalsIgnoreCase("WPA3")) { diff --git a/src/main/java/com/safeqr/app/user/controller/UserController.java b/src/main/java/com/safeqr/app/user/controller/UserController.java index 2cf4fae..560dfb9 100644 --- a/src/main/java/com/safeqr/app/user/controller/UserController.java +++ b/src/main/java/com/safeqr/app/user/controller/UserController.java @@ -37,49 +37,49 @@ public class UserController { @GetMapping(value = API_URL_USER_GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getUser(@RequestHeader(name = HEADER_USER_ID) String userId) { - logger.info("Invoking GET User endpoint"); + logger.info("User Id Invoking GET User endpoint: {}", userId); return ResponseEntity.ok(userService.getUserById(userId)); } @GetMapping(value = API_URL_USER_GET_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUserScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) { - logger.info("Invoking GET User Scanned Histories endpoint"); + logger.info("User Id Invoking GET User Scanned Histories endpoint: {}", userId); return ResponseEntity.ok(userService.getUserScannedHistories(userId)); } @PutMapping(value = API_URL_USER_DELETE_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteScannedHistory(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) { - logger.info("Invoking PUT Delete Single Scanned History endpoint"); + logger.info("User Id Invoking PUT Delete Single Scanned History endpoint: {}", userId); return ResponseEntity.ok(userService.deleteScannedHistory(userId, bookmarkRequestDto.getQrCodeId())); } @PutMapping(value = API_URL_USER_DELETE_ALL_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteAllScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) { - logger.info("Invoking PUT Delete All Scanned Histories endpoint"); + logger.info("User Id Invoking PUT Delete All Scanned Histories endpoint: {}", userId); return ResponseEntity.ok(userService.deleteAllScannedHistoriesByUserId(userId)); } @GetMapping(value = API_URL_USER_GET_BOOKMARKS, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) { - logger.info("Invoking GET User bookmarks endpoint"); + logger.info("User Id Invoking GET User bookmarks endpoint: {}", userId); return ResponseEntity.ok(userService.getUserBookmarks(userId)); } @PostMapping(value = API_URL_USER_SET_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity setBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) { - logger.info("Invoking POST User bookmark endpoint"); + logger.info("User Id Invoking POST User bookmark endpoint: {}", userId); return ResponseEntity.ok(userService.setBookmark(userId, bookmarkRequestDto.getQrCodeId())); } @PutMapping(value = API_URL_USER_DELETE_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) { - logger.info("Invoking PUT Delete Single Bookmark endpoint"); + logger.info("User Id Invoking PUT Delete Single Bookmark endpoint: {}", userId); return ResponseEntity.ok(userService.deleteBookmark(userId, bookmarkRequestDto.getQrCodeId())); } @PutMapping(value = API_URL_USER_DELETE_ALL_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteAllBookmark(@RequestHeader(name = HEADER_USER_ID) String userId) { - logger.info("Invoking PUT Delete All Bookmark endpoint"); + logger.info("User Id Invoking PUT Delete All Bookmark endpoint: {}", userId); return ResponseEntity.ok(userService.deleteAllBookmarkByUserId(userId)); } }