saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-06-02 15:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Demo user

Browse Source
This commit is contained in:
Anthony Stirling 2023-12-27 22:56:51 +00:00
parent 78da44ad83
commit 3911be0177
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/stirling/software/SPDF/controller/api/UserController.java
View File

@ -33,6 +33,7 @@ public class UserController {
@Autowired @Autowired
private UserService userService; private UserService userService;
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/register") @PostMapping("/register")
public String register(@RequestParam String username, @RequestParam String password, Model model) { public String register(@RequestParam String username, @RequestParam String password, Model model) {
if(userService.usernameExists(username)) { if(userService.usernameExists(username)) {
@ -44,6 +45,7 @@ public class UserController {
return "redirect:/login?registered=true"; return "redirect:/login?registered=true";
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/change-username-and-password") @PostMapping("/change-username-and-password")
public RedirectView changeUsernameAndPassword(Principal principal, public RedirectView changeUsernameAndPassword(Principal principal,
@RequestParam String currentPassword, @RequestParam String currentPassword,
@ -86,7 +88,7 @@ public class UserController {
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/change-username") @PostMapping("/change-username")
public RedirectView changeUsername(Principal principal, public RedirectView changeUsername(Principal principal,
@RequestParam String currentPassword, @RequestParam String currentPassword,
@ -124,6 +126,7 @@ public class UserController {
return new RedirectView("/login?messageType=credsUpdated"); return new RedirectView("/login?messageType=credsUpdated");
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/change-password") @PostMapping("/change-password")
public RedirectView changePassword(Principal principal, public RedirectView changePassword(Principal principal,
@RequestParam String currentPassword, @RequestParam String currentPassword,
@ -155,7 +158,7 @@ public class UserController {
return new RedirectView("/login?messageType=credsUpdated"); return new RedirectView("/login?messageType=credsUpdated");
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/updateUserSettings") @PostMapping("/updateUserSettings")
public String updateUserSettings(HttpServletRequest request, Principal principal) { public String updateUserSettings(HttpServletRequest request, Principal principal) {
Map<String, String[]> paramMap = request.getParameterMap(); Map<String, String[]> paramMap = request.getParameterMap();
@ -216,6 +219,7 @@ public class UserController {
return "redirect:/addUsers"; return "redirect:/addUsers";
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/get-api-key") @PostMapping("/get-api-key")
public ResponseEntity<String> getApiKey(Principal principal) { public ResponseEntity<String> getApiKey(Principal principal) {
if (principal == null) { if (principal == null) {
@ -229,6 +233,7 @@ public class UserController {
return ResponseEntity.ok(apiKey); return ResponseEntity.ok(apiKey);
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/update-api-key") @PostMapping("/update-api-key")
public ResponseEntity<String> updateApiKey(Principal principal) { public ResponseEntity<String> updateApiKey(Principal principal) {
if (principal == null) { if (principal == null) {

4
src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
View File

@ -70,7 +70,7 @@ public class AccountWebController {
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@GetMapping("/account") @GetMapping("/account")
public String account(HttpServletRequest request, Model model, Authentication authentication) { public String account(HttpServletRequest request, Model model, Authentication authentication) {
if (authentication == null || !authentication.isAuthenticated()) { if (authentication == null || !authentication.isAuthenticated()) {
@ -117,7 +117,7 @@ public class AccountWebController {
} }
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@GetMapping("/change-creds") @GetMapping("/change-creds")
public String changeCreds(HttpServletRequest request, Model model, Authentication authentication) { public String changeCreds(HttpServletRequest request, Model model, Authentication authentication) {
if (authentication == null || !authentication.isAuthenticated()) { if (authentication == null || !authentication.isAuthenticated()) {

4
src/main/java/stirling/software/SPDF/model/Role.java
View File

@ -17,7 +17,9 @@ public enum Role {
WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20), WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20),
INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE); INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
DEMO_USER("ROLE_DEMO_USER", 100, 100);
private final String roleId; private final String roleId;
private final int apiCallsPerDay; private final int apiCallsPerDay;

1
src/main/resources/messages_ar_AR.properties
View File

@ -119,6 +119,7 @@ adminUserSettings.role=Role
adminUserSettings.actions=Actions adminUserSettings.actions=Actions
adminUserSettings.apiUser=Limited API User adminUserSettings.apiUser=Limited API User
adminUserSettings.webOnlyUser=Web Only User adminUserSettings.webOnlyUser=Web Only User
adminUserSettings.demoUser=Demo User (No custom settings)
adminUserSettings.forceChange=Force user to change username/password on login adminUserSettings.forceChange=Force user to change username/password on login
adminUserSettings.submit=Save User adminUserSettings.submit=Save User

1
src/main/resources/messages_en_GB.properties
View File

@ -119,6 +119,7 @@ adminUserSettings.role=Role
adminUserSettings.actions=Actions adminUserSettings.actions=Actions
adminUserSettings.apiUser=Limited API User adminUserSettings.apiUser=Limited API User
adminUserSettings.webOnlyUser=Web Only User adminUserSettings.webOnlyUser=Web Only User
adminUserSettings.demoUser=Demo User (No custom settings)
adminUserSettings.forceChange = Force user to change username/password on login adminUserSettings.forceChange = Force user to change username/password on login
adminUserSettings.submit=Save User adminUserSettings.submit=Save User

1
src/main/resources/templates/addUsers.html
View File

@ -62,6 +62,7 @@
<option value="ROLE_USER" th:text="#{adminUserSettings.user}">User</option> <option value="ROLE_USER" th:text="#{adminUserSettings.user}">User</option>
<option value="ROLE_LIMITED_API_USER" th:text="#{adminUserSettings.apiUser}">Limited API User</option> <option value="ROLE_LIMITED_API_USER" th:text="#{adminUserSettings.apiUser}">Limited API User</option>
<option value="ROLE_WEB_ONLY_USER" th:text="#{adminUserSettings.webOnlyUser}">Web Only User</option> <option value="ROLE_WEB_ONLY_USER" th:text="#{adminUserSettings.webOnlyUser}">Web Only User</option>
<option value="ROLE_DEMO_USER" th:text="#{adminUserSettings.demoUser}">Demo User</option>
</select> </select>
</div> </div>
<div class="mb-3"> <div class="mb-3">