return account name and sp name in getUsers (#87)

lib/routes/api/users.js

@@ -72,10 +72,10 @@ router.get('/', async(req, res) => {
       results = await User.retrieveAll();
     }
     else if (decodedJwt.scope === 'account') {
-      results = await User.retrieveAllForAccount(decodedJwt.account_sid);
+      results = await User.retrieveAllForAccount(decodedJwt.account_sid, true);
     }
     else if (decodedJwt.scope === 'service_provider') {
-      results = await User.retrieveAllForServiceProvider(decodedJwt.service_provider_sid);
+      results = await User.retrieveAllForServiceProvider(decodedJwt.service_provider_sid, true);
     }
     else {
       throw new DbErrorBadRequest(`invalid scope: ${decodedJwt.scope}`);
@@ -84,7 +84,17 @@ router.get('/', async(req, res) => {
     if (results.length === 0) throw new Error('failure retrieving users list');
 
     usersList = results.map((user) => {
-      const {user_sid, name, email, force_change, is_active, account_sid, service_provider_sid} = user;
+      const {
+        user_sid,
+        name,
+        email,
+        force_change,
+        is_active,
+        account_sid,
+        service_provider_sid,
+        account_name,
+        service_provider_name
+      } = user;
       let scope;
       if (account_sid && service_provider_sid) {
         scope = 'account';
@@ -94,16 +104,19 @@ router.get('/', async(req, res) => {
         scope = 'admin';
       }
 
-      return {
+      const obj = {
         user_sid,
         name,
         email,
         scope,
         force_change,
         is_active,
-        account_sid,
-        service_provider_sid
+        ...(account_sid && {account_sid}),
+        ...(account_name && {account_name}),
+        ...(service_provider_sid && {service_provider_sid}),
+        ...(service_provider_name && {service_provider_name})
       };
+      return obj;
     });
   } catch (err) {
     sysError(logger, res, err);