Merge pull request #5 from thekid/feature/htmx

Implement HTMX integration
thekid · Jan 28, 2024 · ff4a9bf · ff4a9bf
2 parents 72f5d5c + 094e2b1
commit ff4a9bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
   "require": {
     "xp-forge/handlebars-templates": "^3.1",
     "xp-forge/frontend": "^6.0",
+    "xp-forge/htmx": "^0.1",
     "xp-forge/websockets": "^3.0",
     "xp-forge/mongodb": "^2.2",
     "xp-forge/redis": "^1.0",

diff --git a/src/main/handlebars/layout.handlebars b/src/main/handlebars/layout.handlebars
@@ -173,5 +173,16 @@
     {{> content}}
   </main>
   <script src="/static/vendor.js"></script>
+  <script type="module">
+    window.addEventListener('authenticationexpired', e => {
+      if (confirm('Authentication expired. Do you want to re-authenticate?')) {
+        window.location.reload();
+        return;
+      }
+    });
+  </script>
+  {{#> scripts}}
+    <!-- Defaults to empty -->
+  {{/scripts}}
 </body>
 </html>
diff --git a/src/main/php/de/thekid/crews/App.php b/src/main/php/de/thekid/crews/App.php
@@ -5,7 +5,7 @@
 use web\Application;
 use web\auth\SessionBased;
 use web\auth\oauth\{OAuth2Flow, BySecret};
-use web\frontend\{Frontend, AssetsFrom, HandlersIn};
+use web\frontend\{Frontend, AssetsFrom, HandlersIn, HtmxFlow};
 use web\session\InFileSystem;
 
 /** Web frontend */
@@ -28,7 +28,7 @@ public function routes() {
       '/',
       $config->readArray('oauth', 'scopes'),
     );
-    $auth= new SessionBased($flow, $sessions, $flow->fetchUser($config->readString('oauth', 'userinfo'))
+    $auth= new SessionBased(new HtmxFlow($flow), $sessions, $flow->fetchUser($config->readString('oauth', 'userinfo'))
       ->map(new UserAttributes($config->readSection('user')))
       ->map(fn($user) => $db->collection('users')
         ->modify(['handle' => $user['handle']], ['$set' => $user], upsert: true)