From 74117dccae90c8905c8f4f54d16fcf19ce5eb27e Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Thu, 23 Jul 2020 04:12:12 -0400 Subject: [PATCH] add account syncPassword flag. fix device refresh. don't show users on dashboard if max 1 user. --- src/_services/user.service.js | 2 +- src/_store/system.module.js | 3 ++- src/account/DevicesPage.vue | 5 +++++ src/account/NewNetworkPage.vue | 24 ++++++++++++------------ src/account/profile/ProfilePage.vue | 12 +++++++++++- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/_services/user.service.js b/src/_services/user.service.js index 35492b0..87ace74 100644 --- a/src/_services/user.service.js +++ b/src/_services/user.service.js @@ -211,7 +211,7 @@ function createUser(user, messages, errors) { } function updateUser(user, messages, errors) { - return fetch(`${config.apiUrl}/users/${user.name}`, util.postWithAuth(user)).then(util.handleCrudResponse(messages, errors)); + return fetch(`${config.apiUrl}/users/${user.email}`, util.postWithAuth(user)).then(util.handleCrudResponse(messages, errors)); } function deleteUser(userId, messages, errors) { diff --git a/src/_store/system.module.js b/src/_store/system.module.js index b684889..5992c0f 100644 --- a/src/_store/system.module.js +++ b/src/_store/system.module.js @@ -31,6 +31,7 @@ const state = { securityLevels: null, jarVersion: null, jarUpgradeAvailable: null, + maxUsers: null }, entityConfigs: {}, searchResults: [], @@ -310,7 +311,7 @@ const getters = { index: 4, apps: adminApps, }); - } else if (isAdmin) { + } else if (isAdmin && configs.maxUsers > 1) { dashApps.push({ href: '/admin/accounts', title: messages.label_menu_admin_users, diff --git a/src/account/DevicesPage.vue b/src/account/DevicesPage.vue index c0a09f2..d8f927d 100644 --- a/src/account/DevicesPage.vue +++ b/src/account/DevicesPage.vue @@ -319,6 +319,11 @@ this.deviceName = null; this.deviceType = null; if (dev.uuid) this.showVpnConfig(dev.uuid); + this.getDevicesByUserId({ + userId: this.userId, + messages: this.messages, + errors: this.errors + }); } } } diff --git a/src/account/NewNetworkPage.vue b/src/account/NewNetworkPage.vue index bf6e65f..d923f25 100644 --- a/src/account/NewNetworkPage.vue +++ b/src/account/NewNetworkPage.vue @@ -276,19 +276,19 @@
-
- - -
{{ errors.first('syncPassword') }}
-

{{messages.field_label_sync_password_description}}

-
+ + + + + + -
- - -
{{ errors.first('launchLock') }}
-

{{messages.field_label_launch_lock_description}}

-
+ + + + + +
diff --git a/src/account/profile/ProfilePage.vue b/src/account/profile/ProfilePage.vue index b336363..57c31bc 100644 --- a/src/account/profile/ProfilePage.vue +++ b/src/account/profile/ProfilePage.vue @@ -71,9 +71,17 @@ {{messages.field_label_suspended}}: {{messages['message_'+subject.suspended]}}
+ +
+ + +
{{ errors.first('syncPassword') }}
+

{{messages.field_label_sync_password_description}}

+
+

{{messages.field_label_auto_update_policy}}

-
+
@@ -105,6 +113,7 @@ locale: null, admin: null, suspended: null, + syncPassword: null, autoUpdatePolicy: { jarUpdates: true, appUpdates: true @@ -188,6 +197,7 @@ locale: this.subject.locale, admin: this.subject.admin, suspended: this.subject.suspended, + syncPassword: this.subject.syncPassword, autoUpdatePolicy: this.subject.autoUpdatePolicy }; this.submitted = true;