From c5ead62ec7298d8d5de989fcee518fc4db7a0ca7 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 9 Jan 2021 21:34:35 -0500 Subject: [PATCH] [B][O] Use email as unique identifier instead of name --- .../main/kotlin/org/hydev/ios/alarmclock/data/User.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt index 5dba0d8..4d39361 100644 --- a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt +++ b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt @@ -54,17 +54,17 @@ interface UserRepo: JpaRepository @RequestMapping("/api/user") class UserApi(val repo: UserRepo) { - val em = ExampleMatcher.matching().withIgnorePaths("id", "passHash", "passSalt").withMatcher("name", ignoreCase()) + val em = ExampleMatcher.matching().withIgnorePaths("id", "passHash", "passSalt", "name").withMatcher("email", ignoreCase()) @GetMapping("/register") fun register(@RequestParam name: String, @RequestParam pass: String, @RequestParam @Email email: String): Any { - // Check username length - if (name.length !in 3..32) return bad("Username length not in range 3 to 32") + // Check name length + if (name.length !in 1..32) return bad("Name length not in range 1 to 32") - // Check if username exists + // Check if email exists val user = User(name, email, pass) - if (repo.exists(Example.of(user, em))) return bad("Username has already been used") + if (repo.exists(Example.of(user, em))) return bad("Email is already registered") // Check password strength if (pass.length < 8) return bad("Password must be longer than 8 chars")