refactor: 💡 move url building logic to core + add unit test

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-17231

Author: lisbet-alvarez

addons/auth/addon/authenticators/base.js

@@ -6,7 +6,6 @@
 import SimpleAuthBaseAuthenticator from 'ember-simple-auth/authenticators/base';
 import { resolve, reject } from 'rsvp';
 import { waitForPromise } from '@ember/test-waiters';
-import { service } from '@ember/service';
 
 /**
  * Encapsulates common authenticator functionality.
@@ -20,10 +19,6 @@ import { service } from '@ember/service';
  * All other responses should resolve the session restoration successfully.
  */
 export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
-  // =services
-
-  @service store;
-
   // =unimplemented methods
 
   /**
@@ -56,6 +51,14 @@ export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
    */
   buildTokenValidationEndpointURL(/* tokenID */) {}
 
+  /**
+   * Generates an account URL used to retrieve authenticated account.
+   * @override
+   * @param {string} accountID
+   * @return {string}
+   */
+  buildAccountEndpointURL(/* accountID */) {}
+
   // =methods
 
   /**
@@ -116,15 +119,12 @@ export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
     data.isOrg = data?.scope?.type === 'org';
 
     try {
-      const adapter = this.store.adapterFor('application');
-      const findAccountRecordURL = adapter.buildURL(
-        'account',
+      const accountFindRecordURL = this.buildAccountEndpointURL(
         data?.account_id,
-        {},
-        'findRecord',
       );
+
       const response = await waitForPromise(
-        fetch(findAccountRecordURL, {
+        fetch(accountFindRecordURL, {
           method: 'get',
           headers: { Authorization: `Bearer ${data.attributes.token}` },
         }),

addons/auth/tests/dummy/app/authenticators/base.js

@@ -13,4 +13,8 @@ export default class ApplicationBaseAuthenticator extends BaseAuthenticator {
   buildDeauthEndpointURL() {
     return '/deauthenticate';
   }
+
+  buildAccountEndpointURL(id) {
+    return `/account/${id}`;
+  }
 }

addons/auth/tests/unit/authenticators/base-test.js

@@ -88,4 +88,34 @@ module('Unit | Authenticator | base', function (hooks) {
       assert.ok(true, 'restoration failed');
     }
   });
+
+  test('it normalizes authenticated data correctly', async function (assert) {
+    assert.expect(6);
+    const account_id = 'account_123';
+    const token = 'token123';
+    const scope = { id: 'global', type: 'global' };
+    const mockData = {
+      scope,
+      id: 'auth_123',
+      attributes: { account_id, token },
+    };
+    const account = { id: account_id, attributes: { email: '[email protected]' } };
+    const authenticator = this.owner.lookup('authenticator:base');
+
+    server.get(authenticator.buildAccountEndpointURL(account_id), () => {
+      assert.ok(true, 'account data was requested');
+      return [200, account, JSON.stringify(account)];
+    });
+
+    const normalizedData = await authenticator.normalizeData(mockData);
+
+    assert.true(normalizedData.isGlobal);
+    assert.false(normalizedData.isOrg);
+    assert.strictEqual(normalizedData.username, account.attributes.email);
+    assert.strictEqual(
+      normalizedData.account_id,
+      mockData.attributes.account_id,
+    );
+    assert.strictEqual(normalizedData.token, mockData.attributes.token);
+  });
 });

addons/core/addon/authenticators/oidc.js

@@ -56,6 +56,17 @@ export default class OIDCAuthenticator extends BaseOIDCAuthenticator {
     return adapter.buildURL('auth-token', tokenID, {}, 'findRecord');
   }
 
+  /**
+   * Generates an account URL used to retrieve authenticated account.
+   * @override
+   * @param {string} accountID
+   * @return {string}
+   */
+  buildAccountEndpointURL(accountID) {
+    const adapter = this.store.adapterFor('application');
+    return adapter.buildURL('account', accountID, {}, 'findRecord');
+  }
+
   /**
    * Intercepts the authenticate response, if any, and assigns the returned
    * token to all future requests via `addTokenToAuthorization`.

addons/core/addon/authenticators/password.js

@@ -58,6 +58,17 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
     return adapter.buildURL('auth-token', tokenID, {}, 'findRecord');
   }
 
+  /**
+   * Generates an account URL used to retrieve authenticated account.
+   * @override
+   * @param {string} accountID
+   * @return {string}
+   */
+  buildAccountEndpointURL(accountID) {
+    const adapter = this.store.adapterFor('application');
+    return adapter.buildURL('account', accountID, {}, 'findRecord');
+  }
+
   /**
    * Intercepts the authenticate response, if any, and assigns the returned
    * token to all future requests via `addTokenToAuthorization`.

ui/admin/app/styles/app.scss

@@ -1022,3 +1022,18 @@
 .dropdown-checkbox-list {
   margin-bottom: 1rem;
 }
+
+// User menu dropdown in global side nav
+.user-menu-dropdown {
+  max-width: 125px;
+
+  &__toggle-button {
+    width: 100%;
+
+    .hds-dropdown-toggle-button__text {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}

ui/admin/app/templates/application.hbs

@@ -60,16 +60,24 @@
 
             <Hds::Dropdown
               @enableCollisionDetection={{true}}
+              class='user-menu-dropdown'
               data-test-side-nav-user-dropdown
               as |dd|
             >
-              <dd.ToggleIcon @icon='user' @text={{t 'titles.user-menu'}} />
               {{#if this.session.data.authenticated.username}}
+                <dd.ToggleButton
+                  @icon='user'
+                  @text={{this.session.data.authenticated.username}}
+                  {{hds-tooltip this.session.data.authenticated.username}}
+                  class='user-menu-dropdown__toggle-button'
+                />
                 <dd.Title @text={{t 'titles.authenticated'}} />
                 <dd.Description
                   @text={{this.session.data.authenticated.username}}
                 />
                 <dd.Separator />
+              {{else}}
+                <dd.ToggleIcon @icon='user' @text={{t 'titles.user-menu'}} />
               {{/if}}
 
               <dd.Interactive @route='account.change-password'>{{t