Add next parameter support on login route and improve WebSocket base URL handling

Author: ivictbor

Changelog.md

@@ -16,13 +16,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added ability to refresh menu item badge from the backend using websocket publish
 - fix bugs when e.g. UR (urdu) can't be recognized by LLM (define names explicitly)
 - make user menu switch shorter
+- next param support on login route
 
 # Improved
 
 - Added separate BeforeCreateSave function in types without oldRecord and make oldRecord Mandatory in existing BeforeSaveFunction
 
 - Added dataConnector: IAdminForthDataSourceConnectorBase; into IOperationalResource - for reusing connectors from users code
 
+# Fixed
+
+- WS on base URL
+
+
 ## [v1.5.7] - 2024-12-09
 
 ### Fixed

adminforth/servers/express.ts

@@ -163,8 +163,13 @@ class ExpressServer implements IExpressHttpServer {
   }
 
   setupWsServer() {
+    let base = this.adminforth.config.baseUrl || '';
+    if (base.endsWith('/')) {
+      base = base.slice(0, -1);
+    }
+
     this.server = http.createServer(this.expressApp);
-    const wss = new WebSocketServer({ server: this.server, path: '/afws' });
+    const wss = new WebSocketServer({ server: this.server, path: `${base}/afws` });
     console.log(' 🌐WebSocket server started');
     // Handle WebSocket connections
     wss.on('connection', async (ws, req) => {

adminforth/spa/src/router/index.ts

@@ -16,8 +16,14 @@ const router = createRouter({
         customLayout: true 
       },
       beforeEnter: async (to, from, next) => {
-        if(localStorage.getItem('isAuthorized') === 'true'){
-          next({name: 'home'})
+        if(localStorage.getItem('isAuthorized') === 'true') {
+          // check if url has next=... and redirect to it
+          console.log('to.query', to.query)
+          if (to.query.next) {
+            next(to.query.next.toString())
+          } else {
+            next({name: 'home'});
+          }
         } else {
           next()
         }

adminforth/spa/src/websocket.ts

@@ -27,9 +27,15 @@ async function connect () {
     console.error('🔌 AFWS already connected');
     return;
   }
+
+  let base = import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || '';
+  if (base.endsWith('/')) {
+    base = base.slice(0, -1);
+  }
+
   state.ws = new WebSocket(`${
     window.location.protocol === 'http:' ? 'ws' : 'wss'
-  }://${window.location.host}/afws`);
+  }://${window.location.host}${base}/afws`);
   state.status = 'connecting';
   state.ws.addEventListener('open', () => {
     console.log('🔌 AFWS connected');