Merge #487: Rename button "download torrent" to "download private torrent" when the tracker is in close mode

385b695 refactor: improve error messages for cypress DB user tasks (Jose Celano)
e7ac640 fix: helper to check if the tracker is open (Jose Celano)
e2171b6 fix: redirect to sign in to download a torrent (Jose Celano)
2d8a446 refactor: rename helper (Jose Celano)
1d99c2a fix: download torrent button is always shown (Jose Celano)

Pull request description:

  - [x] Fix bug. The button was always shown even when the tracker was private and the user was not logged in.
  - [x] Fix bug. The function to detect tracker mode was not working.
  - [x] Rename the button for private trackers.
  - [x] Improve error message when tasks in the database for users fail.

ACKs for top commit:
  josecelano:
    ACK 385b695

Tree-SHA512: 1a826d76c74f53bbcb4d42eaa835a3d0df55f50cd4eb1b876d0169f35987e09451c2fe9ab52a5ad8df3272d5bfb0595c44805e4ae4b785013788f7bcf30996bf

Author: josecelano

components/torrent/TorrentActionCard.vue

@@ -99,9 +99,9 @@
         <div />
 
         <div class="flex flex-row gap-3">
-          <template v-if="showDownloadButtons">
+          <template v-if="showDownloadButtons()">
             <button class="btn btn-primary grow" data-cy="torrent-action-download" @click="downloadTorrent(torrent.info_hash, torrent.name)">
-              download torrent
+              download {{ isTrackerClose()? 'private' : '' }} torrent
             </button>
             <button class="w-12 p-0 btn btn-primary">
               <a data-cy="torrent-action-magnet-link" class="flex items-center" :href="torrent.magnet_link">
@@ -110,18 +110,7 @@
             </button>
           </template>
           <template v-else>
-            <button
-              class="h-12 px-4 mt-3 text-sm font-medium text-black bg-white rounded-2xl"
-              @click="$store.dispatch('openAuthModal')"
-            >
-              Please sign in to download
-            </button>
-            <button
-              class="h-12 px-4 mt-3 text-sm font-medium text-white bg-sky-500 rounded-2xl"
-              @click="$store.dispatch('openAuthModal')"
-            >
-              Please sign in to download
-            </button>
+              <NuxtLink to="/signin">Private tracker. Sign in to download torrent or magnet link.</NuxtLink>
           </template>
         </div>
 
@@ -156,7 +145,7 @@ import {
   downloadTorrent,
   useRestApi,
   isUserLoggedIn,
-  isTrackerPublic, navigateTo
+  isTrackerOpen, isTrackerClose, navigateTo
 } from "#imports";
 import { canEditThisTorrent } from "~/composables/helpers";
 
@@ -178,8 +167,8 @@ function hasEditRights (): boolean {
   return canEditThisTorrent(props.torrent);
 }
 
-function showDownloadButtons () {
-  return isUserLoggedIn() || isTrackerPublic();
+function showDownloadButtons (): boolean {
+  return isUserLoggedIn() || isTrackerOpen();
 }
 
 function seedersPercentage () {
@@ -209,4 +198,8 @@ function deleteTorrent () {
       }, 10000);
     });
 }
+
+function navigateToSignIn () {
+  navigateTo("/signin", { replace: true });
+}
 </script>

composables/helpers.ts

@@ -1,11 +1,18 @@
 import { TorrentResponse, TrackerMode } from "torrust-index-types-lib";
 import { useRestApi, useSettings, useUser } from "~/composables/states";
 
-export function isTrackerPublic (): boolean {
+export function isTrackerOpen (): boolean {
   const settings = useSettings();
 
-  return settings.value.tracker_mode === TrackerMode.Public ||
-        settings.value.tracker_mode === TrackerMode.Whitelisted;
+  // todo: we are not using the type TrackerMode in
+  // settings.value.tracker_mode
+
+  return settings.value.tracker_mode === "Public" ||
+        settings.value.tracker_mode === "Whitelisted";
+}
+
+export function isTrackerClose (): boolean {
+  return !isTrackerOpen();
 }
 
 export function isUserLoggedIn (): boolean {

cypress/e2e/contexts/user/tasks.ts

@@ -9,6 +9,10 @@ export const grantAdminRole = async (username: string, db_config: DatabaseConfig
   try {
     const result = await runDatabaseQuery(getUserIdByUsernameQuery(username), db_config);
 
+    if (result === undefined || result.user_id === undefined) {
+      throw new Error(`Can't grant admin role to user. No user found with username: ${username} in database: ${db_config.filepath}`);
+    }
+
     const user_id = result.user_id;
 
     await runDatabaseQuery(grantAdminRoleQuery(user_id), db_config);
@@ -26,6 +30,10 @@ export const deleteUser = async (username: string, db_config: DatabaseConfig): P
   try {
     const result = await runDatabaseQuery(getUserIdByUsernameQuery(username), db_config);
 
+    if (result === undefined || result.user_id === undefined) {
+      throw new Error(`Can't delete user. No user found with username: ${username} in database: ${db_config.filepath}`);
+    }
+
     const user_id = result.user_id;
 
     await runDatabaseQuery(deleteUserAuthenticationQuery(user_id), db_config);