Merge remote-tracking branch 'origin/v1' into v1

src/main/java/cc/ryanc/halo/repository/UserRepository.java

@@ -21,4 +21,13 @@ public interface UserRepository extends BaseRepository<User, Integer> {
      */
     @NonNull
     Optional<User> findByUsername(@NonNull String username);
+
+    /**
+     * Gets user by email.
+     *
+     * @param email email must not be blank
+     * @return an optional user
+     */
+    @NonNull
+    Optional<User> findByEmail(@NonNull String email);
 }

src/main/java/cc/ryanc/halo/service/UserService.java

@@ -38,19 +38,38 @@ public interface UserService extends CrudService<User, Integer> {
     /**
      * Gets non null user by username.
      *
+     * @param username username
      * @return user info
      * @throws NotFoundException throws when the username does not exist
      */
     @NonNull
     User getByUsernameOfNonNull(@NonNull String username);
 
+    /**
+     * Gets user by email.
+     *
+     * @param email email must not be blank
+     * @return an optional user
+     */
+    @NonNull
+    Optional<User> getByEmail(@NonNull String email);
+
+    /**
+     * Gets non null user by email.
+     *
+     * @param email email
+     * @return user info
+     * @throws NotFoundException throws when the username does not exist
+     */
+    User getByEmailOfNonNull(@NonNull String email);
+
     /**
      * Logins by username and password.
      *
-     * @param username username must not be blank
+     * @param key      username or email must not be blank
      * @param password password must not be blank
      * @return user info
      */
     @NonNull
-    User login(@NonNull String username, @NonNull String password);
+    User login(@NonNull String key, @NonNull String password);
 }

src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java

@@ -8,6 +8,8 @@ import cc.ryanc.halo.repository.UserRepository;
 import cc.ryanc.halo.service.UserService;
 import cc.ryanc.halo.service.base.AbstractCrudService;
 import cc.ryanc.halo.utils.DateUtils;
+import cc.ryanc.halo.utils.LocaleMessageUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.crypto.digest.BCrypt;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -28,11 +30,15 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
 
     private final StringCacheStore stringCacheStore;
 
+    private final LocaleMessageUtil localeMessageUtil;
+
     public UserServiceImpl(UserRepository userRepository,
-                           StringCacheStore stringCacheStore) {
+                           StringCacheStore stringCacheStore,
+                           LocaleMessageUtil localeMessageUtil) {
         super(userRepository);
         this.userRepository = userRepository;
         this.stringCacheStore = stringCacheStore;
+        this.localeMessageUtil = localeMessageUtil;
     }
 
     @Override
@@ -45,19 +51,41 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
         return getByUsername(username).orElseThrow(() -> new NotFoundException("The username dose not exist").setErrorData(username));
     }
 
+    /**
+     * Gets user by email.
+     *
+     * @param email email must not be blank
+     * @return an optional user
+     */
     @Override
-    public User login(String username, String password) {
+    public Optional<User> getByEmail(String email) {
-        Assert.hasText(username, "Username must not be blank");
+        return userRepository.findByEmail(email);
+    }
+
+    /**
+     * Gets non null user by email.
+     *
+     * @param email email
+     * @return user info
+     * @throws NotFoundException throws when the username does not exist
+     */
+    @Override
+    public User getByEmailOfNonNull(String email) {
+        return getByEmail(email).orElseThrow(() -> new NotFoundException("The email dose not exist").setErrorData(email));
+    }
+
+    @Override
+    public User login(String key, String password) {
+        Assert.hasText(key, "Username or email must not be blank");
         Assert.hasText(password, "Password must not be blank");
 
         // Ger user by username
-        User user = getByUsernameOfNonNull(username);
+        User user = Validator.isEmail(key) ? getByEmailOfNonNull(key) : getByUsernameOfNonNull(key);
 
         // Check expiration
         if (user.getExpireTime() != null && DateUtils.now().before(user.getExpireTime())) {
             // If expired
-            // TODO replace by i18n
+            throw new BadRequestException(localeMessageUtil.getMessage("code.admin.login.disabled"));
-            throw new BadRequestException("You have been locked temporarily");
         }
 
 
@@ -77,8 +105,7 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
 
             stringCacheStore.put(LOGIN_FAILURE_COUNT_KEY, loginFailureCount.toString(), LOCK_MINUTES, TimeUnit.MINUTES);
 
-            // TODO replace by i18n
+            throw new BadRequestException(localeMessageUtil.getMessage("code.admin.login.failed", new Integer[]{(MAX_LOGIN_TRY - loginFailureCount)}));
-            throw new BadRequestException("Username or password is mismatched, last " + (MAX_LOGIN_TRY - loginFailureCount) + " retry(s)");
         }
 
         // TODO Set session