Skip to content

Commit dba04c9

Browse files
SailRealSailReal
committed
Merge branch 'release/1.2.1'
2 parents 3639d0a + fea354a commit dba04c9

20 files changed

+37
-12
lines changed

‎backend/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.cryptomator</groupId>
66
<artifactId>hub-backend</artifactId>
7-
<version>1.2.0</version>
7+
<version>1.2.1</version>
88

99
<properties>
1010
<compiler-plugin.version>3.11.0 </compiler-plugin.version>
@@ -13,8 +13,7 @@
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<quarkus.container-image.group>cryptomator</quarkus.container-image.group>
1515
<quarkus.container-image.name>hub</quarkus.container-image.name>
16-
<quarkus.platform.version>3.1.0.Final</quarkus.platform.version>
17-
<quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel:22.3-java17</quarkus.native.builder-image>
16+
<quarkus.platform.version>3.2.4.Final</quarkus.platform.version>
1817
<quarkus.jib.base-jvm-image>eclipse-temurin:17-jre</quarkus.jib.base-jvm-image> <!-- irrelevant for -Pnative -->
1918
<jwt.version>4.4.0</jwt.version>
2019
<surefire-plugin.version>3.1.2</surefire-plugin.version>

‎backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.fasterxml.jackson.annotation.JsonSubTypes;
55
import com.fasterxml.jackson.annotation.JsonTypeInfo;
6+
import io.quarkus.runtime.annotations.RegisterForReflection;
67
import jakarta.annotation.security.RolesAllowed;
78
import jakarta.inject.Inject;
89
import jakarta.ws.rs.BadRequestException;
@@ -33,6 +34,7 @@
3334
import java.util.UUID;
3435

3536
@Path("/auditlog")
37+
@RegisterForReflection(targets = {UUID[].class})
3638
public class AuditLogResource {
3739

3840
@Inject

‎backend/src/main/java/org/cryptomator/hub/api/VaultResource.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.cryptomator.hub.api;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import io.quarkus.runtime.annotations.RegisterForReflection;
45
import io.quarkus.security.identity.SecurityIdentity;
56
import jakarta.annotation.security.RolesAllowed;
67
import jakarta.inject.Inject;
@@ -56,6 +57,7 @@
5657
import java.util.UUID;
5758

5859
@Path("/vaults")
60+
@RegisterForReflection(targets = {UUID[].class})
5961
public class VaultResource {
6062

6163
@Inject

‎backend/src/main/java/org/cryptomator/hub/entities/AccessToken.java

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
44
import io.quarkus.panache.common.Parameters;
5+
import io.quarkus.runtime.annotations.RegisterForReflection;
56
import jakarta.persistence.CascadeType;
67
import jakarta.persistence.Column;
78
import jakarta.persistence.Embeddable;
@@ -30,6 +31,7 @@
3031
AND u.id = :userId
3132
AND d.id = :deviceId
3233
""")
34+
@RegisterForReflection(targets = {UUID[].class})
3335
public class AccessToken extends PanacheEntityBase {
3436

3537
@EmbeddedId

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultAccessGrant.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
1213
@Entity
1314
@Table(name = "audit_event_vault_access_grant")
1415
@DiscriminatorValue(AuditEventVaultAccessGrant.TYPE)
16+
@RegisterForReflection(targets = {UUID[].class})
1517
public class AuditEventVaultAccessGrant extends AuditEvent {
1618

1719
public static final String TYPE = "VAULT_ACCESS_GRANT";

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultCreate.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
1213
@Entity
1314
@Table(name = "audit_event_vault_create")
1415
@DiscriminatorValue(AuditEventVaultCreate.TYPE)
16+
@RegisterForReflection(targets = {UUID[].class})
1517
public class AuditEventVaultCreate extends AuditEvent {
1618

1719
public static final String TYPE = "VAULT_CREATE";

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultKeyRetrieve.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -14,6 +15,7 @@
1415
@Entity
1516
@Table(name = "audit_event_vault_key_retrieve")
1617
@DiscriminatorValue(AuditEventVaultKeyRetrieve.TYPE)
18+
@RegisterForReflection(targets = {UUID[].class})
1719
public class AuditEventVaultKeyRetrieve extends AuditEvent {
1820

1921
public static final String TYPE = "VAULT_KEY_RETRIEVE";

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberAdd.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
1213
@Entity
1314
@Table(name = "audit_event_vault_member_add")
1415
@DiscriminatorValue(AuditEventVaultMemberAdd.TYPE)
16+
@RegisterForReflection(targets = {UUID[].class})
1517
public class AuditEventVaultMemberAdd extends AuditEvent {
1618

1719
public static final String TYPE = "VAULT_MEMBER_ADD";

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberRemove.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
1213
@Entity
1314
@Table(name = "audit_event_vault_member_remove")
1415
@DiscriminatorValue(AuditEventVaultMemberRemove.TYPE)
16+
@RegisterForReflection(targets = {UUID[].class})
1517
public class AuditEventVaultMemberRemove extends AuditEvent {
1618

1719
public static final String TYPE = "VAULT_MEMBER_REMOVE";

‎backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultUpdate.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cryptomator.hub.entities;
22

3+
import io.quarkus.runtime.annotations.RegisterForReflection;
34
import jakarta.persistence.Column;
45
import jakarta.persistence.DiscriminatorValue;
56
import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
1213
@Entity
1314
@Table(name = "audit_event_vault_update")
1415
@DiscriminatorValue(AuditEventVaultUpdate.TYPE)
16+
@RegisterForReflection(targets = {UUID[].class})
1517
public class AuditEventVaultUpdate extends AuditEvent {
1618

1719
public static final String TYPE = "VAULT_UPDATE";

‎backend/src/main/java/org/cryptomator/hub/entities/EffectiveVaultAccess.java

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
44
import io.quarkus.panache.common.Parameters;
5+
import io.quarkus.runtime.annotations.RegisterForReflection;
56
import jakarta.persistence.Column;
67
import jakarta.persistence.Embeddable;
78
import jakarta.persistence.EmbeddedId;
@@ -34,6 +35,7 @@ SELECT count( DISTINCT u)
3435
INNER JOIN EffectiveGroupMembership egm ON u.id = egm.id.memberId
3536
WHERE egm.id.groupId = :groupId
3637
""")
38+
@RegisterForReflection(targets = {UUID[].class})
3739
public class EffectiveVaultAccess extends PanacheEntityBase {
3840

3941
@EmbeddedId

‎backend/src/main/java/org/cryptomator/hub/entities/Vault.java

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
44
import io.quarkus.panache.common.Parameters;
5+
import io.quarkus.runtime.annotations.RegisterForReflection;
56
import jakarta.persistence.Column;
67
import jakarta.persistence.Entity;
78
import jakarta.persistence.FetchType;
@@ -40,6 +41,7 @@
4041
WHERE v.id IN :ids
4142
"""
4243
)
44+
@RegisterForReflection(targets = {UUID[].class})
4345
public class Vault extends PanacheEntityBase {
4446

4547
@Id

‎backend/src/main/java/org/cryptomator/hub/filters/VaultAdminOnlyFilterProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.auth0.jwt.interfaces.DecodedJWT;
1010
import com.auth0.jwt.interfaces.JWTVerifier;
1111
import com.auth0.jwt.interfaces.Verification;
12+
import io.quarkus.runtime.annotations.RegisterForReflection;
1213
import jakarta.ws.rs.NotFoundException;
1314
import jakarta.ws.rs.container.ContainerRequestContext;
1415
import jakarta.ws.rs.container.ContainerRequestFilter;
@@ -28,6 +29,7 @@
2829

2930
@Provider
3031
@VaultAdminOnlyFilter
32+
@RegisterForReflection(targets = {UUID[].class})
3133
public class VaultAdminOnlyFilterProvider implements ContainerRequestFilter {
3234

3335
public static final String VAULT_ADMIN_AUTHORIZATION = "Cryptomator-Vault-Admin-Authorization";

‎frontend/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cryptomator-hub",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"description": "Web-Frontend for Cryptomator Hub",
55
"author": "Skymatic GmbH",
66
"license": "AGPL-3.0-or-later",

‎frontend/src/components/NavigationBar.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<span class="text-sm font-semibold">{{ me.name }}</span>
4141
</div>
4242
<div v-for="(itemGroup, index) in profileDropdown" :key="`itemGroup-${index}`" class="py-1.5">
43-
<router-link v-for="item in itemGroup" :key="item.name" v-slot="{ navigate }" :to="item.to" >
44-
<MenuItem v-slot="{ active }" @click="navigate">
43+
<router-link v-for="item in itemGroup" :key="item.name" :to="item.to">
44+
<MenuItem v-slot="{ active }">
4545
<div :class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'flex items-center px-3.5 py-1.5 text-sm text-gray-700']">
4646
<component :is="item.icon" :class="[active ? 'text-gray-500' : 'text-gray-400', 'flex-none h-5 w-5 mr-3']" aria-hidden="true" />
4747
{{ t(item.name) }}

‎frontend/src/components/UserProfile.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="relative">
2727
<ListboxButton class="relative w-full inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary">
2828
<LanguageIcon class="-ml-1 mr-2 h-5 w-5" aria-hidden="true" />
29-
{{ t('userProfile.actions.editLanguage') }}
29+
{{ t('userProfile.actions.changeLanguage') }}
3030
<span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
3131
<ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
3232
</span>

‎frontend/src/i18n/de-DE.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
"userProfile.title": "Profil",
154154
"userProfile.actions.manageAccount": "Account verwalten",
155-
"userProfile.actions.editLanguage": "Sprache ändern",
155+
"userProfile.actions.changeLanguage": "Sprache ändern",
156156

157157
"vaultDetails.manageVault": "Tresor verwalten",
158158
"vaultDetails.description.header": "Beschreibung",

‎frontend/src/i18n/en-US.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
"userProfile.title": "Profile",
154154
"userProfile.actions.manageAccount": "Manage Account",
155-
"userProfile.actions.editLanguage": "Edit Language",
155+
"userProfile.actions.changeLanguage": "Change Language",
156156

157157
"vaultDetails.manageVault": "Manage Vault",
158158
"vaultDetails.warning.archived": "This vault is archived and cannot be unlocked.",

‎frontend/src/main.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const i18n = createI18n({
1212
fallbackLocale: defaultLocale,
1313
messages,
1414
datetimeFormats,
15-
globalInjection: true
15+
globalInjection: true,
16+
missingWarn: false,
17+
fallbackWarn: false
1618
});
1719

1820
createApp(App)

0 commit comments

Comments
 (0)