commit 8b0511b7ee6a8af645fec67651d6c37baa3089cf
author Marco Miller <marco.miller@ericsson.com> Mon Feb 03 16:06:39 2020 -0500
committer Marco Miller <marco.miller@ericsson.com> Mon Feb 03 16:06:39 2020 -0500
tree 5d2b1cc70b19c8015fceb8c7788fb9c71e637ff2
parent b619bf04e3737a43c37c5c180dcc0a507db3a20a
parent 6f87f7fcd8af4f0b18255048c3d3d39361f84a0e

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Revert "Check if full name and email edit are allowed in realm"

Change-Id: Iea5e80134a0a92066da647d080c7e0a31f6d5eb4

src/main/resources/static/gr-serviceuser-detail.html

diff --git a/src/main/resources/static/gr-serviceuser-detail.html b/src/main/resources/static/gr-serviceuser-detail.html
index e515ee6..41e4e8d 100644
--- a/src/main/resources/static/gr-serviceuser-detail.html
+++ b/src/main/resources/static/gr-serviceuser-detail.html
@@ -101,7 +101,6 @@
                              on-keyup="_computePrefsChanged">
                     </iron-input>
                   </span>
-                  <span class="value" hidden$="[[_allowFullName]]">[[_serviceUser.name]]</span>
                 </section>
                 <section>
                   <span class="title">Email Address</span>

src/main/resources/static/gr-serviceuser-detail.js

diff --git a/src/main/resources/static/gr-serviceuser-detail.js b/src/main/resources/static/gr-serviceuser-detail.js
index 53ec980..95aded2 100644
--- a/src/main/resources/static/gr-serviceuser-detail.js
+++ b/src/main/resources/static/gr-serviceuser-detail.js
@@ -25,7 +25,6 @@
       _restApi: Object,
       _serviceUserId: String,
       _serviceUser: Object,
-      _serverConfig: Object,
       _loading: {
         type: Boolean,
         value: true,
@@ -50,10 +49,6 @@
         type: Boolean,
         value: false,
       },
-      _allowFullName: {
-        type: Boolean,
-        value: false,
-      },
       _allowOwner: {
         type: Boolean,
         value: false,
@@ -80,10 +75,8 @@
     ],
 
     attached() {
-      this._getPermissions().then(() => {
-        this._extractUserId();
-        this._loadServiceUser();
-      });
+      this._extractUserId();
+      this._loadServiceUser();
     },
 
     _loadServiceUser() {
@@ -93,7 +86,6 @@
 
       promises.push(this._getPluginConfig());
       promises.push(this._getServiceUser());
-      promises.push(this._getServerConfig());
 
       Promise.all(promises).then(() => {
         this.$.sshEditor.loadData(this._restApi, this._serviceUser);
@@ -104,11 +96,6 @@
         this._loading = false;
         this._newFullName = this._serviceUser.name;
         this._newEmail = this._serviceUser.email;
-        this._allowFullName = this._serverConfig.auth.editable_account_fields
-          .includes('FULL_NAME');
-        this._allowEmail = this._allowEmail &&
-          this._serverConfig.auth.editable_account_fields
-            .includes('REGISTER_NEW_EMAIL');
       });
     },
 
@@ -128,25 +115,17 @@
     },
 
     _getPluginConfig() {
-      return this.plugin.restApi('/config/server/serviceuser~config/').get('')
-          .then(config => {
-            if (!config) {
-              return;
-            }
-            this._allowEmail = config.allow_email || this._isAdmin;
-            this._allowOwner = config.allow_owner || this._isAdmin;
-            this._allowHttpPassword = config.allow_http_password
-              || this._isAdmin;
-          });
-    },
-
-    _getServerConfig() {
-      return this.plugin.restApi().getConfig().then(cfg => {
-        if (!cfg) {
-          return;
-        }
-
-        this._serverConfig = cfg;
+      return Promise.resolve(this._getPermissions()).then(() => {
+        this.plugin.restApi('/config/server/serviceuser~config/').get('')
+            .then(config => {
+              if (!config) {
+                return;
+              }
+              this._allowEmail = config.allow_email || this._isAdmin;
+              this._allowOwner = config.allow_owner || this._isAdmin;
+              this._allowHttpPassword = config.allow_http_password
+                || this._isAdmin;
+            });
       });
     },