Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
Merge pull request #44 from admin-ch/release/4.11.x_Februar_23
Browse files Browse the repository at this point in the history
Backmerge Release/4.11.x Februar 23 to Master
  • Loading branch information
haraldloesing authored Mar 1, 2023
2 parents a1fc36f + 7e7018d commit cb19f0a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.6</version>
<version>2.7.8</version>
<relativePath/>
</parent>
<groupId>ch.admin.bag.covidcertificate</groupId>
<artifactId>cc-printing-service</artifactId>
<version>4.10.2</version>
<version>4.11.1</version>
<name>cc-printing-service</name>
<description>Service for printing Covid Certificates</description>

<properties>
<java.version>17</java.version>

<cc-backend-logging.version>1.0.5</cc-backend-logging.version>
<cc-backend-logging.version>1.0.6</cc-backend-logging.version>
<com.github.tomakehurst.version>2.27.2</com.github.tomakehurst.version>
<guava.version>31.1-jre</guava.version>
<jackson-core.version>2.14.1</jackson-core.version>
<jackson-core.version>2.14.2</jackson-core.version>
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<janino.version>3.1.9</janino.version>
<java-cfenv-boot.version>2.4.1</java-cfenv-boot.version>
Expand All @@ -30,7 +30,7 @@
<net.therore.logback.version>1.0.0</net.therore.logback.version>
<opencsv.version>5.7.1</opencsv.version>
<org.mockito.version>4.8.0</org.mockito.version>
<snakeyaml.version>1.32</snakeyaml.version>
<snakeyaml.version>1.33</snakeyaml.version>
<spring-cloud.version>2021.0.4</spring-cloud.version>
<springdoc.version>1.6.13</springdoc.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class PrintQueueController {
private final CertificatePrintService certificatePrintService;

@PostMapping
@PreAuthorize("hasRole('bag-cc-certificatecreator')")
@PreAuthorize("hasRole('bag-cc-print-cert')")
public ResponseEntity<HttpStatus> print(@Valid @RequestBody CertificatePrintRequestDto certificatePrintRequestDto) {
certificatePrintRequestDto.validate();
log.info("Adding certificate with uvci {} to the print queue", certificatePrintRequestDto.getUvci());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class PrintQueueControllerSecurityTest {
private static final JFixture fixture = new JFixture();

private static final String URL = "/api/v1/print";
private static final String VALID_USER_ROLE = "bag-cc-certificatecreator";
private static final String VALID_USER_ROLE = "bag-cc-print-cert";
private static final String INVALID_USER_ROLE = "invalid-role";
// Avoid port 8180, which is likely used by the local KeyCloak:
private static final int MOCK_SERVER_PORT = 8182;
Expand Down

0 comments on commit cb19f0a

Please sign in to comment.