minor tweaks after code review

cryptomator · Oct 11, 2024 · 460b3fa · 460b3fa
1 parent 8aee735
commit 460b3fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/frontend/src/components/VaultList.vue b/frontend/src/components/VaultList.vue
@@ -40,7 +40,7 @@
 
     <Menu as="div" class="relative inline-block text-left">
       <div>
-        <MenuButton :disabled="isLicenseViolated || !canCreateVaults" class="inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-primary hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary" :class="{ 'cursor-not-allowed opacity-50': isLicenseViolated || !canCreateVaults }">
+        <MenuButton :disabled="isLicenseViolated || !canCreateVaults" class="inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-primary hover:bg-primary-d1 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary disabled:cursor-not-allowed disabled:opacity-50">
           {{ t('vaultList.addVault') }}
           <ChevronDownIcon class="-mr-1 ml-2 h-5 w-5" aria-hidden="true" />
         </MenuButton>
@@ -147,8 +147,8 @@ const roleOfSelectedVault = computed<VaultRole | 'NONE'>(() => {
   }
 });
 
-const isAdmin = ref<boolean>();
-const canCreateVaults = ref<boolean>();
+const isAdmin = ref<boolean>(false);
+const canCreateVaults = ref<boolean>(false);
 const licenseStatus = ref<LicenseUserInfoDto>();
 const isLicenseViolated = computed(() => {
   if (licenseStatus.value) {

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -17,11 +17,12 @@ import VaultList from '../components/VaultList.vue';
 import Forbidden from '../components/Forbidden.vue';
 
 function checkRole(role: string): NavigationGuardWithThis<undefined> {
-  return async () => {
+  return async (to, _) => {
     const auth = await authPromise;
     if (auth.hasRole(role)) {
       return true;
     } else {
+      console.warn(`Access denied: User requires role ${role} to access ${to.fullPath}`);
       return { path: '/app/forbidden', replace: true };
     }
   };