@cocreate/users 1.36.7 → 1.36.9

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.36.9](https://github.com/CoCreate-app/CoCreate-users/compare/v1.36.8...v1.36.9) (2024-04-29)
+
+
+### Bug Fixes
+
+* check if url is not the same as current prior to applying location.href ([bda51bb](https://github.com/CoCreate-app/CoCreate-users/commit/bda51bb23bc9b3adc19864fcf78c444d1462b781))
+
+## [1.36.8](https://github.com/CoCreate-app/CoCreate-users/compare/v1.36.7...v1.36.8) (2024-02-18)
+
+
+### Bug Fixes
+
+* add host ([f6f6343](https://github.com/CoCreate-app/CoCreate-users/commit/f6f634305aef8ffbbe539366574c1b5949692816))
+
 ## [1.36.7](https://github.com/CoCreate-app/CoCreate-users/compare/v1.36.6...v1.36.7) (2024-02-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.36.7",
+  "version": "1.36.9",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",

package/src/client.js

@@ -186,27 +186,31 @@ const CoCreateUser = {
         if (data.user_id && data.user_id !== Crud.socket.user_id || data.clientId && data.clientId !== Crud.socket.clientId)
             return
 
+        let redirectTag
         if (data.userStatus == 'on' || data.userStatus == 'idle') {
-            let redirectTag = document.querySelector('[session="true"]');
-
-            if (redirectTag) {
-                let redirectLink = redirectTag.getAttribute('href');
-                if (redirectLink) {
-                    document.location.href = redirectLink;
-                }
-            }
-
+            redirectTag = document.querySelector('[session="true"]');
         } else if (data.userStatus == 'off') {
-            let redirectTag = document.querySelector('[session="false"]');
+            redirectTag = document.querySelector('[session="false"]');
+        }
 
-            if (redirectTag) {
-                let redirectLink = redirectTag.getAttribute('href');
-                if (redirectLink) {
+        if (redirectTag) {
+            let redirectLink = redirectTag.getAttribute('href');
+            if (redirectLink) {
+                if (data.userStatus == 'off') {
                     localStorage.removeItem("user_id");
                     localStorage.removeItem("token");
-                    document.location.href = redirectLink;
                 }
+
+                // Normalize both URLs to compare paths in a uniform way
+                const currentPath = new URL(location.href).pathname.replace('/index.html', '/');
+                const targetPath = new URL(redirectLink, location.href).pathname.replace('/index.html', '/');
+
+                if (currentPath !== targetPath) {
+                    location.href = redirectLink;
+                }
+
             }
+
         }
 
         if (data.userStatus) {

package/src/server.js

@@ -87,6 +87,7 @@ class CoCreateUser {
                 self.wsManager.send(response)
                 self.wsManager.send({
                     socket,
+                    host: data.host,
                     method: 'updateUserStatus',
                     user_id: response.user_id,
                     userStatus: response.userStatus,
@@ -120,6 +121,7 @@ class CoCreateUser {
                     self.wsManager.send({
                         socket: data.socket,
                         method: 'updateUserStatus',
+                        host: data.host,
                         user_id: data.user_id,
                         clientId: data.clientId,
                         userStatus: data.userStatus,
@@ -129,6 +131,7 @@ class CoCreateUser {
             } else if (data.socket)
                 data.socket.send(JSON.stringify({
                     method: 'updateUserStatus',
+                    host: data.host,
                     user_id: data.user_id,
                     userStatus: data.userStatus,
                     clientId: data.clientId,