Skip to content

Commit 83adf31

Browse files
committed
Merge branch 'release/1.4.6'
2 parents de8c4bb + de54072 commit 83adf31

36 files changed

+1072
-580
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
working-directory: frontend
3737
run: npm run dist
3838
- name: SonarCloud Scan Frontend
39-
uses: SonarSource/sonarqube-scan-action@v5
39+
uses: SonarSource/sonarqube-scan-action@v6
4040
with:
4141
projectBaseDir: frontend
4242
args: >

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.4.6](https://github.com/cryptomator/hub/compare/1.4.5...1.4.6)
9+
10+
### Changed
11+
12+
- Updated Keycloak to 26.4.1
13+
- Update Quarkus to 3.20.3 LTS
14+
15+
### Fixed
16+
17+
- Show admin section of Hub when Keycloak version is not available (#361)
18+
819
## [1.4.5](https://github.com/cryptomator/hub/compare/1.4.4...1.4.5)
920

1021
### Fixed

backend/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.cryptomator</groupId>
66
<artifactId>hub-backend</artifactId>
7-
<version>1.4.5</version>
7+
<version>1.4.6</version>
88

99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<project.jdk.version>21</project.jdk.version>
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
13-
<quarkus.platform.version>3.20.2</quarkus.platform.version>
13+
<quarkus.platform.version>3.20.3</quarkus.platform.version>
1414
<jwt.version>4.5.0</jwt.version>
15-
<compiler-plugin.version>3.14.0</compiler-plugin.version>
15+
<compiler-plugin.version>3.14.1</compiler-plugin.version>
1616
<dependency-plugin.version>3.8.1</dependency-plugin.version>
17-
<surefire-plugin.version>3.5.3</surefire-plugin.version>
18-
<failsafe-plugin.version>3.5.3</failsafe-plugin.version>
17+
<surefire-plugin.version>3.5.4</surefire-plugin.version>
18+
<failsafe-plugin.version>3.5.4</failsafe-plugin.version>
1919
<junit-tree-reporter.version>1.4.0</junit-tree-reporter.version>
2020
</properties>
2121

backend/src/main/java/org/cryptomator/hub/api/VersionResource.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ public class VersionResource {
2525
@Operation(summary = "get version of hub and keycloak")
2626
@APIResponse(responseCode = "200")
2727
public VersionDto getVersion() {
28-
var keycloakVersion = keycloak.serverInfo().getInfo().getSystemInfo().getVersion();
28+
String keycloakVersion = null;
29+
var keycloakSystemInfo = keycloak.serverInfo().getInfo().getSystemInfo();
30+
if (keycloakSystemInfo != null) {
31+
keycloakVersion = keycloakSystemInfo.getVersion();
32+
}
2933
return new VersionDto(hubVersion, keycloakVersion);
3034
}
3135

backend/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ hub.keycloak.oidc.cryptomator-client-id=cryptomator
3333
%dev.quarkus.keycloak.devservices.start-command=start-dev
3434
%dev.quarkus.keycloak.devservices.port=8180
3535
%dev.quarkus.keycloak.devservices.service-name=quarkus-cryptomator-hub
36-
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:26.3.2.1
36+
%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:26.4.1
3737
%dev.quarkus.oidc.devui.grant.type=code
3838
# OIDC will be mocked during unit tests. Use fake auth url to prevent dev services to start:
3939
%test.quarkus.oidc.auth-server-url=http://localhost:43210/dev/null

backend/src/main/resources/cryptomator-realm.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@
160160
},
161161
"clientRoles": {
162162
"realm-management": [
163-
"realm-admin"
163+
"realm-admin",
164+
"view-system"
164165
]
165166
}
166167
},

0 commit comments

Comments
 (0)