Merge branch 'fix/encode-password'

teapot-org · Jun 25, 2017 · 93b4dc3 · 93b4dc3
2 parents 5cd9f1e + 58d1eaf
commit 93b4dc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.teapot</groupId>
   <artifactId>teapot-backend</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
 
   <parent>

diff --git a/src/main/java/org/teapot/backend/controller/UserController.java b/src/main/java/org/teapot/backend/controller/UserController.java
@@ -174,6 +174,8 @@ public User registerUser(@RequestBody User user,
         }
 
         user.setRegistrationDate(LocalDateTime.now());
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
+
         if (auth == null) {
             user = userRepository.save(user);
             verificationMailSender.createTokenAndSend(user, request.getLocale());