Merge branch 'カート機能' into 'master'

カート機能途中

See merge request !19

pom.xml

@@ -55,6 +55,10 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/example/service/LoginUser.java

@@ -15,7 +15,7 @@ public class LoginUser extends org.springframework.security.core.userdetails.Use
 	private final User user;
 	
 	public LoginUser(User user){
-		super(user.getEmail(), user.getPassword(), AuthorityUtils.createAuthorityList(user.getRoles()));
+		super(user.getEmail(), user.getPassword(), getAuthorities(user.getRoles()));
 		this.user = user;
 	}
 	
@@ -24,7 +24,7 @@ public class LoginUser extends org.springframework.security.core.userdetails.Use
 	}
 	
 	//ログイン権限、文字列変更
-	private Collection<GrantedAuthority> getAuthorities(String role) {
+	private static Collection<GrantedAuthority> getAuthorities(String role) {
 		if (role.equals("ADMIN")) {
 			return AuthorityUtils.createAuthorityList("ROLE_ADMIN", "ROLE_GENERAL");
 		} else {

src/main/resources/templates/index.html

@@ -33,6 +33,7 @@
                     <div  class="col-md-6">
                         <div class="header-top-menu">
                             <ul class="nav nav-pills navbar-right">
+                            	<li><a sec:authorize="hasRole('ROLE_ADMIN')" th:href="@{/limited/admin/management}">Management</a></li>
                                 <!-- 履歴ページへ遷移 -->
                                 <li><a th:href="@{/limited/log/{id}(id=${user.id})}">My Purchase Log</a></li>
                                 <!-- カートページへ遷移 -->