From 55b09a6a3bc4a21201189d855e140308f05016fb Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 25 Nov 2016 13:20:15 +0300 Subject: juick-api: security WIP --- .../juick/www/configuration/WebSecurityConfig.java | 2 +- .../main/java/com/juick/www/entity/JuickUser.java | 62 ---------------------- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 juick-spring-www/src/main/java/com/juick/www/entity/JuickUser.java (limited to 'juick-spring-www/src/main/java/com/juick/www') diff --git a/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java index dcbd5459..3753a4aa 100644 --- a/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java +++ b/juick-spring-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java @@ -1,7 +1,7 @@ package com.juick.www.configuration; import com.juick.service.UserService; -import com.juick.www.entity.JuickUser; +import com.juick.server.security.entities.JuickUser; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; diff --git a/juick-spring-www/src/main/java/com/juick/www/entity/JuickUser.java b/juick-spring-www/src/main/java/com/juick/www/entity/JuickUser.java deleted file mode 100644 index 20d7889d..00000000 --- a/juick-spring-www/src/main/java/com/juick/www/entity/JuickUser.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.juick.www.entity; - -import com.juick.User; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.util.Collection; -import java.util.Collections; - -/** - * Created by aalexeev on 11/21/16. - */ -public class JuickUser implements UserDetails { - private static final GrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER"); - - private final com.juick.User user; - - - public JuickUser(com.juick.User user) { - this.user = user; - } - - @Override - public Collection getAuthorities() { - return Collections.singletonList(ROLE_USER); - } - - @Override - public String getPassword() { - return null; - } - - @Override - public String getUsername() { - return user.getName(); - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return false; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return !user.isBanned(); - } - - public User getUser() { - return user; - } -} -- cgit v1.2.3