luci-app-ocserv: correct JSON user data

Should help users like #8571

Signed-off-by: Paul Donald <redacted>

diff --git a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js
index d37c2c1ca6e4c2a40c0365c680ca089cd5223d72..d8477b05afc2f5b79bbc7a52d8977c87de2368e2 100644 (file)
--- a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js
+++ b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/ocserv/users.js
@@ -59,18 +59,18 @@ return L.view.extend({
 
        normalizeUser(entry) {
                return {
-                       id: entry.id,
-                       user: entry?.username || entry?.user,
-                       group: entry?.group,
-                       vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip,
-                       vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6,
-                       ip: entry?.ip,
-                       device: entry?.device,
-                       time: entry?.time || entry['connected-at'],
-                       cipher: entry?.cipher,
-                       status: entry?.status,
-                       tx: entry?._TX || entry?.TX || entry?.tx,
-                       rx: entry?._RX || entry?.RX || entry?.rx
+                       id: entry.ID,
+                       user: entry?.Username || entry?.User,
+                       group: entry?.Groupname || entry?.Group,
+                       vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'],
+                       vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'],
+                       ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'],
+                       device: entry?.Device,
+                       time: entry?.raw_connected_at || entry['Connected at'],
+                       cipher: entry?.Cipher || entry?.['TLS ciphersuite'],
+                       status: entry?.Status || entry?.State,
+                       tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx,
+                       rx: entry?._RX || entry?.RX || entry?.rx || entry?.raw_rx,
                };
        },
 

diff --git a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js
index 6a886574435345d7874f20fdc911483d8bf22e79..3585fb6ff50f061bd25e2ecb8e745edb0db0766c 100644 (file)
--- a/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js
+++ b/applications/luci-app-ocserv/htdocs/luci-static/resources/view/status/include/80_ocserv.js
@@ -46,18 +46,18 @@ return baseclass.extend({
 
        normalizeUser: function(entry) {
                return {
-                       id: entry.id,
-                       user: entry?.username || entry?.user,
-                       group: entry?.group,
-                       vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip,
-                       vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6,
-                       ip: entry?.ip,
-                       device: entry?.device,
-                       time: entry?.time || entry['connected-at'],
-                       cipher: entry?.cipher,
-                       status: entry?.status,
-                       tx: entry?._TX || entry?.TX || entry?.tx,
-                       rx: entry?._RX || entry?.RX || entry?.rx
+                       id: entry.ID,
+                       user: entry?.Username || entry?.User,
+                       group: entry?.Groupname || entry?.Group,
+                       vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'],
+                       vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'],
+                       ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'],
+                       device: entry?.Device,
+                       time: entry?.raw_connected_at || entry['Connected at'],
+                       cipher: entry?.Cipher || entry?.['TLS ciphersuite'],
+                       status: entry?.Status || entry?.State,
+                       tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx,
+                       rx: entry?._RX || entry?.RX || entry?.rx || entry?.raw_rx,
                };
        },