meissa/c4k-common
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split for generation of config and auth objects #4

Merged
gec merged 9 commits from split-config-auth into main 2024-07-19 09:06:52 +00:00
Conversation 0 Commits 9 Files changed 15 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b62fa7b9ec - Show all commits

6
src/main/cljc/dda/c4k_common/common.cljc
View file

@ -61,9 +61,9 @@
(let [resulting-config (merge config-defaults my-config) (let [resulting-config (merge config-defaults my-config)
both (or (and only-config only-auth) (and (not only-config) (not only-auth))) both (or (and only-config only-auth) (and (not only-config) (not only-auth)))
res-vec (cond res-vec (cond
both (concat-vec (config-objects resulting-config) (auth-objects my-config my-auth)) both (concat-vec (config-objects resulting-config) (auth-objects resulting-config my-auth))
only-config (config-objects my-config) only-config (config-objects resulting-config)
only-auth (auth-objects my-config my-auth))] only-auth (auth-objects resulting-config my-auth))]
(cs/join (cs/join
"\n---\n" "\n---\n"
res-vec))) res-vec)))