Merge branch 'admin-jwt-renew-reroute-epic' into re-route-impl-reactions

README.md

@@ -26,6 +26,6 @@ To compile everything for production to `target/bundle`:
 
 ## License
 
-Copyright © 2021-2024 Yet Analytics, Inc.
+Copyright © 2021-2025 Yet Analytics, Inc.
 
 Distributed under the Apache License version 2.0.

src/com/yetanalytics/lrs_admin_ui/db.cljs

@@ -185,11 +185,16 @@
 
 (s/def ::no-val-logout-url string?)
 
+(s/def ::jwt-refresh-interval int?)
+(s/def ::jwt-interaction-window int?)
+(s/def ::last-interaction-time int?)
+
 (s/def ::db (s/keys :req [::session
                           ::credentials
                           ::login
                           ::browser
                           ::accounts
+                          ::new-account
                           ::server-host
                           ::resource-base
                           ::xapi-prefix
@@ -205,7 +210,10 @@
                           ::status
                           ::update-password
                           ::enable-reactions
-                          ::reactions]
+                          ::reactions
+                          ::jwt-refresh-interval
+                          ::jwt-interaction-window
+                          ::last-interaction-time]
                     :opt [::reaction-focus
                           ::editing-reaction
                           ::editing-reaction-template-errors

src/com/yetanalytics/lrs_admin_ui/functions/http.cljs

@@ -38,10 +38,19 @@
 
 
 ;;JWTs
-(defn add-jwt [{:keys [headers] :as request}]
-  (assoc request :headers
-         (conj headers {"Authorization"
-                        (format "Bearer %s" @(subscribe [:session/get-token]))})))
+
+(defn add-jwt* [token {:keys [headers] :as request}]
+  (assoc request
+         :headers
+         (conj headers {"Authorization" (format "Bearer %s" token)})))
+
+(defn add-jwt [request]
+  (let [token @(subscribe [:session/get-token])]
+    (add-jwt* token request)))
+
+(defn add-jwt-interceptor* [token]
+  (to-interceptor {:name "JWT Authentication Interceptor"
+                   :request (partial add-jwt* token)}))
 
 (def add-jwt-interceptor
   (to-interceptor {:name "JWT Authentication Interceptor"