diff --git a/backend/src/app/services/queries/viewer.clj b/backend/src/app/services/queries/viewer.clj index 27d52a88a..000f38362 100644 --- a/backend/src/app/services/queries/viewer.clj +++ b/backend/src/app/services/queries/viewer.clj @@ -65,7 +65,7 @@ (assoc bundle :token token)) (let [stoken (retrieve-shared-token conn file-id page-id)] (files/check-read-permissions! conn profile-id file-id) - (assoc bundle :share-token (:token stoken))))))) + (assoc bundle :token (:token stoken))))))) (defn check-shared-token! [conn file-id page-id token] diff --git a/backend/tests/app/tests/test_services_viewer.clj b/backend/tests/app/tests/test_services_viewer.clj index c4544475e..4b582eda1 100644 --- a/backend/tests/app/tests/test_services_viewer.clj +++ b/backend/tests/app/tests/test_services_viewer.clj @@ -43,7 +43,7 @@ (t/is (nil? (:error out))) (let [result (:result out)] - (t/is (contains? result :share-token)) + (t/is (contains? result :token)) (t/is (contains? result :page)) (t/is (contains? result :file)) (t/is (contains? result :project))))) diff --git a/frontend/src/app/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs index 739cc0cef..8e7e7a40d 100644 --- a/frontend/src/app/main/data/viewer.cljs +++ b/frontend/src/app/main/data/viewer.cljs @@ -138,7 +138,7 @@ (d/index-by :id) (assoc state :comment-threads))) (on-error [err] - (if (= :authorization (:type err)) + (if (= :not-authorized (:code err)) (rx/empty) (rx/throw err)))] @@ -180,7 +180,7 @@ (->> (rp/mutation! :create-file-share-token {:file-id file-id :page-id page-id}) (rx/map (fn [{:keys [token]}] - #(assoc-in % [:viewer-data :share-token] token)))))))) + #(assoc-in % [:viewer-data :token] token)))))))) (defn delete-share-link [] @@ -189,12 +189,12 @@ (watch [_ state stream] (let [file-id (:current-file-id state) page-id (:current-page-id state) - token (get-in state [:viewer-data :share-token]) + token (get-in state [:viewer-data :token]) params {:file-id file-id :page-id page-id :token token}] (->> (rp/mutation :delete-file-share-token params) - (rx/map (fn [_] #(update % :viewer-data dissoc :share-token)))))))) + (rx/map (fn [_] #(update % :viewer-data dissoc :token)))))))) ;; --- Zoom Management diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs index fc1df4b09..21e15787d 100644 --- a/frontend/src/app/main/ui/viewer/header.cljs +++ b/frontend/src/app/main/ui/viewer/header.cljs @@ -257,7 +257,7 @@ nil) (when-not anonymous? - [:& share-link {:token (:share-token data) + [:& share-link {:token (:token data) :page (:page data)}]) (when-not anonymous?