updates to use new lrs-admin-ui, new lrs, incorporates new env var into cocnfig spec, fixes prod conf typo

Author: invaliduser

Makefile

@@ -2,7 +2,7 @@
 
 # Version of LRS Admin UI to use
 
-LRS_ADMIN_UI_VERSION ?= v0.2.4
+LRS_ADMIN_UI_VERSION ?= v0.2.5
 LRS_ADMIN_UI_LOCATION ?= https://github.com/yetanalytics/lrs-admin-ui/releases/download/${LRS_ADMIN_UI_VERSION}/lrs-admin-ui.zip
 LRS_ADMIN_ZIPFILE ?= lrs-admin-ui-${LRS_ADMIN_UI_VERSION}.zip
 

deps.edn

@@ -51,7 +51,7 @@
   xyz.capybara/clamav-client      {:mvn/version "2.1.2"}
   ;; Yet Analytics deps
   com.yetanalytics/lrs
-  {:mvn/version "1.3.0"
+  {:mvn/version "1.3.1"
    :exclusions  [org.clojure/clojure
                  org.clojure/clojurescript
                  com.yetanalytics/xapi-schema]}

resources/lrsql/config/prod/default/webserver.edn

@@ -45,5 +45,5 @@
  :oidc-enable-local-admin   #boolean #or [#env LRSQL_OIDC_ENABLE_LOCAL_ADMIN false]
  :enable-clamav             #boolean #or [#env LRSQL_ENABLE_CLAMAV false]
  :clamav-host               #or [#env LRSQL_CLAMAV_HOST "localhost"]
- :clamav-port               #long #or [#env LRSQL_CLAMAV_PORT 3310
- :auth-by-cred-id           #boolean #or [#env LRSQL_AUTH_BY_CRED_ID false]]}
+ :clamav-port               #long #or [#env LRSQL_CLAMAV_PORT 3310]
+ :auth-by-cred-id           #boolean #or [#env LRSQL_AUTH_BY_CRED_ID false]}

src/main/lrsql/spec/config.clj

@@ -197,6 +197,8 @@
 (s/def ::oidc-verify-remote-issuer boolean?)
 (s/def ::oidc-enable-local-admin boolean?)
 
+(s/def ::auth-by-cred-id boolean?)
+
 (s/def ::sec-head-hsts (s/nilable string?))
 (s/def ::sec-head-frame (s/nilable string?))
 (s/def ::sec-head-content-type (s/nilable string?))
@@ -257,7 +259,8 @@
                     ::sec-head-content
                     ::oidc-issuer
                     ::oidc-audience
-                    ::oidc-client-id])
+                    ::oidc-client-id
+                    ::auth-by-cred-id])
    ;; conditional validation for presence of no-val supporting config
    (fn [{:keys [jwt-no-val jwt-no-val-uname jwt-no-val-issuer
                 jwt-no-val-role-key jwt-no-val-role]}]