Merge pull request #2949 from CSCfi/2948/better-oidc-warning

Improve OIDC config validation message
CSCfi · Jun 6, 2022 · 4c11462 · 4c11462
2 parents 7306518 + b087160
commit 4c11462
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/clj/rems/validate.clj b/src/clj/rems/validate.clj
@@ -52,8 +52,13 @@
 
 (defn validate []
   (log/info "Validating configuration")
-  (when (:oidc-userid-attribute env)
-    (throw (ex-info "Please migrate to :oidc-userid-attributes" (select-keys env [:oidc-userid-attribute]))))
+  (when-let [old-attributes (some-> env :oidc-userid-attribute list flatten)]
+    (throw (ex-info "Please migrate to :oidc-userid-attributes"
+                    (doall
+                     {:from (select-keys env [:oidc-userid-attribute])
+                      :to {:oidc-userid-attributes (vec
+                                                    (for [attribute old-attributes]
+                                                      {:attribute attribute}))}}))))
 
   (log/info "Validating data")
   (try