yetanalytics · kelvinqian00 · Nov 5, 2024 · Nov 5, 2024 · Nov 9, 2024 · Nov 9, 2024
diff --git a/deps.edn b/deps.edn
@@ -12,6 +12,7 @@
                                                  [cljsjs/oidc-client
                                                   reagent/reagent
                                                   re-frame/re-frame]}
+        com.yetanalytics/re-route               {:mvn/version "0.1.0"}
         com.yetanalytics/xapi-schema            {:mvn/version "1.2.3"}
         com.fasterxml.jackson.core/jackson-core {:mvn/version "2.11.4"}
         com.fasterxml.jackson.dataformat/jackson-dataformat-smile
@@ -37,6 +38,8 @@
            :build {:main-opts ["-m" "figwheel.main" "-b" "dev" "-r"]}
            :min   {:main-opts ["-m" "figwheel.main" "-O" "advanced" "-bo" "dev"]}
            :test  {:main-opts ["-m" "figwheel.main" "-co" "test.cljs.edn" "-m" "com.yetanalytics.lrs-admin-ui.test-runner"]}
-           :dev {:extra-deps
+           :dev {:extra-paths
+                 ["dev"]
+                 :extra-deps
                  {day8.re-frame/tracing      {:mvn/version "0.6.2"}
                   day8.re-frame/re-frame-10x {:mvn/version "1.2.2"}}}}}
diff --git a/dev.cljs.edn b/dev.cljs.edn
@@ -1,7 +1,9 @@
 ^{:watch-dirs ["src" "test"]
   :css-dirs ["resources/public/css"]
   :auto-testing true
-  :auto-bundle :webpack}
+  :auto-bundle :webpack
+  :ring-handler com.yetanalytics.lrs-admin-ui.server/handler
+  :open-url "http://[[server-hostname]]:[[server-port]]/admin/ui"}
 {:main            com.yetanalytics.lrs-admin-ui.core
  :closure-defines {"re_frame.trace.trace_enabled_QMARK_" true}
  :preloads        [day8.re-frame-10x.preload]}
diff --git a/dev/com/yetanalytics/lrs_admin_ui/server.clj b/dev/com/yetanalytics/lrs_admin_ui/server.clj
@@ -0,0 +1,18 @@
+(ns com.yetanalytics.lrs-admin-ui.server
+  "Ring handler only for dev/figwheel to serve multiple paths"
+  (:require [ring.util.request  :as req]
+            [ring.util.response :as resp]))
+
+(defn handler [request]
+  (cond
+    (not= :get (:request-method request))
+    {:status  405
+     :headers {"Context-Type" "text/plain"}
+     :body    "Unsupported Operation!"}
+    ;; Imitate backend redirects
+    ;; NOTE: "/" will actually not get redirected since Figwheel handles
+    ;; that separately.
+    (#{"/" "/admin" "/admin/"} (req/path-info request))
+    (resp/redirect "/admin/ui")
+    :else
+    (resp/file-response "resources/public/")))
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -3,18 +3,18 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">
-        <link rel="manifest" href="images/favicon/site.webmanifest">
+        <link rel="apple-touch-icon" sizes="180x180" href="/images/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon/favicon-16x16.png">
+        <link rel="manifest" href="/images/favicon/site.webmanifest">
         <title>Yet Analytics LRS</title>
-        <link href="css/style.css" rel="stylesheet" type="text/css">
-        <link href="css/custom.css" rel="stylesheet" type="text/css">
+        <link href="/css/style.css" rel="stylesheet" type="text/css">
+        <link href="/css/custom.css" rel="stylesheet" type="text/css">
     </head>
     <body>
         <div id="app">
         </div>
-        <script src="cljs-out/dev/main_bundle.js" type="text/javascript"></script>
+        <script src="/cljs-out/dev/main_bundle.js" type="text/javascript"></script>
         <script type="text/javascript">
          //<![CDATA[
          com.yetanalytics.lrs_admin_ui.core.init("http://localhost:8080");

diff --git a/resources/public/index_prod.html b/resources/public/index_prod.html
@@ -3,18 +3,18 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">
-        <link rel="manifest" href="images/favicon/site.webmanifest">
+        <link rel="apple-touch-icon" sizes="180x180" href="{{prefix}}/admin/images/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="{{prefix}}/admin/images/favicon/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="{{prefix}}/admin/images/favicon/favicon-16x16.png">
+        <link rel="manifest" href="{{prefix}}/admin/images/favicon/site.webmanifest">
         <title>Yet Analytics LRS</title>
-        <link href="css/style.css" rel="stylesheet" type="text/css">
-        <link href="css/custom.css" rel="stylesheet" type="text/css">
+        <link href="{{prefix}}/admin/css/style.css" rel="stylesheet" type="text/css">
+        <link href="{{prefix}}/admin/css/custom.css" rel="stylesheet" type="text/css">
     </head>
     <body>
         <div id="app">
         </div>
-        <script src="main.js" type="text/javascript"></script>
+        <script src="{{prefix}}/admin/main.js" type="text/javascript"></script>
         <script type="text/javascript">
          //<![CDATA[
          com.yetanalytics.lrs_admin_ui.core.init();

diff --git a/src/com/yetanalytics/lrs_admin_ui/core.cljs b/src/com/yetanalytics/lrs_admin_ui/core.cljs
@@ -2,9 +2,9 @@
   (:require
    [goog.dom :as gdom]
    [reagent.dom :as rdom]
+   [re-frame.core :refer [dispatch-sync]]
    [com.yetanalytics.lrs-admin-ui.subs]
    [com.yetanalytics.lrs-admin-ui.handlers]
-   [re-frame.core :refer [dispatch-sync]]
    [com.yetanalytics.lrs-admin-ui.views :as views]))
 
 (set! *warn-on-infer* true)

diff --git a/src/com/yetanalytics/lrs_admin_ui/db.cljs b/src/com/yetanalytics/lrs_admin_ui/db.cljs
@@ -9,12 +9,10 @@
 ;; Spec to define the db
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(s/def :session/page keyword?)
 (s/def :session/token (s/nilable string?))
 (s/def :session/username (s/nilable string?))
 (s/def ::session
-  (s/keys :req-un [:session/page
-                   :session/token
+  (s/keys :req-un [:session/token
                    :session/username]))
 
 (s/def :login/username (s/nilable string?))
@@ -82,6 +80,7 @@
 (s/def ::server-host string?)
 (s/def ::xapi-prefix string?) ;; default /xapi
 (s/def ::proxy-path (s/nilable string?)) ;; default nil
+(s/def ::resource-base string?)
 
 (s/def ::pref-lang keyword?)
 (s/def ::language map?)
@@ -186,12 +185,18 @@
 
 (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
                           ::proxy-path
                           ::language
@@ -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

diff --git a/src/com/yetanalytics/lrs_admin_ui/functions/http.cljs b/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"