✨ Improve input validation in plugins

frontend/src/app/plugins/api.cljs

@@ -26,7 +26,7 @@
    [app.plugins.page :as page]
    [app.plugins.shape :as shape]
    [app.plugins.user :as user]
-   [app.plugins.utils :as utils]
+   [app.plugins.utils :as u]
    [app.plugins.viewport :as viewport]
    [app.util.object :as obj]
    [beicon.v2.core :as rx]
@@ -61,7 +61,7 @@
 
   (getViewport
     [_]
-    (viewport/create-proxy $plugin))
+    (viewport/viewport-proxy $plugin))
 
   (getFile
     [_]
@@ -108,28 +108,50 @@
 
   (uploadMediaUrl
     [_ name url]
-    (let [file-id (:current-file-id @st/state)]
+    (cond
-      (p/create
+      (not (string? name))
-       (fn [resolve reject]
+      (u/display-not-valid :uploadMedia-name name)
-         (->> (dwm/upload-media-url name file-id url)
+
-              (rx/map utils/to-js)
+      (not (string? url))
-              (rx/take 1)
+      (u/display-not-valid :uploadMedia-url url)
-              (rx/subs! resolve reject))))))
+
+      :else
+      (let [file-id (:current-file-id @st/state)]
+        (p/create
+         (fn [resolve reject]
+           (->> (dwm/upload-media-url name file-id url)
+                (rx/map u/to-js)
+                (rx/take 1)
+                (rx/subs! resolve reject)))))))
 
   (group
     [_ shapes]
-    (let [file-id (:current-file-id @st/state)
+    (cond
-          page-id (:current-page-id @st/state)
+      (or (not (array? shapes)) (not (every? shape/shape-proxy? shapes)))
-          id (uuid/next)
+      (u/display-not-valid :group-shapes shapes)
-          ids (into #{} (map #(obj/get % "$id")) shapes)]
+
-      (st/emit! (dwg/group-shapes id ids))
+      :else
-      (shape/shape-proxy $plugin file-id page-id id)))
+      (let [file-id (:current-file-id @st/state)
+            page-id (:current-page-id @st/state)
+            id (uuid/next)
+            ids (into #{} (map #(obj/get % "$id")) shapes)]
+        (st/emit! (dwg/group-shapes id ids))
+        (shape/shape-proxy $plugin file-id page-id id))))
 
   (ungroup
     [_ group & rest]
-    (let [shapes (concat [group] rest)
+
-          ids (into #{} (map #(obj/get % "$id")) shapes)]
+    (cond
-      (st/emit! (dwg/ungroup-shapes ids))))
+      (not (shape/shape-proxy? group))
+      (u/display-not-valid :ungroup group)
+
+      (and (some? rest) (not (every? shape/shape-proxy? rest)))
+      (u/display-not-valid :ungroup rest)
+
+      :else
+      (let [shapes (concat [group] rest)
+            ids (into #{} (map #(obj/get % "$id")) shapes)]
+        (st/emit! (dwg/ungroup-shapes ids)))))
 
   (createFrame
     [_]
@@ -161,23 +183,32 @@
 
   (createText
     [_ text]
-    (let [file-id (:current-file-id @st/state)
+    (cond
-          page-id (:current-page-id @st/state)
+      (or (not (string? text)) (empty? text))
-          page (dm/get-in @st/state [:workspace-data :pages-index page-id])
+      (u/display-not-valid :createText text)
-          shape (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
+
-                    (txt/change-text text)
+      :else
-                    (assoc :position-data nil))
+      (let [file-id (:current-file-id @st/state)
-          changes
+            page-id (:current-page-id @st/state)
-          (-> (cb/empty-changes)
+            page (dm/get-in @st/state [:workspace-data :pages-index page-id])
-              (cb/with-page page)
+            shape (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
-              (cb/with-objects (:objects page))
+                      (txt/change-text text)
-              (cb/add-object shape))]
+                      (assoc :position-data nil))
-      (st/emit! (ch/commit-changes changes))
+            changes
-      (shape/shape-proxy $plugin file-id page-id (:id shape))))
+            (-> (cb/empty-changes)
+                (cb/with-page page)
+                (cb/with-objects (:objects page))
+                (cb/add-object shape))]
+        (st/emit! (ch/commit-changes changes))
+        (shape/shape-proxy $plugin file-id page-id (:id shape)))))
 
   (createShapeFromSvg
     [_ svg-string]
-    (when (some? svg-string)
+    (cond
+      (not (string? svg-string))
+      (u/display-not-valid :createShapeFromSvg svg-string)
+
+      :else
       (let [id (uuid/next)
             file-id (:current-file-id @st/state)
             page-id (:current-page-id @st/state)]
@@ -185,15 +216,19 @@
         (shape/shape-proxy $plugin file-id page-id id))))
 
   (createBoolean [_ bool-type shapes]
-    (let [ids (into #{} (map #(obj/get % "$id")) shapes)
+    (let [bool-type (keyword bool-type)]
-          bool-type (keyword bool-type)]
+      (cond
+        (not (contains? cts/bool-types bool-type))
+        (u/display-not-valid :createBoolean-boolType bool-type)
 
-      (if (contains? cts/bool-types bool-type)
+        (or (not (array? shapes)) (empty? shapes) (not (every? shape/shape-proxy? shapes)))
-        (let [id-ret (atom nil)]
+        (u/display-not-valid :createBoolean-shapes shapes)
+
+        :else
+        (let [ids (into #{} (map #(obj/get % "$id")) shapes)
+              id-ret (atom nil)]
           (st/emit! (dwb/create-bool bool-type ids {:id-ret id-ret}))
-          (shape/shape-proxy $plugin @id-ret))
+          (shape/shape-proxy $plugin @id-ret))))))
-
-        (utils/display-not-valid :bool-shape bool-type)))))
 
 (defn create-context
   [plugin-id]

frontend/src/app/plugins/file.cljs

@@ -93,6 +93,9 @@
   {:name js/Symbol.toStringTag
    :get (fn [] (str "FileProxy"))})
 
+(defn file-proxy? [p]
+  (instance? FileProxy p))
+
 (defn file-proxy
   [plugin-id id]
   (crc/add-properties!

frontend/src/app/plugins/flex.cljs

@@ -29,6 +29,9 @@
       (st/emit! (dwt/move-shapes-to-frame #{child-id} $id nil nil)
                 (ptk/data-event :layout/update {:ids [$id]})))))
 
+(defn flex-layout-proxy? [p]
+  (instance? FlexLayout p))
+
 (defn flex-layout-proxy
   [plugin-id file-id page-id id]
   (-> (FlexLayout. plugin-id file-id page-id id)
@@ -151,6 +154,9 @@
 
 (deftype LayoutChildProxy [$plugin $file $page $id])
 
+(defn layout-child-proxy? [p]
+  (instance? LayoutChildProxy p))
+
 (defn layout-child-proxy
   [plugin-id file-id page-id id]
   (-> (LayoutChildProxy. plugin-id file-id page-id id)

frontend/src/app/plugins/fonts.cljs

@@ -39,6 +39,9 @@
                   :font-weight (d/nilv (obj/get variant "fontWeight") fontWeight)}]
       (st/emit! (dwt/update-text-range id start end values)))))
 
+(defn font-proxy? [p]
+  (instance? PenpotFont p))
+
 (defn font-proxy
   [{:keys [id name variants] :as font}]
   (when (some? font)

frontend/src/app/plugins/grid.cljs

@@ -74,6 +74,9 @@
       (st/emit! (dwt/move-shapes-to-frame #{child-id} $id nil [row column])
                 (ptk/data-event :layout/update {:ids [$id]})))))
 
+(defn grid-layout-proxy? [p]
+  (instance? GridLayout p))
+
 (defn grid-layout-proxy
   [plugin-id file-id page-id id]
   (-> (GridLayout. plugin-id file-id page-id id)
@@ -199,6 +202,9 @@
 
 (deftype GridCellProxy [$plugin $file $page $id])
 
+(defn layout-cell-proxy? [p]
+  (instance? GridCellProxy p))
+
 (defn layout-cell-proxy
   [plugin-id file-id page-id id]
   (letfn [(locate-cell [_]

frontend/src/app/plugins/library.cljs

@@ -137,6 +137,9 @@
       (let [color (u/proxy->library-color self)]
         (apply array (keys (dm/get-in color [:plugin-data (keyword "shared" namespace)])))))))
 
+(defn lib-color-proxy? [p]
+  (instance? LibraryColorProxy p))
+
 (defn lib-color-proxy
   [plugin-id file-id id]
   (assert (uuid? file-id))
@@ -316,6 +319,9 @@
       (let [typography (u/proxy->library-typography self)]
         (apply array (keys (dm/get-in typography [:plugin-data (keyword "shared" namespace)])))))))
 
+(defn lib-typography-proxy? [p]
+  (instance? LibraryTypographyProxy p))
+
 (defn lib-typography-proxy
   [plugin-id file-id id]
   (assert (uuid? file-id))
@@ -522,6 +528,9 @@
       (let [component (u/proxy->library-component self)]
         (apply array (keys (dm/get-in component [:plugin-data (keyword "shared" namespace)])))))))
 
+(defn lib-component-proxy? [p]
+  (instance? LibraryComponentProxy p))
+
 (defn lib-component-proxy
   [plugin-id file-id id]
   (assert (uuid? file-id))
@@ -643,6 +652,9 @@
       (let [file (u/proxy->file self)]
         (apply array (keys (dm/get-in file [:data :plugin-data (keyword "shared" namespace)])))))))
 
+(defn library-proxy? [p]
+  (instance? Library p))
+
 (defn library-proxy
   [plugin-id file-id]
   (assert (uuid? file-id) "File id not valid")

frontend/src/app/plugins/page.cljs

@@ -107,6 +107,9 @@
   {:name js/Symbol.toStringTag
    :get (fn [] (str "PageProxy"))})
 
+(defn page-proxy? [p]
+  (instance? PageProxy p))
+
 (defn page-proxy
   [plugin-id file-id id]
   (crc/add-properties!

frontend/src/app/plugins/shape.cljs

@@ -380,6 +380,9 @@
   {:name js/Symbol.toStringTag
    :get (fn [] (str "ShapeProxy"))})
 
+(defn shape-proxy? [p]
+  (instance? ShapeProxy p))
+
 (defn shape-proxy
   ([plugin-id id]
    (shape-proxy plugin-id (:current-file-id @st/state) (:current-page-id @st/state) id))

frontend/src/app/plugins/user.cljs

@@ -38,11 +38,17 @@
      {:name "sessionId"
       :get (fn [_] (str session-id))})))
 
+(defn current-user-proxy? [p]
+  (instance? CurrentUserProxy p))
+
 (defn current-user-proxy
   [plugin-id session-id]
   (-> (CurrentUserProxy. plugin-id session-id)
       (add-user-properties)))
 
+(defn active-user-proxy? [p]
+  (instance? ActiveUserProxy p))
+
 (defn active-user-proxy
   [plugin-id session-id]
   (-> (ActiveUserProxy. plugin-id session-id)

frontend/src/app/plugins/viewport.cljs

@@ -32,7 +32,10 @@
   {:name js/Symbol.toStringTag
    :get (fn [] (str "ViewportProxy"))})
 
-(defn create-proxy
+(defn viewport-proxy? [p]
+  (instance? ViewportProxy p))
+
+(defn viewport-proxy
   [plugin-id]
   (crc/add-properties!
    (ViewportProxy. plugin-id)