mirror of
https://github.com/penpot/penpot.git
synced 2025-03-15 17:21:17 -05:00
🐛 Fix problem with currentUser in plugins
This commit is contained in:
parent
a5a53219bf
commit
7d4535ebd4
1 changed files with 25 additions and 28 deletions
|
@ -18,10 +18,8 @@
|
||||||
|
|
||||||
(defn- add-session-properties
|
(defn- add-session-properties
|
||||||
[user-proxy session-id]
|
[user-proxy session-id]
|
||||||
(let [plugin-id (obj/get user-proxy "$plugin")]
|
|
||||||
(crc/add-properties!
|
(crc/add-properties!
|
||||||
user-proxy
|
user-proxy
|
||||||
{:name "$plugin" :enumerable false :get (constantly plugin-id)}
|
|
||||||
{:name "$session" :enumerable false :get (constantly session-id)}
|
{:name "$session" :enumerable false :get (constantly session-id)}
|
||||||
|
|
||||||
{:name "id"
|
{:name "id"
|
||||||
|
@ -37,7 +35,7 @@
|
||||||
:get (fn [_] (-> (u/locate-presence session-id) :color))}
|
:get (fn [_] (-> (u/locate-presence session-id) :color))}
|
||||||
|
|
||||||
{:name "sessionId"
|
{:name "sessionId"
|
||||||
:get (fn [_] (str session-id))})))
|
:get (fn [_] (str session-id))}))
|
||||||
|
|
||||||
|
|
||||||
(defn current-user-proxy? [p]
|
(defn current-user-proxy? [p]
|
||||||
|
@ -46,7 +44,8 @@
|
||||||
(defn current-user-proxy
|
(defn current-user-proxy
|
||||||
[plugin-id session-id]
|
[plugin-id session-id]
|
||||||
(-> (obj/reify {:name "CurrentUserProxy"}
|
(-> (obj/reify {:name "CurrentUserProxy"}
|
||||||
:$plugin {:enumerable false :get (fn [] plugin-id)})
|
:$plugin
|
||||||
|
{:enumerable false :get (fn [] plugin-id)})
|
||||||
(add-session-properties session-id)))
|
(add-session-properties session-id)))
|
||||||
|
|
||||||
(defn active-user-proxy? [p]
|
(defn active-user-proxy? [p]
|
||||||
|
@ -55,7 +54,8 @@
|
||||||
(defn active-user-proxy
|
(defn active-user-proxy
|
||||||
[plugin-id session-id]
|
[plugin-id session-id]
|
||||||
(-> (obj/reify {:name "ActiveUserProxy"}
|
(-> (obj/reify {:name "ActiveUserProxy"}
|
||||||
:$plugin {:enumerable false :get (fn [] plugin-id)}
|
:$plugin
|
||||||
|
{:enumerable false :get (fn [] plugin-id)}
|
||||||
|
|
||||||
:position
|
:position
|
||||||
{:get (fn [] (-> (u/locate-presence session-id) :point format/format-point))}
|
{:get (fn [] (-> (u/locate-presence session-id) :point format/format-point))}
|
||||||
|
@ -66,11 +66,8 @@
|
||||||
|
|
||||||
(defn- add-user-properties
|
(defn- add-user-properties
|
||||||
[user-proxy data]
|
[user-proxy data]
|
||||||
(let [plugin-id (obj/get user-proxy "$plugin")]
|
|
||||||
(crc/add-properties!
|
(crc/add-properties!
|
||||||
user-proxy
|
user-proxy
|
||||||
{:name "$plugin" :enumerable false :get (constantly plugin-id)}
|
|
||||||
|
|
||||||
{:name "id"
|
{:name "id"
|
||||||
:get (fn [_] (-> data :id str))}
|
:get (fn [_] (-> data :id str))}
|
||||||
|
|
||||||
|
@ -78,7 +75,7 @@
|
||||||
:get (fn [_] (-> data :fullname))}
|
:get (fn [_] (-> data :fullname))}
|
||||||
|
|
||||||
{:name "avatarUrl"
|
{:name "avatarUrl"
|
||||||
:get (fn [_] (cfg/resolve-profile-photo-url data))})))
|
:get (fn [_] (cfg/resolve-profile-photo-url data))}))
|
||||||
|
|
||||||
(defn user-proxy
|
(defn user-proxy
|
||||||
[plugin-id data]
|
[plugin-id data]
|
||||||
|
|
Loading…
Add table
Reference in a new issue