🐛 Fix features related issues on viewer

backend/src/app/rpc/commands/teams.clj

@@ -100,7 +100,7 @@
   (dm/with-open [conn (db/open pool)]
     (get-teams conn profile-id)))
 
-(def sql:teams
+(def sql:get-teams-with-permissions
   "select t.*,
           tp.is_owner,
           tp.is_admin,
@@ -128,7 +128,7 @@
 (defn get-teams
   [conn profile-id]
   (let [profile (profile/get-profile conn profile-id)]
-    (->> (db/exec! conn [sql:teams (:default-team-id profile) profile-id])
+    (->> (db/exec! conn [sql:get-teams-with-permissions (:default-team-id profile) profile-id])
          (map decode-row)
          (map process-permissions)
          (vec))))
@@ -156,18 +156,19 @@
   (let [{:keys [default-team-id] :as profile} (profile/get-profile conn profile-id)
         result (cond
                  (some? team-id)
-                 (let [sql (str "WITH teams AS (" sql:teams ") SELECT * FROM teams WHERE id=?")]
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions
+                                ") SELECT * FROM teams WHERE id=?")]
                    (db/exec-one! conn [sql default-team-id profile-id team-id]))
 
                  (some? project-id)
-                 (let [sql (str "WITH teams AS (" sql:teams ") "
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions ") "
                                 "SELECT t.* FROM teams AS t "
                                 "  JOIN project AS p ON (p.team_id = t.id) "
                                 " WHERE p.id=?")]
                    (db/exec-one! conn [sql default-team-id profile-id project-id]))
 
                  (some? file-id)
-                 (let [sql (str "WITH teams AS (" sql:teams ") "
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions ") "
                                 "SELECT t.* FROM teams AS t "
                                 "  JOIN project AS p ON (p.team_id = t.id) "
                                 "  JOIN file AS f ON (f.project_id = p.id) "

backend/src/app/rpc/commands/viewer.clj

@@ -6,28 +6,49 @@
 
 (ns app.rpc.commands.viewer
   (:require
-   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
    [app.common.schema :as sm]
+   [app.config :as cf]
    [app.db :as db]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.comments :as comments]
    [app.rpc.commands.files :as files]
+   [app.rpc.commands.teams :as teams]
    [app.rpc.cond :as-alias cond]
    [app.rpc.doc :as-alias doc]
    [app.util.services :as sv]))
 
 ;; --- QUERY: View Only Bundle
 
-(defn- get-project
+(defn- remove-not-allowed-pages
-  [conn id]
+  [data allowed]
-  (db/get-by-id conn :project id {:columns [:id :name :team-id]}))
+  (-> data
+      (update :pages (fn [pages] (filterv #(contains? allowed %) pages)))
+      (update :pages-index select-keys allowed)))
+
+(defn- get-view-only-bundle
+  [{:keys [::db/conn] :as cfg} {:keys [profile-id file-id ::perms] :as params}]
+  (let [file    (files/get-file conn file-id)
+
+        project (db/get conn :project
+                        {:id (:project-id file)}
+                        {:columns [:id :name :team-id]})
+
+        team    (-> (db/get conn :team {:id (:team-id project)})
+                    (teams/decode-row))
+
+        _       (-> (cfeat/get-team-enabled-features cf/flags team)
+                    (cfeat/check-client-features! (:features params))
+                    (cfeat/check-file-features! (:features file) (:features params)))
+
+        file    (cond-> file
+                  (= :share-link (:type perms))
+                  (update :data remove-not-allowed-pages (:pages perms))
+
+                  :always
+                  (update :data select-keys [:id :options :pages :pages-index :components]))
 
-(defn- get-bundle
-  [conn file-id profile-id features]
-  (let [file    (files/get-file conn file-id features)
-        project (get-project conn (:project-id file))
         libs    (files/get-file-libraries conn file-id)
         users   (comments/get-file-comments-users conn file-id profile-id)
         links   (->> (db/query conn :share-link {:file-id file-id})
@@ -42,45 +63,19 @@
                                  (dissoc :flags)))))
 
         fonts   (db/query conn :team-font-variant
-                          {:team-id (:team-id project)
+                          {:team-id (:id team)
                            :deleted-at nil})]
 
-    {:file file
+    {:users users
-     :users users
      :fonts fonts
      :project project
      :share-links links
-     :libraries libs}))
+     :libraries libs
+     :file file
+     :team team
+     :permissions perms}))
 
-(defn- remove-not-allowed-pages
+(def schema:get-view-only-bundle
-  [data allowed]
-  (-> data
-      (update :pages (fn [pages] (filterv #(contains? allowed %) pages)))
-      (update :pages-index select-keys allowed)))
-
-(defn get-view-only-bundle
-  [conn {:keys [profile-id file-id share-id features] :as params}]
-  (let [perms  (files/get-permissions conn profile-id file-id share-id)
-        bundle (-> (get-bundle conn file-id profile-id features)
-                   (assoc :permissions perms))]
-
-    ;; When we have neither profile nor share, we just return a not
-    ;; found response to the user.
-    (when-not perms
-      (ex/raise :type :not-found
-                :code :object-not-found
-                :hint "object not found"))
-
-    (update bundle :file
-            (fn [file]
-              (cond-> file
-                (= :share-link (:type perms))
-                (update :data remove-not-allowed-pages (:pages perms))
-
-                :always
-                (update :data select-keys [:id :options :pages :pages-index :components]))))))
-
-(sm/def! ::get-view-only-bundle
   [:map {:title "get-view-only-bundle"}
    [:file-id ::sm/uuid]
    [:share-id {:optional true} ::sm/uuid]
@@ -89,7 +84,21 @@
 (sv/defmethod ::get-view-only-bundle
   {::rpc/auth false
    ::doc/added "1.17"
-   ::sm/params ::get-view-only-bundle}
+   ::sm/params schema:get-view-only-bundle}
-  [{:keys [::db/pool]} {:keys [::rpc/profile-id] :as params}]
+  [system {:keys [::rpc/profile-id file-id share-id] :as params}]
-  (dm/with-open [conn (db/open pool)]
+  (db/run! system (fn [{:keys [::db/conn] :as system}]
-    (get-view-only-bundle conn (assoc params :profile-id profile-id))))
+                    (let [perms  (files/get-permissions conn profile-id file-id share-id)
+                          params (-> params
+                                     (assoc ::perms perms)
+                                     (assoc :profile-id profile-id))]
+
+                      ;; When we have neither profile nor share, we just return a not
+                      ;; found response to the user.
+                      (when-not perms
+                        (ex/raise :type :not-found
+                                  :code :object-not-found
+                                  :hint "object not found"))
+
+                      (get-view-only-bundle system params)))))
+
+