tailwind ready

src/clj/auto_ap/routes/utils.clj

@@ -8,30 +8,33 @@
 (defn wrap-secure [handler]
   (fn [request]
     (cond (authenticated? request)
-      (handler request)
+          (handler request)
 
+          (get (:headers request) "hx-request")
+          {:status 401
+           :headers {"hx-redirect" (str "/login?"
+                                        (url/map->query {"redirect-to" (:uri request)}))}}
 
-      (get (:headers request) "hx-request")
-      {:status 401
-       :headers {"hx-redirect" "/login"}}
-
-      :else
-      {:status 302
-       :headers {"Location" "/login" }})))
+          :else
+          {:status 302
+           :headers {"Location" (str "/login?"
+                                     (url/map->query {"redirect-to" (:uri request)}))}})))
 
 (defn wrap-admin [handler]
   (fn [request]
     (if (is-admin? (:identity request))
       (handler request)
-      (do 
+      (do
         (alog/warn ::unauthenticated)
         {:status  302
-         :headers {"Location" "/login"}}))))
+         :headers {"Location" (str "/login?"
+                                   (url/map->query {"redirect-to" (:uri request)}))}}))))
 
 (defn wrap-client-redirect-unauthenticated [handler]
   (fn [request]
     (let [response (handler request)]
       (if (= 401 (get response :status))
-        (-> response 
-            (assoc-in [:headers "hx-redirect"] "/login/"))
+        (-> response
+            (assoc-in [:headers "hx-redirect"] (str "/login?"
+                                                    (url/map->query {"redirect-to" (:uri request)}))))
         response))))