get rid of public link url hash (#2596) (#2615)

Co-authored-by: Florian Schade <f.schade@icloud.com>
cs3org · Mar 7, 2022 · d043e9d · d043e9d
1 parent ee9653f
commit d043e9d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/changelog/unreleased/change-public-link-hash.md b/changelog/unreleased/change-public-link-hash.md
@@ -0,0 +1,7 @@
+Change: Remove hash from public link urls
+
+Public link urls do not contain the hash anymore, this is needed to support the ocis and web history mode.
+
+https://github.com/cs3org/reva/pull/2596
+https://github.com/owncloud/ocis/pull/3109
+https://github.com/owncloud/web/pull/6363
diff --git a/internal/http/services/owncloud/ocdav/ocdav.go b/internal/http/services/owncloud/ocdav/ocdav.go
@@ -222,8 +222,9 @@ func (s *svc) Handler() http.Handler {
 			head, r.URL.Path = router.ShiftPath(r.URL.Path)
 			if head == "s" {
 				token := r.URL.Path
-				url := s.c.PublicURL + path.Join("#", head, token)
-				http.Redirect(w, r, url, http.StatusMovedPermanently)
+				rURL := s.c.PublicURL + path.Join(head, token)
+
+				http.Redirect(w, r, rURL, http.StatusMovedPermanently)
 				return
 			}
 		}

diff --git a/internal/http/services/owncloud/ocs/conversions/main.go b/internal/http/services/owncloud/ocs/conversions/main.go
@@ -212,7 +212,7 @@ func PublicShare2ShareData(share *link.PublicShare, r *http.Request, publicURL s
 		Token:        share.Token,
 		Name:         share.DisplayName,
 		MailSend:     0,
-		URL:          publicURL + path.Join("/", "#/s/"+share.Token),
+		URL:          publicURL + path.Join("/", "s/"+share.Token),
 		UIDOwner:     LocalUserIDToString(share.Creator),
 		UIDFileOwner: LocalUserIDToString(share.Owner),
 	}