Merge branch 'release/1.2.1'

cryptomator · Aug 15, 2023 · dba04c9 · dba04c9
2 parents 3639d0a + fea354a
commit dba04c9
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 12 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.cryptomator</groupId>
   <artifactId>hub-backend</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
 
   <properties>
     <compiler-plugin.version>3.11.0 </compiler-plugin.version>
@@ -13,8 +13,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.container-image.group>cryptomator</quarkus.container-image.group>
     <quarkus.container-image.name>hub</quarkus.container-image.name>
-    <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>
-    <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel:22.3-java17</quarkus.native.builder-image>
+    <quarkus.platform.version>3.2.4.Final</quarkus.platform.version>
     <quarkus.jib.base-jvm-image>eclipse-temurin:17-jre</quarkus.jib.base-jvm-image> <!-- irrelevant for -Pnative -->
     <jwt.version>4.4.0</jwt.version>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>

diff --git a/backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java b/backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
@@ -33,6 +34,7 @@
 import java.util.UUID;
 
 @Path("/auditlog")
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditLogResource {
 
 	@Inject

diff --git a/backend/src/main/java/org/cryptomator/hub/api/VaultResource.java b/backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
@@ -1,6 +1,7 @@
 package org.cryptomator.hub.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
@@ -56,6 +57,7 @@
 import java.util.UUID;
 
 @Path("/vaults")
+@RegisterForReflection(targets = {UUID[].class})
 public class VaultResource {
 
 	@Inject

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AccessToken.java b/backend/src/main/java/org/cryptomator/hub/entities/AccessToken.java
@@ -2,6 +2,7 @@
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import io.quarkus.panache.common.Parameters;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -30,6 +31,7 @@
 				AND u.id = :userId
 				AND d.id = :deviceId
 		""")
+@RegisterForReflection(targets = {UUID[].class})
 public class AccessToken extends PanacheEntityBase {
 
 	@EmbeddedId

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultAccessGrant.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultAccessGrant.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
 @Entity
 @Table(name = "audit_event_vault_access_grant")
 @DiscriminatorValue(AuditEventVaultAccessGrant.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultAccessGrant extends AuditEvent {
 
 	public static final String TYPE = "VAULT_ACCESS_GRANT";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultCreate.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultCreate.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
 @Entity
 @Table(name = "audit_event_vault_create")
 @DiscriminatorValue(AuditEventVaultCreate.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultCreate extends AuditEvent {
 
 	public static final String TYPE = "VAULT_CREATE";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultKeyRetrieve.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultKeyRetrieve.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -14,6 +15,7 @@
 @Entity
 @Table(name = "audit_event_vault_key_retrieve")
 @DiscriminatorValue(AuditEventVaultKeyRetrieve.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultKeyRetrieve extends AuditEvent {
 
 	public static final String TYPE = "VAULT_KEY_RETRIEVE";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberAdd.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberAdd.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
 @Entity
 @Table(name = "audit_event_vault_member_add")
 @DiscriminatorValue(AuditEventVaultMemberAdd.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultMemberAdd extends AuditEvent {
 
 	public static final String TYPE = "VAULT_MEMBER_ADD";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberRemove.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultMemberRemove.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
 @Entity
 @Table(name = "audit_event_vault_member_remove")
 @DiscriminatorValue(AuditEventVaultMemberRemove.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultMemberRemove extends AuditEvent {
 
 	public static final String TYPE = "VAULT_MEMBER_REMOVE";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultUpdate.java b/backend/src/main/java/org/cryptomator/hub/entities/AuditEventVaultUpdate.java
@@ -1,5 +1,6 @@
 package org.cryptomator.hub.entities;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
@@ -12,6 +13,7 @@
 @Entity
 @Table(name = "audit_event_vault_update")
 @DiscriminatorValue(AuditEventVaultUpdate.TYPE)
+@RegisterForReflection(targets = {UUID[].class})
 public class AuditEventVaultUpdate extends AuditEvent {
 
 	public static final String TYPE = "VAULT_UPDATE";

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/EffectiveVaultAccess.java b/backend/src/main/java/org/cryptomator/hub/entities/EffectiveVaultAccess.java
@@ -2,6 +2,7 @@
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import io.quarkus.panache.common.Parameters;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
@@ -34,6 +35,7 @@ SELECT count( DISTINCT u)
 				INNER JOIN EffectiveGroupMembership egm ON u.id = egm.id.memberId
 				WHERE egm.id.groupId = :groupId
 		""")
+@RegisterForReflection(targets = {UUID[].class})
 public class EffectiveVaultAccess extends PanacheEntityBase {
 
 	@EmbeddedId

diff --git a/backend/src/main/java/org/cryptomator/hub/entities/Vault.java b/backend/src/main/java/org/cryptomator/hub/entities/Vault.java
@@ -2,6 +2,7 @@
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import io.quarkus.panache.common.Parameters;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -40,6 +41,7 @@
 				WHERE v.id IN :ids
 				"""
 )
+@RegisterForReflection(targets = {UUID[].class})
 public class Vault extends PanacheEntityBase {
 
 	@Id

diff --git a/backend/src/main/java/org/cryptomator/hub/filters/VaultAdminOnlyFilterProvider.java b/backend/src/main/java/org/cryptomator/hub/filters/VaultAdminOnlyFilterProvider.java
@@ -9,6 +9,7 @@
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.JWTVerifier;
 import com.auth0.jwt.interfaces.Verification;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
@@ -28,6 +29,7 @@
 
 @Provider
 @VaultAdminOnlyFilter
+@RegisterForReflection(targets = {UUID[].class})
 public class VaultAdminOnlyFilterProvider implements ContainerRequestFilter {
 
 	public static final String VAULT_ADMIN_AUTHORIZATION = "Cryptomator-Vault-Admin-Authorization";

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptomator-hub",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Web-Frontend for Cryptomator Hub",
   "author": "Skymatic GmbH",
   "license": "AGPL-3.0-or-later",

diff --git a/frontend/src/components/NavigationBar.vue b/frontend/src/components/NavigationBar.vue
@@ -40,8 +40,8 @@
                   <span class="text-sm font-semibold">{{ me.name }}</span>
                 </div>
                 <div v-for="(itemGroup, index) in profileDropdown" :key="`itemGroup-${index}`" class="py-1.5">
-                  <router-link v-for="item in itemGroup" :key="item.name" v-slot="{ navigate }" :to="item.to" >
-                    <MenuItem v-slot="{ active }" @click="navigate">
+                  <router-link v-for="item in itemGroup" :key="item.name" :to="item.to">
+                    <MenuItem v-slot="{ active }">
                       <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']">
                         <component :is="item.icon" :class="[active ? 'text-gray-500' : 'text-gray-400', 'flex-none h-5 w-5 mr-3']" aria-hidden="true" />
                         {{ t(item.name) }}

diff --git a/frontend/src/components/UserProfile.vue b/frontend/src/components/UserProfile.vue
@@ -26,7 +26,7 @@
             <div class="relative">
               <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">
                 <LanguageIcon class="-ml-1 mr-2 h-5 w-5" aria-hidden="true" />
-                {{ t('userProfile.actions.editLanguage') }}
+                {{ t('userProfile.actions.changeLanguage') }}
                 <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
                   <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
                 </span>

diff --git a/frontend/src/i18n/de-DE.json b/frontend/src/i18n/de-DE.json
@@ -152,7 +152,7 @@
 
   "userProfile.title": "Profil",
   "userProfile.actions.manageAccount": "Account verwalten",
-  "userProfile.actions.editLanguage": "Sprache ändern",
+  "userProfile.actions.changeLanguage": "Sprache ändern",
 
   "vaultDetails.manageVault": "Tresor verwalten",
   "vaultDetails.description.header": "Beschreibung",

diff --git a/frontend/src/i18n/en-US.json b/frontend/src/i18n/en-US.json
@@ -152,7 +152,7 @@
 
   "userProfile.title": "Profile",
   "userProfile.actions.manageAccount": "Manage Account",
-  "userProfile.actions.editLanguage": "Edit Language",
+  "userProfile.actions.changeLanguage": "Change Language",
 
   "vaultDetails.manageVault": "Manage Vault",
   "vaultDetails.warning.archived": "This vault is archived and cannot be unlocked.",

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -12,7 +12,9 @@ const i18n = createI18n({
   fallbackLocale: defaultLocale,
   messages,
   datetimeFormats,
-  globalInjection: true
+  globalInjection: true,
+  missingWarn: false,
+  fallbackWarn: false
 });
 
 createApp(App)