migrates accounts
This commit is contained in:
@@ -10,21 +10,25 @@
|
||||
query2]]
|
||||
[auto-ap.query-params :as query-params]
|
||||
[auto-ap.routes.auth :as auth]
|
||||
[auto-ap.routes.utils :refer [wrap-admin wrap-client-redirect-unauthenticated]]
|
||||
[auto-ap.routes.utils
|
||||
:refer [wrap-admin wrap-client-redirect-unauthenticated]]
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[auto-ap.ssr.components :as com]
|
||||
[auto-ap.ssr.grid-page-helper :as helper]
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[auto-ap.ssr.utils :refer [html-response]]
|
||||
[auto-ap.ssr.utils
|
||||
:refer [entity-id
|
||||
forced-vector
|
||||
html-response
|
||||
ref->enum-schema
|
||||
wrap-schema-decode]]
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[buddy.sign.jwt :as jwt]
|
||||
[clojure.string :as str]
|
||||
[config.core :refer [env]]
|
||||
[datomic.api :as dc]
|
||||
[malli.core :as mc]
|
||||
[malli.transform :as mt2]
|
||||
[manifold.time :as mt]))
|
||||
[malli.core :as mc]))
|
||||
|
||||
(defn filters [request]
|
||||
[:form {"hx-trigger" "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
|
||||
@@ -180,10 +184,10 @@
|
||||
:row-buttons (fn [request entity]
|
||||
[(com/button {:hx-post (str (bidi/path-for ssr-routes/only-routes
|
||||
:user-impersonate))
|
||||
:hx-vals (format "{\"user-id\": \"%s\"}" (:db/id entity))} "Impersonate")
|
||||
:hx-vals (format "{\"db/id\": \"%s\"}" (:db/id entity))} "Impersonate")
|
||||
(com/icon-button {:hx-get (str (bidi/path-for ssr-routes/only-routes
|
||||
:user-edit-dialog
|
||||
:user-id (:db/id entity)))
|
||||
:db/id (:db/id entity)))
|
||||
:hx-target "#modal-holder"
|
||||
:hx-swap "outerHTML"}
|
||||
svg/pencil)])
|
||||
@@ -228,12 +232,7 @@
|
||||
(def table* (partial helper/table* grid-page))
|
||||
|
||||
(defn impersonate [request]
|
||||
(let [user (some-> request
|
||||
:form-params
|
||||
(get "user-id")
|
||||
not-empty
|
||||
Long/parseLong
|
||||
(#(dc/pull (dc/db conn) default-read %))) ]
|
||||
(let [user (some-> request :params :db/id (#(dc/pull (dc/db conn) default-read %))) ]
|
||||
{:status 200
|
||||
:headers {"hx-redirect" (str "/?jwt=" (jwt/sign (auth/user->jwt user "FAKE_TOKEN")
|
||||
(:jwt-secret env)
|
||||
@@ -242,19 +241,9 @@
|
||||
:session {:identity (dissoc (auth/user->jwt user "FAKE_TOKEN")
|
||||
:exp)}}))
|
||||
|
||||
(defn user-edit-save [{:keys [form-params] :as request}]
|
||||
(let [user (some-> request
|
||||
:params
|
||||
:user-id
|
||||
(#(dc/pull (dc/db conn) default-read %)))
|
||||
_ @(dc/transact conn [
|
||||
[:upsert-entity {:db/id (:db/id user)
|
||||
:user/role (keyword "user-role" (get form-params "role"))
|
||||
:user/clients (some-> request :params :clients)}]])
|
||||
user (some-> request
|
||||
:params
|
||||
:user-id
|
||||
(#(dc/pull (dc/db conn) default-read %)))]
|
||||
(defn user-edit-save [{:keys [params route-params] :as request}]
|
||||
(let [_ @(dc/transact conn [[:upsert-entity (-> params (assoc :db/id (:db/id route-params)) (dissoc :id))]])
|
||||
user (some-> request :route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
|
||||
|
||||
(html-response
|
||||
(row* identity user {:flash? true})
|
||||
@@ -263,24 +252,26 @@
|
||||
|
||||
(defn user-edit-dialog [request]
|
||||
(let [user (some-> request
|
||||
:params
|
||||
:user-id
|
||||
:route-params
|
||||
:db/id
|
||||
(#(dc/pull (dc/db conn) default-read %)))]
|
||||
(html-response
|
||||
(com/modal
|
||||
{}
|
||||
[:form {:hx-post (str (bidi/path-for ssr-routes/only-routes
|
||||
[:form {:hx-ext "response-targets"
|
||||
:hx-post (str (bidi/path-for ssr-routes/only-routes
|
||||
:user-edit-save
|
||||
:request-method :post
|
||||
:user-id (:db/id user )))
|
||||
:hx-swap "outerHTML swap:300ms"}
|
||||
:db/id (:db/id user )))
|
||||
:hx-swap "outerHTML swap:300ms"
|
||||
:hx-target-400 "#form-errors .error-content"}
|
||||
[:fieldset {:class "hx-disable"}
|
||||
(com/modal-card
|
||||
{}
|
||||
[:div.flex [:div.p-2 "User"] [:p.ml-2.rounded.bg-gray-200.p-2.dark:bg-gray-600 (:user/name user)]]
|
||||
[:div.space-y-6
|
||||
(com/field {:label "Role"}
|
||||
(com/select {:name "role"
|
||||
(com/select {:name "user/role"
|
||||
:class "w-36"
|
||||
:autofocus true
|
||||
:id "role"
|
||||
@@ -292,7 +283,7 @@
|
||||
["user" "User"]]
|
||||
:size :small}))
|
||||
(com/field {:label "Clients"}
|
||||
(com/typeahead {:name "clients"
|
||||
(com/typeahead {:name "user/clients"
|
||||
:class "w-full"
|
||||
:multiple "multiple"
|
||||
:url (bidi/path-for ssr-routes/only-routes
|
||||
@@ -302,68 +293,12 @@
|
||||
(fn [client]
|
||||
[(:db/id client) (:client/name client)])
|
||||
(:user/clients user))
|
||||
#_#_:value (name (:user/role user))
|
||||
#_#_:options [["none" "None"]
|
||||
["power-user" "Power user"]
|
||||
["manager" "Manager"]
|
||||
["admin" "Admin"]
|
||||
["user" "User"]]
|
||||
:size :small}))
|
||||
(com/button {:color :primary}
|
||||
"Save")
|
||||
]
|
||||
|
||||
[:div#form-errors [:span.error-content]]
|
||||
(com/button {:color :primary :type "submit"}
|
||||
"Save")]
|
||||
[:div])]]))))
|
||||
|
||||
(defn forced-vector [x]
|
||||
[:vector {:decode/json {:enter (fn [x]
|
||||
(if (sequential? x)
|
||||
x
|
||||
[x])
|
||||
)}}
|
||||
x])
|
||||
|
||||
(def entity-id (mc/schema nat-int?))
|
||||
|
||||
(defn wrap-schema-decode [handler & {:keys [form query params]}]
|
||||
(fn [{:keys [form-params query-params] :as request}]
|
||||
(try
|
||||
(handler (cond-> request
|
||||
(and (:params request) params)
|
||||
(assoc :params
|
||||
(mc/coerce
|
||||
params
|
||||
(:params request)
|
||||
(mt2/transformer
|
||||
(mt2/key-transformer {:encode name :decode keyword})
|
||||
mt2/string-transformer
|
||||
mt2/json-transformer) ))
|
||||
|
||||
(and form form-params)
|
||||
(assoc :parsed-form-params
|
||||
(mc/coerce
|
||||
form
|
||||
form-params
|
||||
(mt2/transformer
|
||||
(mt2/key-transformer {:encode name :decode keyword})
|
||||
mt2/string-transformer
|
||||
mt2/json-transformer) ))
|
||||
|
||||
(and query query-params)
|
||||
(assoc :parsed-query-params
|
||||
(mc/coerce
|
||||
form
|
||||
form-params
|
||||
(mt2/transformer
|
||||
(mt2/key-transformer {:encode name :decode keyword})
|
||||
mt2/string-transformer
|
||||
mt2/json-transformer) ))))
|
||||
(catch Exception e
|
||||
;; TODO
|
||||
{:status 400
|
||||
:body "error"}))))
|
||||
|
||||
|
||||
(def key->handler
|
||||
{:users (wrap-admin (helper/page-route grid-page))
|
||||
:user-table (wrap-admin (helper/table-route grid-page))
|
||||
@@ -371,15 +306,19 @@
|
||||
wrap-admin
|
||||
wrap-client-redirect-unauthenticated
|
||||
(wrap-schema-decode
|
||||
:params (mc/schema
|
||||
:route-schema (mc/schema [:map [:db/id entity-id]])
|
||||
:params-schema (mc/schema
|
||||
[:map
|
||||
[:user-id nat-int?]
|
||||
[:clients (forced-vector entity-id)]
|
||||
[:role [:enum {:decode/string #(keyword "user-role" %)} :user-role/admin :user-role/manager :user-role/power-user :user-role/user :user-role/none]]])))
|
||||
[:user/clients (forced-vector entity-id)]
|
||||
[:user/role (ref->enum-schema "user-role")]])))
|
||||
:user-edit-dialog (-> user-edit-dialog
|
||||
wrap-admin
|
||||
wrap-client-redirect-unauthenticated
|
||||
(wrap-schema-decode
|
||||
:params (mc/schema [:map [:user-id entity-id]])))
|
||||
:user-impersonate (wrap-client-redirect-unauthenticated (wrap-admin impersonate))})
|
||||
:route-schema (mc/schema [:map [:db/id entity-id]])))
|
||||
:user-impersonate (-> impersonate
|
||||
wrap-admin
|
||||
wrap-client-redirect-unauthenticated
|
||||
(wrap-schema-decode
|
||||
:params-schema (mc/schema [:map [:db/id entity-id]])))})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user