From 5b4983260931a4bf5fc8f51d4db38e260deccfc8 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 21 Mar 2025 09:37:25 -0700
Subject: [PATCH] Revert "Fix: fix auto-close after giving a document away"

This reverts commit d0ec06d684fd1c8a656bd6d173a7d23c33bb5b0c.
---
 .../document-detail.component.spec.ts         |  8 ++----
 .../document-detail.component.ts              |  6 ++--
 src/documents/tests/test_api_documents.py     | 28 -------------------
 src/documents/views.py                        | 13 ++-------
 4 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
index a90fe0148..b85a7eaf4 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -1,9 +1,5 @@
 import { DatePipe } from '@angular/common'
-import {
-  HttpErrorResponse,
-  provideHttpClient,
-  withInterceptorsFromDi,
-} from '@angular/common/http'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import {
   HttpTestingController,
   provideHttpClientTesting,
@@ -507,7 +503,7 @@ describe('DocumentDetailComponent', () => {
     const updateSpy = jest.spyOn(documentService, 'update')
     const toastSpy = jest.spyOn(toastService, 'showInfo')
     updateSpy.mockImplementation(() =>
-      throwError(() => new HttpErrorResponse({ status: 403 }))
+      throwError(() => new Error('failed to save'))
     )
     component.save(true)
     expect(updateSpy).toHaveBeenCalled()
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 45d5a8bc1..27a74cfcd 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -824,13 +824,11 @@ export class DocumentDetailComponent
         },
         error: (error) => {
           this.networkActive = false
-          if (error.status === 403) {
-            // e.g. document was 'given away'
-            this.openDocumentService.setDirty(this.document, false)
+          if (!this.userCanEdit) {
             this.toastService.showInfo(
               $localize`Document "${this.document.title}" saved successfully.`
             )
-            this.close()
+            close && this.close()
           } else {
             this.error = error.error
             this.toastService.showError(
diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py
index 40a5d1477..a0a380e41 100644
--- a/src/documents/tests/test_api_documents.py
+++ b/src/documents/tests/test_api_documents.py
@@ -262,34 +262,6 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
         response = self.client.get(f"/api/documents/{doc.pk}/thumb/")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-    def test_document_given_away(self):
-        """
-        GIVEN:
-            - Document with owner
-        WHEN:
-            - Document is update and given away
-        THEN:
-            - 403 Forbidden is returned
-        """
-        non_superuser = User.objects.create_user(username="test")
-        non_superuser.user_permissions.add(*Permission.objects.all())
-        self.client.force_authenticate(user=non_superuser)
-
-        doc = Document.objects.create(
-            title="none",
-            checksum="123",
-            mime_type="application/pdf",
-            owner=non_superuser,
-        )
-
-        response = self.client.patch(
-            f"/api/documents/{doc.pk}/",
-            {"owner": self.user.id},
-            format="json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-
     @override_settings(FILENAME_FORMAT="")
     def test_download_with_archive(self):
         content = b"This is a test"
diff --git a/src/documents/views.py b/src/documents/views.py
index d1de0ddea..7298391f2 100644
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -580,24 +580,15 @@ class DocumentViewSet(
 
     def update(self, request, *args, **kwargs):
         response = super().update(request, *args, **kwargs)
-        try:
-            doc = self.get_object()
-        except Http404:
-            # if we get this far document it was probably 'given away'
-            doc = Document.objects.get(id=kwargs["pk"])
-
         from documents import index
 
-        index.add_or_update_document(doc)
+        index.add_or_update_document(self.get_object())
 
         document_updated.send(
             sender=self.__class__,
-            document=doc,
+            document=self.get_object(),
         )
 
-        if not has_perms_owner_aware(request.user, "change_document", doc):
-            return HttpResponseForbidden("Insufficient permissions")
-
         return response
 
     def destroy(self, request, *args, **kwargs):