From 87f4b9606f899998336c16f3ff60c14604f7ca6f Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Tue, 6 Oct 2020 15:47:59 +0300
Subject: [PATCH] Use Spring logical component BookAuth to retrieve book
 authorities

Signed-off-by: Pekka Helenius <fincer89@hotmail.com>
---
 .../src/main/resources/templates/booklist.html | 18 +++++++++---------
 .../templates/fragments/bookfields.html        |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bookstore/src/main/resources/templates/booklist.html b/bookstore/src/main/resources/templates/booklist.html
index 2930ce7..9feaeb3 100644
--- a/bookstore/src/main/resources/templates/booklist.html
+++ b/bookstore/src/main/resources/templates/booklist.html
@@ -95,22 +95,22 @@ h2consolepage = ${@environment.getProperty('spring.h2.console.path')}
 
 				<th
 				th:text="${#messages.msgOrNull('page.text.list.published')} ?: 'page.text.list.published'"
-				th:if="${#authorization.expression('hasAuthority(''MARKETING'')')}"
+				th:if="${#authorization.expression('hasAuthority(@BookAuth.SALES)')}"
 				>
 				page.text.list.published
 				</th>
 				
-				<th th:unless="${#authorization.expression('hasAuthority(''MARKETING'')')}">
+				<th th:unless="${#authorization.expression('hasAuthority(@BookAuth.SALES)')}">
 				</th>
 
 				<th
 				th:text="${#messages.msgOrNull('page.text.list.actions')} ?: 'page.text.list.actions'"
-				th:if="${#authorization.expression('hasAnyAuthority(''MARKETING'', ''HELPDESK'')')}"
+				th:if="${#authorization.expression('hasAnyAuthority(@BookAuth.SALES, @BookAuth.HELPDESK)')}"
 				>
 				page.text.list.actions
 				</th>
 				
-				<th th:unless="${#authorization.expression('hasAnyAuthority(''MARKETING'', ''HELPDESK'')')}">
+				<th th:unless="${#authorization.expression('hasAnyAuthority(@BookAuth.SALES, @BookAuth.HELPDESK)')}">
 				</th>
 
 				<th></th>
@@ -120,7 +120,7 @@ h2consolepage = ${@environment.getProperty('spring.h2.console.path')}
 			<tr 
 			th:each="book : ${books}"
 			th:object="${book}"
-			th:if="${book.publish == true or #authorization.expression('hasAuthority(''MARKETING'')')}"
+			th:if="${book.publish == true or #authorization.expression('hasAuthority(@BookAuth.SALES)')}"
 			>
 
 				<!--/*
@@ -194,14 +194,14 @@ h2consolepage = ${@environment.getProperty('spring.h2.console.path')}
 				</td>
 
 				<td>
-					<a class="btn btn-warning" sec:authorize="hasAnyAuthority('MARKETING', 'HELPDESK')"
+					<a class="btn btn-warning" sec:authorize="hasAnyAuthority(@BookAuth.SALES, @BookAuth.HELPDESK)"
 					th:href="@{__${editpage}__/{hash_id}(hash_id=${book.bookHash.hashId})}"
 					th:text="${#messages.msgOrNull('page.text.list.edit')} ?: 'page.text.list.edit'">
 					page.text.list.edit
 					</a>
 				</td>
 
-				<td th:unless="${#authorization.expression('hasAuthority(''ADMIN'')')}">
+				<td th:unless="${#authorization.expression('hasAuthority(@BookAuth.ADMIN)')}">
 				</td>
 
 				<td>
@@ -216,7 +216,7 @@ h2consolepage = ${@environment.getProperty('spring.h2.console.path')}
 
 			<tr>
 				<td>
-					<a class="btn btn-success" th:href="@{__${addpage}__}" sec:authorize="hasAuthority('MARKETING')"
+					<a class="btn btn-success" th:href="@{__${addpage}__}" sec:authorize="hasAuthority(@BookAuth.SALES)"
 					th:text="${#messages.msgOrNull('button.book.add')} ?: 'button.book.add'">
 					button.book.add
 					</a>
@@ -239,7 +239,7 @@ h2consolepage = ${@environment.getProperty('spring.h2.console.path')}
 
 			<tr style="background-color: #FFF !important;">
 				<td>
-					<a class="btn btn-info" th:href="@{__${apirefpage}__}" sec:authorize="hasAuthority('ADMIN')"
+					<a class="btn btn-info" th:href="@{__${apirefpage}__}" sec:authorize="hasAuthority(@BookAuth.ADMIN)"
 					th:text="${#messages.msgOrNull('button.page.apiref')} ?: 'button.page.apiref'">
 					button.page.apiref
 					</a>
diff --git a/bookstore/src/main/resources/templates/fragments/bookfields.html b/bookstore/src/main/resources/templates/fragments/bookfields.html
index d67713b..93ed202 100644
--- a/bookstore/src/main/resources/templates/fragments/bookfields.html
+++ b/bookstore/src/main/resources/templates/fragments/bookfields.html
@@ -172,7 +172,7 @@
 				</div>
 			</div>
 
-			<div class="form-group bookform-section" th:if="${#authorization.expression('hasAuthority(''MARKETING'')')}">
+			<div class="form-group bookform-section" th:if="${#authorization.expression('hasAuthority(@BookAuth.SALES)')}">
 				<label for="BookPrice"
 				th:text="${#messages.msgOrNull('book.price')} ?: 'book.price'">
 				book.price
@@ -232,7 +232,7 @@
 				</small>
 			</div>
 			
-			<div class="form-group bookform-section" th:if="${#authorization.expression('hasAuthority(''MARKETING'')')}">
+			<div class="form-group bookform-section" th:if="${#authorization.expression('hasAuthority(@BookAuth.SALES)')}">
 
 				<div class="checkbox-base">
 					<div>