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

formatting

Browse Source
This commit is contained in:
Anthony Stirling 2025-06-09 13:58:19 +01:00
parent 7c0b87efe8
commit 7d062c0824
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -147,6 +147,11 @@ subprojects {
}
}
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
dependsOn "spotlessApply"
}
licenseReport {
renderers = [new JsonReportRenderer()]
allowedLicensesFile = new File("$projectDir/allowed-licenses.json")

6
proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
View File

@ -51,7 +51,6 @@ public class InitialSecuritySetup {
}
}
private void assignUsersToDefaultTeamIfMissing() {
Team defaultTeam = teamService.getOrCreateDefaultTeam();
List<User> usersWithoutTeam = userService.getUsersWithoutTeam();
@ -61,9 +60,10 @@ public class InitialSecuritySetup {
}
userService.saveAll(usersWithoutTeam); // batch save
log.info("Assigned {} user(s) without a team to the default team.", usersWithoutTeam.size());
log.info(
"Assigned {} user(s) without a team to the default team.", usersWithoutTeam.size());
}
private void initializeAdminUser() throws SQLException, UnsupportedProviderException {
String initialUsername =
applicationProperties.getSecurity().getInitialLogin().getUsername();

6
proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
View File

@ -60,7 +60,7 @@ public class AccountWebController {
private final UserRepository userRepository;
private final boolean runningEE;
private final TeamRepository teamRepository;
public AccountWebController(
ApplicationProperties applicationProperties,
SessionPersistentRegistry sessionPersistentRegistry,
@ -71,7 +71,7 @@ public class AccountWebController {
this.sessionPersistentRegistry = sessionPersistentRegistry;
this.userRepository = userRepository;
this.runningEE = runningEE;
this.teamRepository=teamRepository;
this.teamRepository = teamRepository;
}
@GetMapping("/login")
@ -338,7 +338,7 @@ public class AccountWebController {
List<Team> allTeams = teamRepository.findAll();
model.addAttribute("teams", allTeams);
model.addAttribute("maxPaidUsers", applicationProperties.getPremium().getMaxUsers());
return "adminSettings";
}

6
proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java
View File

@ -5,9 +5,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Annotation to mark endpoints that require a Pro or higher license.
*/
/** Annotation to mark endpoints that require a Pro or higher license. */
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
public @interface PremiumEndpoint {}
public @interface PremiumEndpoint {}

5
proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java
View File

@ -18,7 +18,8 @@ public class PremiumEndpointAspect {
this.runningProOrHigher = runningProOrHigher;
}
@Around("@annotation(stirling.software.proprietary.security.config.PremiumEndpoint) || @within(stirling.software.proprietary.security.config.PremiumEndpoint)")
@Around(
"@annotation(stirling.software.proprietary.security.config.PremiumEndpoint) || @within(stirling.software.proprietary.security.config.PremiumEndpoint)")
public Object checkPremiumAccess(ProceedingJoinPoint joinPoint) throws Throwable {
if (!runningProOrHigher) {
throw new ResponseStatusException(
@ -26,4 +27,4 @@ public class PremiumEndpointAspect {
}
return joinPoint.proceed();
}
}
}

6
proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
View File

@ -21,7 +21,11 @@ import stirling.software.common.model.exception.UnsupportedProviderException;
@Slf4j
@Getter
@Configuration
@EnableJpaRepositories(basePackages = {"stirling.software.proprietary.security.database.repository", "stirling.software.proprietary.security.repository"})
@EnableJpaRepositories(
basePackages = {
"stirling.software.proprietary.security.database.repository",
"stirling.software.proprietary.security.repository"
})
@EntityScan({"stirling.software.proprietary.security.model", "stirling.software.proprietary.model"})
public class DatabaseConfig {

2
proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java
View File

@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import lombok.RequiredArgsConstructor;
import stirling.software.proprietary.model.Team;
import stirling.software.proprietary.security.config.PremiumEndpoint;
import stirling.software.proprietary.security.database.repository.SessionRepository;
import stirling.software.proprietary.security.database.repository.UserRepository;
import stirling.software.proprietary.security.model.User;
@ -25,7 +24,6 @@ import stirling.software.proprietary.security.repository.TeamRepository;
@Controller
@RequestMapping("/teams")
@RequiredArgsConstructor
public class TeamWebController {
private final TeamRepository teamRepository;