From e2bf9a25cd3572243680d39834ab0e28cd1a2173 Mon Sep 17 00:00:00 2001 From: jem Date: Tue, 15 Jun 2021 21:37:59 +0200 Subject: [PATCH] start refactoring for issuer --- src/main/cljs/dda/c4k_keycloak/browser.cljs | 42 ++++++++++----------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/main/cljs/dda/c4k_keycloak/browser.cljs b/src/main/cljs/dda/c4k_keycloak/browser.cljs index 7f961fc..f7ff9c3 100644 --- a/src/main/cljs/dda/c4k_keycloak/browser.cljs +++ b/src/main/cljs/dda/c4k_keycloak/browser.cljs @@ -35,6 +35,13 @@ (set-validation-result! name (expound/expound-str spec content {:print-specs? false}))))) +(defn validate-optional! [name spec] + (let [content (get-content-from-element name)] + (if (or (st/blank? content) (s/valid? spec content)) + (set-validation-result! name "") + (set-validation-result! name + (expound/expound-str spec content {:print-specs? false}))))) + (defn issuer [] (-> js/document (.getElementById "issuer"))) @@ -45,6 +52,15 @@ (when-not (st/blank? issuer-str) (keyword issuer-str)))) +(defn validate-issuer! [] + (let [name "issuer" + spec ::kc/issuer + issuer (issuer-from-document)] + (if (or (st/blank? issuer) (s/valid? spec issuer)) + (set-validation-result! name "") + (set-validation-result! name + (expound/expound-str spec issuer {:print-specs? false}))))) + (defn auth [] (-> js/document (.getElementById "auth"))) @@ -59,9 +75,9 @@ (when-not (st/blank? (issuer-from-document)) {:issuer (issuer-from-document)}))) - (defn auth-from-document [] - (edn/read-string (-> (auth) - (.-value)))) +(defn auth-from-document [] + (edn/read-string (-> (auth) + (.-value)))) (defn set-output! [input] @@ -70,25 +86,6 @@ (.-value) (set! input))) -(defn set-issuer-validation-result! - [validation-result] - (-> js/document - (.getElementById "issuer-validation") - (.-innerHTML) - (set! validation-result)) - (-> (issuer) - (.setCustomValidity validation-result)) - validation-result) - -(defn validate-issuer! [] - (let [issuer (issuer-from-document)] - (print-debug (js->clj issuer)) - (print-debug (st/blank? issuer)) - (if (or (st/blank? issuer) (s/valid? ::kc/issuer issuer)) - (set-issuer-validation-result! "") - (set-issuer-validation-result! - (expound/expound-str ::kc/issuer issuer {:print-specs? false}))))) - (defn set-validated! [] (-> (form) (.-classList) @@ -117,7 +114,6 @@ (validate-auth!) (set-validated!)) - (defn init [] (-> js/document (.getElementById "generate-button")