v2.10.0 release

.gitignore

@@ -101,7 +101,6 @@ Desktop.ini
 ######################
 /build/**
 /bin/**
-/data/**
 /spring_loaded/**
 /deploy/**
 

Gruntfile.js

@@ -1,4 +1,4 @@
-// Generated on 2015-04-29 using generator-jhipster 2.9.2
+// Generated on 2015-05-07 using generator-jhipster 2.10.0
 'use strict';
 var fs = require('fs');
 

package.json

@@ -41,9 +41,12 @@
     "karma-requirejs": "0.2.2",
     "karma-phantomjs-launcher": "0.1.4",
     "karma": "0.12.32",
-    "generator-jhipster": "2.9.2",
+    "generator-jhipster": "2.10.0",
     "lodash": "3.3.1",
     "xml2js": "0.4.5",
+    "yo": ">=1.3.0",
+    "requirejs": "2.1",
+    "jasmine-core": "2.1.0",
     "zeparser": "0.0.7",
     "wiredep": "2.2.2"
   },

pom.xml

@@ -320,6 +320,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Spring Cloud -->
         <dependency>

src/main/java/com/mycompany/myapp/Application.java

@@ -18,6 +18,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.Collection;
 
 @ComponentScan
 @EnableAutoConfiguration(exclude = {MetricFilterAutoConfiguration.class, MetricRepositoryAutoConfiguration.class})
@@ -33,13 +34,29 @@ public class Application {
      * <p/>
      * Spring profiles can be configured with a program arguments --spring.profiles.active=your-active-profile
      * <p/>
+     * <p>
+     * You can find more information on how profiles work with JHipster on <a href="http://jhipster.github.io/profiles.html">http://jhipster.github.io/profiles.html</a>.
+     * </p>
      */
     @PostConstruct
     public void initApplication() throws IOException {
         if (env.getActiveProfiles().length == 0) {
             log.warn("No Spring profile configured, running with default configuration");
         } else {
             log.info("Running with Spring profile(s) : {}", Arrays.toString(env.getActiveProfiles()));
+            Collection activeProfiles = Arrays.asList(env.getActiveProfiles());
+            if (activeProfiles.contains("dev") && activeProfiles.contains("prod")) {
+                log.error("You have misconfigured your application! " +
+                    "It should not run with both the 'dev' and 'prod' profiles at the same time.");
+            }
+            if (activeProfiles.contains("prod") && activeProfiles.contains("fast")) {
+                log.error("You have misconfigured your application! " +
+                    "It should not run with both the 'prod' and 'fast' profiles at the same time.");
+            }
+            if (activeProfiles.contains("dev") && activeProfiles.contains("cloud")) {
+                log.error("You have misconfigured your application! " +
+                    "It should not run with both the 'dev' and 'cloud' profiles at the same time.");
+            }
         }
     }
 
@@ -49,11 +66,7 @@ public void initApplication() throws IOException {
     public static void main(String[] args) throws UnknownHostException {
         SpringApplication app = new SpringApplication(Application.class);
         app.setShowBanner(false);
-
         SimpleCommandLinePropertySource source = new SimpleCommandLinePropertySource(args);
-
-        // Check if the selected profile has been set as argument.
-        // if not the development profile will be added
         addDefaultProfile(app, source);
         addLiquibaseScanPackages();
         Environment env = app.run(args).getEnvironment();
@@ -67,10 +80,12 @@ public static void main(String[] args) throws UnknownHostException {
     }
 
     /**
-     * Set a default profile if it has not been set
+     * If no profile has been configured, set by default the "dev" profile.
      */
     private static void addDefaultProfile(SpringApplication app, SimpleCommandLinePropertySource source) {
-        if (!source.containsProperty("spring.profiles.active")) {
+        if (!source.containsProperty("spring.profiles.active") &&
+                !System.getenv().containsKey("SPRING_PROFILES_ACTIVE")) {
+
             app.setAdditionalProfiles(Constants.SPRING_PROFILE_DEVELOPMENT);
         }
     }

src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java

@@ -52,7 +52,7 @@ public DataSource dataSource() {
         log.debug("Configuring Datasource");
         if (propertyResolver.getProperty("url") == null && propertyResolver.getProperty("databaseName") == null) {
             log.error("Your database connection pool configuration is incorrect! The application" +
-                    "cannot start. Please check your Spring profile, current profiles are: {}",
+                    " cannot start. Please check your Spring profile, current profiles are: {}",
                     Arrays.toString(env.getActiveProfiles()));
 
             throw new ApplicationContextException("Database connection pool is not configured correctly");

src/main/java/com/mycompany/myapp/config/SecurityConfiguration.java

@@ -114,6 +114,8 @@ protected void configure(HttpSecurity http) throws Exception {
             .antMatchers("/api/register").permitAll()
             .antMatchers("/api/activate").permitAll()
             .antMatchers("/api/authenticate").permitAll()
+            .antMatchers("/api/account/reset_password/init").permitAll()
+            .antMatchers("/api/account/reset_password/finish").permitAll()
             .antMatchers("/api/logs/**").hasAuthority(AuthoritiesConstants.ADMIN)
             .antMatchers("/api/**").authenticated()
             .antMatchers("/metrics/**").hasAuthority(AuthoritiesConstants.ADMIN)

src/main/java/com/mycompany/myapp/config/WebConfigurer.java

@@ -115,7 +115,7 @@ private void initCachingHttpHeadersFilter(ServletContext servletContext,
         log.debug("Registering Caching HTTP Headers Filter");
         FilterRegistration.Dynamic cachingHttpHeadersFilter =
                 servletContext.addFilter("cachingHttpHeadersFilter",
-                        new CachingHttpHeadersFilter());
+                        new CachingHttpHeadersFilter(env));
 
         cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/assets/*");
         cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/scripts/*");

src/main/java/com/mycompany/myapp/domain/User.java

@@ -6,13 +6,16 @@
 import org.hibernate.validator.constraints.Email;
 
 import javax.persistence.*;
+import org.hibernate.annotations.Type;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.joda.time.DateTime;
+
 /**
  * A user.
  */
@@ -62,6 +65,14 @@ public class User extends AbstractAuditingEntity implements Serializable {
     @JsonIgnore
     private String activationKey;
 
+    @Size(max = 20)
+    @Column(name = "reset_key", length = 20)
+    private String resetKey;
+
+    @Type(type = "org.jadira.usertype.dateandtime.joda.PersistentDateTime")
+    @Column(name = "reset_date", nullable = true)
+    private DateTime resetDate = null;
+
     @JsonIgnore
     @ManyToMany
     @JoinTable(
@@ -140,6 +151,22 @@ public void setActivationKey(String activationKey) {
         this.activationKey = activationKey;
     }
 
+    public String getResetKey() {
+        return resetKey;
+    }
+
+    public void setResetKey(String resetKey) {
+        this.resetKey = resetKey;
+    }
+
+    public DateTime getResetDate() {
+       return resetDate;
+    }
+
+    public void setResetDate(DateTime resetDate) {
+       this.resetDate = resetDate;
+    }
+
     public String getLangKey() {
         return langKey;
     }

src/main/java/com/mycompany/myapp/repository/UserRepository.java

@@ -4,7 +4,6 @@
 
 import org.joda.time.DateTime;
 import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.Optional;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
@@ -19,6 +18,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     List<User> findAllByActivatedIsFalseAndCreatedDateBefore(DateTime dateTime);
 
+    Optional<User> findOneByResetKey(String resetKey);
+
     Optional<User> findOneByEmail(String email);
 
     Optional<User> findOneByLogin(String login);

src/main/java/com/mycompany/myapp/service/MailService.java

@@ -38,7 +38,7 @@ public class MailService {
 
     @Inject
     private MessageSource messageSource;
-    
+
     @Inject
     private SpringTemplateEngine templateEngine;
 
@@ -83,4 +83,16 @@ public void sendActivationEmail(User user, String baseUrl) {
         String subject = messageSource.getMessage("email.activation.title", null, locale);
         sendEmail(user.getEmail(), subject, content, false, true);
     }
+
+    @Async
+    public void sendPasswordResetMail(User user, String baseUrl) {
+        log.debug("Sending password reset e-mail to '{}'", user.getEmail());
+        Locale locale = Locale.forLanguageTag(user.getLangKey());
+        Context context = new Context(locale);
+        context.setVariable("user", user);
+        context.setVariable("baseUrl", baseUrl);
+        String content = templateEngine.process("passwordResetEmail", context);
+        String subject = messageSource.getMessage("email.reset.title", null, locale);
+        sendEmail(user.getEmail(), subject, content, false, true);
+    }
 }

src/main/java/com/mycompany/myapp/service/UserService.java

@@ -58,8 +58,37 @@ public Optional<User> activateRegistration(String key) {
         return Optional.empty();
     }
 
+    public Optional<User> completePasswordReset(String newPassword, String key) {
+       log.debug("Reset user password for reset key {}", key);
+
+       return userRepository.findOneByResetKey(key)
+           .filter(user -> {
+               DateTime oneDayAgo = DateTime.now().minusHours(24);
+               return user.getResetDate().isAfter(oneDayAgo.toInstant().getMillis());
+           })
+           .map(user -> {
+               user.setActivated(true);
+               user.setPassword(passwordEncoder.encode(newPassword));
+               user.setResetKey(null);
+               user.setResetDate(null);
+               userRepository.save(user);
+               return user;
+           });
+    }
+
+    public Optional<User> requestPasswordReset(String mail) {
+       return userRepository.findOneByEmail(mail)
+           .map(user -> {
+               user.setResetKey(RandomUtil.generateResetKey());
+               user.setResetDate(DateTime.now());
+               userRepository.save(user);
+               return user;
+           });
+    }
+
     public User createUserInformation(String login, String password, String firstName, String lastName, String email,
                                       String langKey) {
+
         User newUser = new User();
         Authority authority = authorityRepository.findOne("ROLE_USER");
         Set<Authority> authorities = new HashSet<>();

src/main/java/com/mycompany/myapp/service/util/RandomUtil.java

@@ -29,4 +29,13 @@ public static String generatePassword() {
     public static String generateActivationKey() {
         return RandomStringUtils.randomNumeric(DEF_COUNT);
     }
+
+    /**
+    * Generates a reset key.
+    *
+    * @return the generated reset key
+    */
+   public static String generateResetKey() {
+       return RandomStringUtils.randomNumeric(DEF_COUNT);
+   }
 }

src/main/java/com/mycompany/myapp/web/filter/CachingHttpHeadersFilter.java

@@ -1,5 +1,7 @@
 package com.mycompany.myapp.web.filter;
 
+import org.springframework.core.env.Environment;
+
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -11,15 +13,20 @@
  */
 public class CachingHttpHeadersFilter implements Filter {
 
-    // Cache period is 1 month (in ms)
-    private final static long CACHE_PERIOD = TimeUnit.DAYS.toMillis(31L);
-
     // We consider the last modified date is the start up time of the server
     private final static long LAST_MODIFIED = System.currentTimeMillis();
 
+    private long CACHE_TIME_TO_LIVE = TimeUnit.DAYS.toMillis(31L);
+
+    private Environment env;
+
+    public CachingHttpHeadersFilter(Environment env) {
+           this.env = env;
+    }
+
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        // Nothing to initialize
+        CACHE_TIME_TO_LIVE = TimeUnit.DAYS.toMillis(env.getProperty("http.cache.timeToLiveInDays", Long.class, 31L));
     }
 
     @Override
@@ -31,11 +38,11 @@ public void destroy() {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         HttpServletResponse httpResponse = (HttpServletResponse) response;
 
-        httpResponse.setHeader("Cache-Control", "max-age=2678400000, public");
+        httpResponse.setHeader("Cache-Control", "max-age=" + CACHE_TIME_TO_LIVE + ", public");
         httpResponse.setHeader("Pragma", "cache");
 
         // Setting Expires header, for proxy caching
-        httpResponse.setDateHeader("Expires", CACHE_PERIOD + System.currentTimeMillis());
+        httpResponse.setDateHeader("Expires", CACHE_TIME_TO_LIVE + System.currentTimeMillis());
 
         // Setting the Last-Modified header, for browser caching
         httpResponse.setDateHeader("Last-Modified", LAST_MODIFIED);

src/main/java/com/mycompany/myapp/web/rest/AccountResource.java

@@ -74,6 +74,7 @@ public ResponseEntity<?> registerAccount(@Valid @RequestBody UserDTO userDTO, Ht
                 })
         );
     }
+
     /**
      * GET  /activate -> activate the registered user.
      */
@@ -193,4 +194,32 @@ public void invalidateSession(@PathVariable String series) throws UnsupportedEnc
                 .findAny().ifPresent(t -> persistentTokenRepository.delete(decodedSeries));
         });
     }
+
+    @RequestMapping(value = "/account/reset_password/init",
+        method = RequestMethod.POST,
+        produces = MediaType.TEXT_PLAIN_VALUE)
+    @Timed
+    public ResponseEntity<?> requestPasswordReset(@RequestBody String mail, HttpServletRequest request) {
+
+        return userService.requestPasswordReset(mail)
+            .map(user -> {
+                String baseUrl = request.getScheme() +
+                    "://" +
+                    request.getServerName() +
+                    ":" +
+                    request.getServerPort();
+            mailService.sendPasswordResetMail(user, baseUrl);
+            return new ResponseEntity<>("e-mail was sent", HttpStatus.OK);
+            }).orElse(new ResponseEntity<>("e-mail address not registered", HttpStatus.BAD_REQUEST));
+
+    }
+
+    @RequestMapping(value = "/account/reset_password/finish",
+        method = RequestMethod.POST,
+        produces = MediaType.APPLICATION_JSON_VALUE)
+    @Timed
+    public ResponseEntity<String> finishPasswordReset(@RequestParam(value = "key") String key, @RequestParam(value = "newPassword") String newPassword) {
+        return userService.completePasswordReset(newPassword, key)
+              .map(user -> new ResponseEntity<String>(HttpStatus.OK)).orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+    }
 }

src/main/resources/config/application-prod.yml

@@ -47,6 +47,10 @@ metrics:
         port: 2003
         prefix: jhipster
 
+http:
+    cache:
+        timeToLiveInDays: 31
+
 cache:
     timeToLiveSeconds: 3600
     ehcache:

src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml

@@ -34,12 +34,16 @@
             </column>
             <column name="lang_key" type="varchar(5)"/>
             <column name="activation_key" type="varchar(20)"/>
+            <column name="reset_key" type="varchar(20)"/>
             <column name="created_by" type="varchar(50)">
                 <constraints nullable="false"/>
             </column>
             <column name="created_date" type="timestamp" defaultValueDate="${now}">
                 <constraints nullable="false"/>
             </column>
+            <column name="reset_date" type="timestamp">
+                <constraints nullable="true"/>
+            </column>
             <column name="last_modified_by" type="varchar(50)"/>
             <column name="last_modified_date" type="timestamp"/>
         </createTable>