diff --git a/client/src/components/GlobalSearch.vue b/client/src/components/GlobalSearch.vue
index f74513f..c7a4d69 100644
--- a/client/src/components/GlobalSearch.vue
+++ b/client/src/components/GlobalSearch.vue
@@ -3,7 +3,7 @@
     <!-- Search Input -->
     <div class="search-container">
       <div class="search-input-wrapper">
-        <i class="material-icons">search</i>
+        <i aria-hidden="true" class="material-icons">search</i>
         <input
           v-model="query"
           type="text"
@@ -17,9 +17,10 @@
         <button
           v-if="query"
           class="clear-btn"
+          aria-label="Clear search"
           @click="clearSearch"
         >
-          <i class="material-icons">close</i>
+          <i aria-hidden="true" class="material-icons">close</i>
         </button>
       </div>
 
diff --git a/client/src/components/LanguageSwitcher.vue b/client/src/components/LanguageSwitcher.vue
index 7651f42..0c41004 100644
--- a/client/src/components/LanguageSwitcher.vue
+++ b/client/src/components/LanguageSwitcher.vue
@@ -1,15 +1,16 @@
 <template>
   <div class="language-switcher">
     <button
+      aria-label="Select language"
       @click="toggleDropdown"
       class="language-button"
       :title="$t('language.select')"
     >
-      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+      <svg aria-hidden="true" class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5h12M9 3v2m1.048 9.5A18.022 18.022 0 016.412 9m6.088 9h7M11 21l5-10 5 10M12.751 5C11.783 10.77 8.07 15.61 3 18.129" />
       </svg>
       <span class="language-code">{{ currentLocale.toUpperCase() }}</span>
-      <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': isOpen }" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+      <svg aria-hidden="true" class="w-4 h-4 transition-transform" :class="{ 'rotate-180': isOpen }" fill="none" stroke="currentColor" viewBox="0 0 24 24">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
       </svg>
     </button>
diff --git a/client/src/components/TocEntry.vue b/client/src/components/TocEntry.vue
index c362215..a45fed1 100644
--- a/client/src/components/TocEntry.vue
+++ b/client/src/components/TocEntry.vue
@@ -95,7 +95,8 @@ const handleClick = () => {
 .toc-entry-content {
   display: flex;
   align-items: center;
-  padding: 6px 8px;
+  min-height: 60px;
+  padding: 10px 8px;
   cursor: pointer;
   border-radius: 6px;
   transition: all 0.2s;
@@ -115,12 +116,12 @@ const handleClick = () => {
 .expand-btn {
   background: none;
   border: none;
-  padding: 4px;
+  min-width: 60px;
+  min-height: 60px;
+  padding: 10px;
   cursor: pointer;
   color: rgba(255, 255, 255, 0.6);
   flex-shrink: 0;
-  width: 20px;
-  height: 20px;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/client/src/components/TocSidebar.vue b/client/src/components/TocSidebar.vue
index 7da07ea..7a011c9 100644
--- a/client/src/components/TocSidebar.vue
+++ b/client/src/components/TocSidebar.vue
@@ -24,12 +24,13 @@
           <h3>Table of Contents</h3>
         </div>
         <button
+          aria-label="Pin table of contents"
           @click="isPinned = !isPinned"
           class="pin-btn"
           :class="{ 'pinned': isPinned }"
           :title="isPinned ? 'Unpin' : 'Pin open'"
         >
-          <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <svg aria-hidden="true" class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z" />
           </svg>
         </button>
@@ -215,17 +216,18 @@ watch(isPinned, (newVal) => {
   align-items: center;
   justify-content: center;
   gap: 8px;
-  padding: 12px 0;
+  padding: 10px 0;
   color: white;
   cursor: pointer;
-  min-width: 40px;
+  min-width: 60px;
+  min-height: 60px;
   flex-shrink: 0;
 }
 
 .toc-tab-text {
   writing-mode: vertical-rl;
   text-orientation: mixed;
-  font-size: 11px;
+  font-size: 16px;
   font-weight: 600;
   letter-spacing: 0.1em;
   color: rgba(255, 255, 255, 0.8);
@@ -259,20 +261,25 @@ watch(isPinned, (newVal) => {
 }
 
 .toc-header h3 {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 600;
   color: white;
   margin: 0;
 }
 
 .pin-btn {
-  padding: 6px;
+  min-width: 60px;
+  min-height: 60px;
+  padding: 10px;
   background: rgba(255, 255, 255, 0.1);
   border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 0.375rem;
   color: rgba(255, 255, 255, 0.6);
   cursor: pointer;
   transition: all 0.2s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .pin-btn:hover {
@@ -320,7 +327,7 @@ watch(isPinned, (newVal) => {
 
 .toc-empty p {
   margin-bottom: 16px;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .btn-extract {
@@ -328,11 +335,16 @@ watch(isPinned, (newVal) => {
   color: white;
   border: none;
   border-radius: 6px;
-  padding: 8px 16px;
-  font-size: 13px;
+  min-width: 60px;
+  min-height: 60px;
+  padding: 10px 16px;
+  font-size: 16px;
   font-weight: 500;
   cursor: pointer;
   transition: all 0.2s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .btn-extract:hover {
@@ -349,7 +361,7 @@ watch(isPinned, (newVal) => {
 }
 
 .toc-count {
-  font-size: 11px;
+  font-size: 16px;
   color: rgba(255, 255, 255, 0.6);
   margin-bottom: 8px;
   padding: 4px 8px;
diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue
index 06e47d5..823d918 100644
--- a/client/src/views/HomeView.vue
+++ b/client/src/views/HomeView.vue
@@ -113,10 +113,11 @@
               @keypress.enter="handleSearch"
             />
             <button
+              aria-label="Search documents"
               @click="handleSearch"
               class="absolute right-3 top-1/2 transform -translate-y-1/2 w-10 h-10 bg-gradient-to-r from-primary-500 to-secondary-500 rounded-xl flex items-center justify-center text-white shadow-md hover:shadow-lg transition-all duration-200 hover:scale-105 focus-visible:ring-2 focus-visible:ring-primary-500"
             >
-              <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
               </svg>
             </button>
@@ -305,11 +306,12 @@
                   <div class="flex items-center gap-3">
                     <span class="badge badge-success">Ready</span>
                     <button
+                      aria-label="Delete document"
                       @click="confirmDelete(doc, $event)"
                       class="p-2 rounded-lg text-white/50 hover:text-red-400 hover:bg-red-500/10 transition-colors opacity-0 group-hover:opacity-100"
                       title="Delete document"
                     >
-                      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <svg aria-hidden="true" class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
                       </svg>
                     </button>
diff --git a/client/src/views/LibraryView.vue b/client/src/views/LibraryView.vue
index f73f7a1..e14e7f3 100644
--- a/client/src/views/LibraryView.vue
+++ b/client/src/views/LibraryView.vue
@@ -5,8 +5,8 @@
       <div class="max-w-7xl mx-auto px-6 py-4">
         <div class="flex items-center justify-between">
           <div class="flex items-center space-x-3">
-            <button @click="$router.push('/')" class="w-10 h-10 bg-gradient-to-br from-primary-500 to-secondary-500 rounded-xl flex items-center justify-center shadow-md hover:scale-105 transition-transform">
-              <svg class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <button aria-label="Go to home page" @click="$router.push('/')" class="w-10 h-10 bg-gradient-to-br from-primary-500 to-secondary-500 rounded-xl flex items-center justify-center shadow-md hover:scale-105 transition-transform">
+              <svg aria-hidden="true" class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 15c3-2 6-2 9 0s6 2 9 0M3 9c3-2 6-2 9 0s6 2 9 0" />
               </svg>
             </button>
@@ -56,8 +56,8 @@
               <p class="text-sm text-white/70">Critical documents requiring quick access</p>
             </div>
           </div>
-          <button class="text-pink-400 hover:text-pink-300 text-sm font-medium flex items-center gap-2 transition-colors">
-            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <button aria-label="Pin important document" class="text-pink-400 hover:text-pink-300 text-sm font-medium flex items-center gap-2 transition-colors">
+            <svg aria-hidden="true" class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
             </svg>
             Pin Document
@@ -83,14 +83,14 @@
                   </div>
                 </div>
               </div>
-              <button class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
-                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+              <button aria-label="Bookmark Insurance Policy" class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
+                <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                   <path d="M5 4a2 2 0 012-2h6a2 2 0 012 2v14l-5-2.5L5 18V4z" />
                 </svg>
               </button>
             </div>
             <div class="expiry-alert">
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
               </svg>
               <span>Expires in 68 days (Dec 31, 2025)</span>
@@ -102,7 +102,7 @@
             <div class="flex items-start justify-between mb-4">
               <div class="flex items-start gap-3">
                 <div class="w-12 h-12 bg-gradient-to-br from-green-500 to-green-600 rounded-xl flex items-center justify-center flex-shrink-0 shadow-md group-hover:scale-110 transition-transform duration-300">
-                  <svg class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <svg aria-hidden="true" class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
                   </svg>
                 </div>
@@ -115,14 +115,14 @@
                   </div>
                 </div>
               </div>
-              <button class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
-                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+              <button aria-label="Bookmark LILIAN I Registration" class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
+                <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                   <path d="M5 4a2 2 0 012-2h6a2 2 0 012 2v14l-5-2.5L5 18V4z" />
                 </svg>
               </button>
             </div>
             <div class="compliance-badge">
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
               </svg>
               <span>Legally required aboard vessel</span>
@@ -134,7 +134,7 @@
             <div class="flex items-start justify-between mb-4">
               <div class="flex items-start gap-3">
                 <div class="w-12 h-12 bg-gradient-to-br from-purple-500 to-purple-600 rounded-xl flex items-center justify-center flex-shrink-0 shadow-md group-hover:scale-110 transition-transform duration-300">
-                  <svg class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <svg aria-hidden="true" class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
                   </svg>
                 </div>
@@ -147,14 +147,14 @@
                   </div>
                 </div>
               </div>
-              <button class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
-                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+              <button aria-label="Bookmark Owner's Manual" class="text-pink-400 hover:text-pink-300 p-1 rounded-lg hover:bg-white/10 transition-all">
+                <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                   <path d="M5 4a2 2 0 012-2h6a2 2 0 012 2v14l-5-2.5L5 18V4z" />
                 </svg>
               </button>
             </div>
             <div class="info-badge">
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
               </svg>
               <span>Emergency reference • 6.7 MB</span>
diff --git a/client/src/views/SearchView.vue b/client/src/views/SearchView.vue
index 4ee10fc..2815d52 100644
--- a/client/src/views/SearchView.vue
+++ b/client/src/views/SearchView.vue
@@ -4,9 +4,9 @@
     <header class="glass sticky top-0 z-40">
       <div class="max-w-7xl mx-auto px-6 py-4">
         <div class="flex items-center justify-between">
-          <button @click="$router.push('/')" class="flex items-center space-x-3 hover:opacity-80 transition-opacity focus-visible:ring-2 focus-visible:ring-primary-500 rounded-lg">
+          <button aria-label="Go to home page" @click="$router.push('/')" class="flex items-center space-x-3 hover:opacity-80 transition-opacity focus-visible:ring-2 focus-visible:ring-primary-500 rounded-lg">
             <div class="w-10 h-10 bg-gradient-to-br from-primary-500 to-secondary-500 rounded-xl flex items-center justify-center shadow-md">
-              <svg class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-6 h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 15c3-2 6-2 9 0s6 2 9 0M3 9c3-2 6-2 9 0s6 2 9 0" />
               </svg>
             </div>
@@ -100,11 +100,12 @@
             <button
               v-if="result.imageUrl"
               class="nv-chip"
+              aria-label="View diagram preview"
               @click.stop="togglePreview(result.id)"
               @mouseenter="showPreview(result.id)"
               @mouseleave="hidePreview(result.id)"
             >
-              <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z" />
               </svg>
               {{ $t('common.viewDetails') }}
@@ -116,9 +117,10 @@
             <button
               v-if="result.section"
               class="nv-chip-text"
+              aria-label="Jump to section"
               @click.stop="jumpToSection(result)"
             >
-              <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <svg aria-hidden="true" class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
               </svg>
               {{ $t('toc.jumpToSection') }}
@@ -370,20 +372,20 @@ onMounted(() => {
 }
 
 .nv-section {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 500;
   color: #e6e6ea;
   white-space: nowrap;
 }
 
 .nv-arrow {
-  font-size: 14px;
+  font-size: 16px;
   color: rgba(255, 255, 255, 0.4);
   font-weight: 300;
 }
 
 .nv-subsection {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 400;
   color: #cfa7ff;
   white-space: nowrap;
@@ -392,7 +394,7 @@ onMounted(() => {
 }
 
 .nv-page-tag {
-  font-size: 13px;
+  font-size: 16px;
   color: rgba(255, 255, 255, 0.4);
   font-weight: 400;
   flex-shrink: 0;
@@ -400,7 +402,7 @@ onMounted(() => {
 
 /* Snippet - compact with 2 line max */
 .nv-snippet {
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5;
   color: #e6e6ea;
   margin: 0 0 8px;
@@ -432,14 +434,14 @@ onMounted(() => {
   display: flex;
   gap: 10px;
   align-items: center;
-  font-size: 12px;
+  font-size: 16px;
 }
 
 .nv-chip {
   display: inline-flex;
   align-items: center;
   gap: 4px;
-  font-size: 11px;
+  font-size: 16px;
   padding: 3px 8px;
   border-radius: 8px;
   background: rgba(255, 230, 102, 0.12);
@@ -455,7 +457,7 @@ onMounted(() => {
 }
 
 .nv-chip-text {
-  font-size: 11px;
+  font-size: 16px;
   padding: 3px 8px;
   border-radius: 8px;
   background: rgba(207, 167, 255, 0.12);
@@ -509,7 +511,7 @@ onMounted(() => {
   gap: 8px;
   padding: 12px 0 8px 0;
   margin-top: 16px;
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
   color: #cfa7ff;
   letter-spacing: 0.02em;
@@ -530,7 +532,7 @@ onMounted(() => {
   display: flex;
   align-items: center;
   gap: 8px;
-  font-size: 12px;
+  font-size: 16px;
   color: #9aa0a6;
   padding: 12px 0;
 }
@@ -584,7 +586,7 @@ onMounted(() => {
 }
 
 .nv-context-noimage {
-  font-size: 10px;
+  font-size: 16px;
   color: #6b6b7a;
   text-align: center;
   padding: 8px;
@@ -592,7 +594,7 @@ onMounted(() => {
 
 .nv-context-page figcaption {
   margin-top: 4px;
-  font-size: 10px;
+  font-size: 16px;
   color: #9aa0a6;
 }
 
@@ -610,7 +612,7 @@ onMounted(() => {
 }
 
 .nv-expand-text .nv-snippet {
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.6;
   margin: 0;
 }
diff --git a/server/routes/documents.js b/server/routes/documents.js
index 9ba16b0..0aabde5 100644
--- a/server/routes/documents.js
+++ b/server/routes/documents.js
@@ -6,6 +6,7 @@
 import express from 'express';
 import { getDb } from '../db/db.js';
 import { getMeilisearchClient } from '../config/meilisearch.js';
+import { authenticateToken } from '../middleware/auth.middleware.js';
 import path from 'path';
 import fs from 'fs';
 import { rm } from 'fs/promises';
@@ -22,7 +23,7 @@ const MEILISEARCH_INDEX_NAME = process.env.MEILISEARCH_INDEX_NAME || 'navidocs-p
  * @param {string} id - Document UUID
  * @returns {Object} Document metadata with pages
  */
-router.get('/:id', async (req, res) => {
+router.get('/:id', authenticateToken, async (req, res) => {
   try {
     const { id } = req.params;
 
@@ -32,8 +33,7 @@ router.get('/:id', async (req, res) => {
       return res.status(400).json({ error: 'Invalid document ID format' });
     }
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
 
     const db = getDb();
 
@@ -176,7 +176,7 @@ router.get('/:id', async (req, res) => {
  * GET /api/documents/:id/pdf
  * Stream the original PDF file to the client (inline)
  */
-router.get('/:id/pdf', async (req, res) => {
+router.get('/:id/pdf', authenticateToken, async (req, res) => {
   try {
     const { id } = req.params;
 
@@ -185,7 +185,7 @@ router.get('/:id/pdf', async (req, res) => {
       return res.status(400).json({ error: 'Invalid document ID format' });
     }
 
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
     const db = getDb();
 
     const doc = db.prepare(`
@@ -221,7 +221,7 @@ router.get('/:id/pdf', async (req, res) => {
  * List documents with optional filtering
  * Query params: organizationId, entityId, documentType, status, limit, offset
  */
-router.get('/', async (req, res) => {
+router.get('/', authenticateToken, async (req, res) => {
   try {
     const {
       organizationId,
@@ -232,8 +232,7 @@ router.get('/', async (req, res) => {
       offset = 0
     } = req.query;
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
 
     const db = getDb();
 
@@ -351,7 +350,7 @@ router.get('/', async (req, res) => {
  * Hard delete a document (removes from DB, filesystem, and search index)
  * For single-tenant demo - simplified permissions
  */
-router.delete('/:id', async (req, res) => {
+router.delete('/:id', authenticateToken, async (req, res) => {
   const { id } = req.params;
 
   try {
diff --git a/server/routes/images.js b/server/routes/images.js
index ca61874..0b24f23 100644
--- a/server/routes/images.js
+++ b/server/routes/images.js
@@ -5,6 +5,7 @@
 
 import express from 'express';
 import { getDb } from '../db/db.js';
+import { authenticateToken } from '../middleware/auth.middleware.js';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
@@ -56,7 +57,7 @@ async function verifyDocumentAccess(documentId, userId, db) {
  * @param {string} id - Document UUID
  * @returns {Object} Array of image metadata
  */
-router.get('/documents/:id/images', async (req, res) => {
+router.get('/documents/:id/images', authenticateToken, async (req, res) => {
   try {
     const { id } = req.params;
 
@@ -66,8 +67,7 @@ router.get('/documents/:id/images', async (req, res) => {
       return res.status(400).json({ error: 'Invalid document ID format' });
     }
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
     const db = getDb();
 
     // Verify document access
@@ -141,7 +141,7 @@ router.get('/documents/:id/images', async (req, res) => {
  * @param {number} pageNum - Page number (1-based)
  * @returns {Object} Array of image metadata for the page
  */
-router.get('/documents/:id/pages/:pageNum/images', async (req, res) => {
+router.get('/documents/:id/pages/:pageNum/images', authenticateToken, async (req, res) => {
   try {
     const { id, pageNum } = req.params;
 
@@ -157,8 +157,7 @@ router.get('/documents/:id/pages/:pageNum/images', async (req, res) => {
       return res.status(400).json({ error: 'Invalid page number' });
     }
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
     const db = getDb();
 
     // Verify document access
@@ -246,7 +245,7 @@ router.get('/documents/:id/pages/:pageNum/images', async (req, res) => {
  * @param {string} imageId - Image UUID
  * @returns {Stream} Image file stream with proper Content-Type
  */
-router.get('/images/:imageId', imageLimiter, async (req, res) => {
+router.get('/images/:imageId', imageLimiter, authenticateToken, async (req, res) => {
   try {
     const { imageId } = req.params;
 
@@ -256,8 +255,7 @@ router.get('/images/:imageId', imageLimiter, async (req, res) => {
       return res.status(400).json({ error: 'Invalid image ID format' });
     }
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
     const db = getDb();
 
     // Get image metadata
diff --git a/server/routes/search.js b/server/routes/search.js
index 79b6085..9a12376 100644
--- a/server/routes/search.js
+++ b/server/routes/search.js
@@ -23,10 +23,9 @@ const INDEX_NAME = process.env.MEILISEARCH_INDEX_NAME || 'navidocs-pages';
  * @body {number} [expiresIn] - Token expiration in seconds (default: 3600 = 1 hour)
  * @returns {Object} { token, expiresAt, indexName }
  */
-router.post('/token', async (req, res) => {
+router.post('/token', authenticateToken, async (req, res) => {
   try {
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
     const { expiresIn = 3600 } = req.body; // Default 1 hour
 
     // Validate expiresIn
@@ -86,7 +85,7 @@ router.post('/token', async (req, res) => {
  * @body {number} [offset] - Results offset (default: 0)
  * @returns {Object} { hits, estimatedTotalHits, query, processingTimeMs }
  */
-router.post('/', async (req, res) => {
+router.post('/', authenticateToken, async (req, res) => {
   try {
     const { q, filters = {}, limit = 20, offset = 0 } = req.body;
 
@@ -94,8 +93,7 @@ router.post('/', async (req, res) => {
       return res.status(400).json({ error: 'Query parameter "q" is required' });
     }
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id';
+    const userId = req.user.userId;
 
     const db = getDb();
 
diff --git a/server/routes/stats.js b/server/routes/stats.js
index 54310d3..74fa626 100644
--- a/server/routes/stats.js
+++ b/server/routes/stats.js
@@ -8,6 +8,7 @@ import { getDb } from '../db/db.js';
 import { readdirSync, statSync } from 'fs';
 import { join } from 'path';
 import logger from '../utils/logger.js';
+import { authenticateToken, requireSystemAdmin } from '../middleware/auth.middleware.js';
 
 const router = express.Router();
 
@@ -15,7 +16,7 @@ const router = express.Router();
  * GET /api/stats
  * Get system statistics
  */
-router.get('/', async (req, res) => {
+router.get('/', authenticateToken, requireSystemAdmin, async (req, res) => {
   try {
     const db = getDb();
 
diff --git a/server/routes/upload.js b/server/routes/upload.js
index 69e1c8c..9f0bcde 100644
--- a/server/routes/upload.js
+++ b/server/routes/upload.js
@@ -14,6 +14,7 @@ import { dirname, join } from 'path';
 import { getDb } from '../db/db.js';
 import { validateFile, sanitizeFilename } from '../services/file-safety.js';
 import { addOcrJob } from '../services/queue.js';
+import { authenticateToken } from '../middleware/auth.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const router = express.Router();
@@ -44,13 +45,12 @@ await fs.mkdir(UPLOAD_DIR, { recursive: true });
  *
  * @returns {Object} { jobId, documentId }
  */
-router.post('/', upload.single('file'), async (req, res) => {
+router.post('/', authenticateToken, upload.single('file'), async (req, res) => {
   try {
     const file = req.file;
     const { title, documentType, organizationId, entityId, componentId, subEntityId } = req.body;
 
-    // TODO: Authentication middleware should provide req.user
-    const userId = req.user?.id || 'test-user-id'; // Temporary for testing
+    const userId = req.user.userId;
 
     // Validate required fields
     if (!file) {
diff --git a/server/services/auth.service.js b/server/services/auth.service.js
index ce5d8ad..10bf8e9 100644
--- a/server/services/auth.service.js
+++ b/server/services/auth.service.js
@@ -11,7 +11,10 @@ import { v4 as uuidv4 } from 'uuid';
 import { getDb } from '../config/db.js';
 import crypto from 'crypto';
 
-const JWT_SECRET = process.env.JWT_SECRET || 'your-jwt-secret-here-change-in-production';
+const JWT_SECRET = process.env.JWT_SECRET;
+if (!JWT_SECRET || JWT_SECRET.length < 32) {
+  throw new Error('JWT_SECRET environment variable is required and must be at least 32 characters long');
+}
 const JWT_EXPIRES_IN = process.env.JWT_EXPIRES_IN || '15m';
 const REFRESH_TOKEN_EXPIRES_IN = 7 * 24 * 60 * 60; // 7 days in seconds
 const BCRYPT_ROUNDS = 12;