refactored browser to use c4k-common

src/main/cljs/dda/c4k_keycloak/browser.cljs

@@ -1,86 +1,22 @@
 (ns dda.c4k-keycloak.browser
   (:require
-   [clojure.string :as st]
-   [clojure.spec.alpha :as s]
    [clojure.tools.reader.edn :as edn]
-   [expound.alpha :as expound]
-   [orchestra.core :refer-macros [defn-spec]]
    [dda.c4k-keycloak.core :as core]
-   [dda.c4k-keycloak.keycloak :as kc]))
+   [dda.c4k-keycloak.keycloak :as kc]
-
+   [dda.c4k-common.browser :as br]))
-(defn-spec print-debug string?
-  [sth string?]
-  (print "debug " sth)
-  sth)
-
-(defn-spec get-element-by-id any?
-  [name string?]
-  (-> js/document
-      (.getElementById name)))
-
-(s/def ::deserializer fn?)
-(s/def ::optional boolean?)
-(defn-spec get-content-from-element any?
-  [name string?
-   & {:keys [deserializer optional]
-      :or {deserializer nil optional false}} (s/keys :opt-un [::deserializer ::optional])]
-  (let [content (-> (get-element-by-id name)
-                    (.-value))]
-    (cond
-      (and optional (some? deserializer))
-      (when-not (st/blank? content)
-        (apply deserializer [content]))
-      (and (false? optional) (some? deserializer))
-      (apply deserializer [content])
-      :else
-      content)))
-
-(defn-spec set-validation-result! any?
-  [name string?
-   validation-result any?]
-  (-> (get-element-by-id (str name "-validation"))
-      (.-innerHTML)
-      (set! validation-result))
-  (-> (get-element-by-id name)
-      (.setCustomValidity validation-result))
-  validation-result)
-
-(defn-spec validate! any?
-  [name string?
-   spec any?
-   & {:keys [deserializer optional]
-      :or {deserializer nil optional false}} (s/keys :opt-un [::deserializer ::optional])]
-  (let [content (get-content-from-element name :optional optional :deserializer deserializer)]
-    (if (or (and optional (st/blank? content)) 
-            (s/valid? spec content))
-      (set-validation-result! name "")
-      (set-validation-result! name
-       (expound/expound-str spec content {:print-specs? false})))))
-
-(defn set-output!
-  [input]
-  (-> js/document
-      (.getElementById "output")
-      (.-value)
-      (set! input)))
-
-(defn set-validated! []
-  (-> (get-element-by-id "form")
-      (.-classList)
-      (.add "was-validated")))
 
 (defn config-from-document []
-  (let [issuer (get-content-from-element "issuer" :optional true :deserializer keyword)]
+  (let [issuer (br/get-content-from-element "issuer" :optional true :deserializer keyword)]
     (merge
-     {:fqdn (get-content-from-element "fqdn")}
+     {:fqdn (br/get-content-from-element "fqdn")}
      (when (some? issuer)
        {:issuer issuer}))))
 
 (defn validate-all! []
-  (validate! "fqdn" ::kc/fqdn)
+  (br/validate! "fqdn" ::kc/fqdn)
-  (validate! "issuer" ::kc/issuer :optional true :deserializer keyword)
+  (br/validate! "issuer" ::kc/issuer :optional true :deserializer keyword)
-  (validate! "auth" core/auth? :deserializer edn/read-string)
+  (br/validate! "auth" core/auth? :deserializer edn/read-string)
-  (set-validated!))
+  (br/set-validated!))
 
 (defn init []
   (-> js/document
@@ -89,15 +25,15 @@
                          #(do (validate-all!)
                               (-> (core/generate 
                                    (config-from-document) 
-                                   (get-content-from-element "auth" :deserializer edn/read-string))
+                                   (br/get-content-from-element "auth" :deserializer edn/read-string))
-                                  (set-output!)))))
+                                  (br/set-output!)))))
-  (-> (get-element-by-id "fqdn")
+  (-> (br/get-element-by-id "fqdn")
       (.addEventListener "blur"
                          #(do (validate-all!))))
-  (-> (get-element-by-id "issuer")
+  (-> (br/get-element-by-id "issuer")
       (.addEventListener "blur"
                          #(do (validate-all!))))
-  (-> (get-element-by-id "auth")
+  (-> (br/get-element-by-id "auth")
       (.addEventListener "blur"
                          #(do (validate-all!))))
   )