diff options
Diffstat (limited to 'juick-spring-www')
5 files changed, 18 insertions, 11 deletions
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 d10f2532..692cf8cc 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,6 +1,6 @@ package com.juick.www.configuration; -import com.juick.entity.AnonymUser; +import com.juick.server.security.entities.JuickUser; import com.juick.service.UserService; import com.juick.service.security.JuickUserDetailsService; import org.springframework.context.annotation.Bean; @@ -9,7 +9,6 @@ import org.springframework.core.env.Environment; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import javax.annotation.Resource; @@ -38,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/settings", "/pm/**").authenticated() .anyRequest().permitAll() .and() - .anonymous().principal(AnonymUser.INSTANCE) + .anonymous().principal(JuickUser.ANONYM_USER).authorities(JuickUser.ANONYM_AUTHORITY) .and() .sessionManagement().invalidSessionUrl("/") .and() diff --git a/juick-spring-www/src/main/resources/messages.properties b/juick-spring-www/src/main/resources/messages.properties index 201c1f2c..42494512 100644 --- a/juick-spring-www/src/main/resources/messages.properties +++ b/juick-spring-www/src/main/resources/messages.properties @@ -31,4 +31,6 @@ message.sendLoginToXmpp=Отправьте <b>LOGIN</b> на <a href="xmpp:juick question.areRegistered=Уже зарегистрированы? title.help=Справка -title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь
\ No newline at end of file +title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь +title.index.anonym=Микроблоги Juick: популярные записи +title.index.user=Популярные
\ No newline at end of file diff --git a/juick-spring-www/src/main/resources/messages_en.properties b/juick-spring-www/src/main/resources/messages_en.properties index cbd3b5f9..fd1e17e0 100644 --- a/juick-spring-www/src/main/resources/messages_en.properties +++ b/juick-spring-www/src/main/resources/messages_en.properties @@ -1,7 +1,7 @@ date.format=MM/dd/yyyy link.settings=Settings -link.returnToMain=Return to home +link.returnToMain=Back to Home Page link.contacts=Contacts link.help=Help link.adv=Advertisement @@ -31,4 +31,6 @@ message.sendLoginToXmpp=Send <b>LOGIN</b> to <a href="xmpp:juick@juick.com?messa question.areRegistered=Are you registered? title.help=Help -title.loginOrSignup=Juick - Log In or Sign Up
\ No newline at end of file +title.loginOrSignup=Juick - Log In or Sign Up +title.index.anonym=Juick microblogs: popular posts +title.index.user=Popular
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html index 4cd32be3..7ee2156d 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html @@ -3,12 +3,16 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/mainLayout}"> <head> - <title>Главная страница</title> + <title th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" th:text="#{title.index.user}">Популярные</title> + <title th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title> </head> <body> <section layout:fragment="content"> <p>Главная страница !</p> + <p th:text="${#authorization.expression('hasRole(''ROLE_USER'')')}"></p> + <p th:text="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}"></p> + <p th:text="${#authentication}"></p> </section> <aside id="column"> <p layout:fragment="column"></p> diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html index 95714e10..c7cd1c81 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html @@ -20,8 +20,8 @@ th:value="${param.search}"/> </form> </div> - <section id="headdiv" th:switch="${visitor.isAnonym()}"> - <th:block th:case="false"> + <section id="headdiv"> + <th:block th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}"> <nav id="user"> <ul> <li><a href="/?show=my" th:href="@{/?show=my}" th:text="#{link.my}">Моя лента</a></li> @@ -35,13 +35,13 @@ <nav id="actions"> <ul> <li><a href="/#post" th:href="@{/#post}" th:text="#{link.postMessage}">Написать</a></li> - <li><a href="/ugnich" th:href="@{/{userName}(userName=${visitor.name})}" th:text="'@'+${visitor.name}">@ugnich</a></li> + <li><a href="/ugnich" th:href="@{/{userName}(userName=${#authentication.name})}" th:text="'@'+${#authentication.name}">@ugnich</a></li> <li><a href="/settings" th:href="@{/settings}" th:text="#{link.settings}" rel="nofollow">Настройки</a></li> <li><a href="/logout" th:href="@{/logout}" th:text="#{link.logout}">Выйти</a></li> </ul> </nav> </th:block> - <th:block th:case="true"> + <th:block th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}"> <p>[(#{message.loginForSending(@{/login})})]</p> </th:block> </section> |