refactor: 💡 remove usage of ember/runloop & ember-pollster

addons/core/addon/components/form/authenticate/details/index.js

@@ -6,7 +6,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { run } from '@ember/runloop';
 
 export default class FormAuthenticateDetailsComponent extends Component {
   // =properties
@@ -36,7 +35,7 @@ export default class FormAuthenticateDetailsComponent extends Component {
    */
   @action
   submit(fn, creds) {
-    run(() => this.resetPassword());
-    run(() => fn(creds));
+    this.resetPassword();
+    fn(creds);
   }
 }

addons/core/addon/components/loading-button/index.hbs

@@ -6,7 +6,7 @@
 <Hds::Button
   @text={{t 'actions.refresh'}}
   @color='secondary'
-  @icon={{if this.isLoading 'loading' 'reload'}}
+  @icon={{if this.toggleRefresh.isRunning 'loading' 'reload'}}
   @disabled={{this.isLoading}}
-  {{on 'click' this.toggleRefresh}}
+  {{on 'click' this.toggleRefresh.perform}}
 />

addons/core/addon/components/loading-button/index.js

@@ -4,22 +4,13 @@
  */
 
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { later } from '@ember/runloop';
+import { dropTask, timeout } from 'ember-concurrency';
 
 export default class LoadingButton extends Component {
-  // =actions
-  @tracked isLoading = false;
+  // =attributes
 
-  @action
-  async toggleRefresh() {
-    this.isLoading = true;
-    try {
-      await this.args.onClick();
-    } catch (e) {
-      console.error('Error while loading data', e);
-    }
-    later(() => (this.isLoading = false), 1000);
-  }
+  toggleRefresh = dropTask(async () => {
+    await this.args.onClick();
+    await timeout(1000);
+  });
 }

addons/core/addon/helpers/time-remaining.js

@@ -19,10 +19,10 @@ export default class extends Helper {
     // Parse the expiration time
     const expirationTime = new Date(expiration_time);
 
-    // Get the curent time
+    // Get the current time
     const currentTime = this.clockTick.now;
 
-    // Calculate the difference in milleseconds
+    // Calculate the difference in milliseconds
     const difference = expirationTime - currentTime;
 
     // Calculate the difference in seconds if the difference is positive

addons/core/addon/services/clock-tick.js

@@ -6,7 +6,7 @@
 import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { getOwner } from '@ember/application';
-import { next } from '@ember/runloop';
+import { task, timeout } from 'ember-concurrency';
 
 export default class ClockTickService extends Service {
   // =attributes
@@ -25,9 +25,15 @@ export default class ClockTickService extends Service {
   frequency = 1000;
 
   /**
-   * The timer interval ID
+   * Updates the value of `now` every `frequency` milliseconds.
    */
-  #timer;
+  _tick = task(async () => {
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      await timeout(this.frequency);
+      this.now = Date.now();
+    }
+  });
 
   /**
    * This service is enabled only in non-test environments.
@@ -45,39 +51,14 @@ export default class ClockTickService extends Service {
    */
   constructor() {
     super(...arguments);
-    if (this.enabled) this._start();
+    if (this.enabled) this._tick.perform();
   }
 
   /**
    * Stops the timer.
    */
   willDestroy() {
     super.willDestroy(...arguments);
-    this._stop();
-  }
-
-  /**
-   * Sets up the timer interval, calling `_tick()` every
-   * `frequency` milliseconds.
-   */
-  _start() {
-    const self = this;
-    this.#timer = setInterval(function () {
-      self._tick();
-    }, this.frequency);
-  }
-
-  /**
-   * Clears the timer interval.
-   */
-  _stop() {
-    clearInterval(this.#timer);
-  }
-
-  /**
-   * Updates the value of `now` within the next runloop.
-   */
-  _tick() {
-    next(() => (this.now = Date.now()));
+    this._tick.cancelAll();
   }
 }

addons/core/ember-cli-build.js

@@ -14,6 +14,11 @@ module.exports = function (defaults) {
     'ember-simple-auth': {
       useSessionSetupMethod: true,
     },
+    babel: {
+      plugins: [
+        require.resolve('ember-concurrency/async-arrow-task-transform'),
+      ],
+    },
   });
 
   /*

addons/core/index.js

@@ -10,6 +10,14 @@ var path = require('path');
 module.exports = {
   name: require('./package').name,
 
+  options: {
+    babel: {
+      plugins: [
+        require.resolve('ember-concurrency/async-arrow-task-transform'),
+      ],
+    },
+  },
+
   included(app) {
     this._super.included.apply(this, arguments);
     this.includePublic(app);

addons/core/package.json

@@ -39,6 +39,7 @@
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-sass": "^11.0.1",
+    "ember-concurrency": "^4.0.3",
     "ember-feature-flags": "^6.0.0",
     "ember-intl": "^7.0.7",
     "ember-loading": "^2.0.0",

ui/admin/app/components/form/account/password/change-password/index.js

@@ -5,9 +5,7 @@
 
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordChangePasswordIndexComponent extends Component {
   // =properties
@@ -25,23 +23,21 @@ export default class FormAccountPasswordChangePasswordIndexComponent extends Com
   /**
    * @type {boolean}
    */
-  @computed('currentPassword', 'newPassword')
   get canSave() {
     return this.currentPassword && this.newPassword;
   }
 
   /**
    * @type {boolean}
    */
-  @computed('canSave')
   get cannotSave() {
     return !this.canSave;
   }
 
   // =methods
 
   /**
-   * Unsets the password fields.
+   * Un-sets the password fields.
    */
   resetPasswords() {
     this.currentPassword = null;
@@ -52,15 +48,15 @@ export default class FormAccountPasswordChangePasswordIndexComponent extends Com
 
   /**
    * Call passed submit function with passwords.
-   * Unset passwords before callack.
+   * Unset passwords before callback.
    * @param {function} fn
    * @param {string} currentPassword
    * @param {string} newPassword
    */
   @action
   submit(fn, currentPassword, newPassword) {
-    run(() => this.resetPasswords());
-    run(() => fn(currentPassword, newPassword));
+    this.resetPasswords();
+    fn(currentPassword, newPassword);
   }
 
   /**

ui/admin/app/components/form/account/password/index.js

@@ -6,7 +6,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { next } from '@ember/runloop';
 
 export default class FormAccountPasswordIndexComponent extends Component {
   // =properties
@@ -36,7 +35,7 @@ export default class FormAccountPasswordIndexComponent extends Component {
   @action
   submit(fn) {
     const password = this.password;
-    next(() => this.resetPassword());
+    this.resetPassword();
     return this.args.model.isNew ? fn(password) : fn();
   }
 }

ui/admin/app/components/form/account/password/set-password/index.js

@@ -5,9 +5,7 @@
 
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { computed } from '@ember/object';
 import { action } from '@ember/object';
-import { run } from '@ember/runloop';
 
 export default class FormAccountPasswordSetPasswordIndexComponent extends Component {
   // =properties
@@ -21,7 +19,6 @@ export default class FormAccountPasswordSetPasswordIndexComponent extends Compon
   /**
    * @type {boolean}
    */
-  @computed('password')
   get cannotSave() {
     return !this.password;
   }
@@ -45,7 +42,7 @@ export default class FormAccountPasswordSetPasswordIndexComponent extends Compon
    */
   @action
   submit(fn, password) {
-    run(() => this.resetPassword());
-    run(() => fn(password));
+    this.resetPassword();
+    fn(password);
   }
 }

ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js

@@ -7,7 +7,7 @@ import Route from '@ember/routing/route';
 import { getOwner } from '@ember/application';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import runEvery from 'ember-pollster/decorators/route/run-every';
+import { task, timeout } from 'ember-concurrency';
 import { notifyError } from 'core/decorators/notify';
 import config from '../../../../../config/environment';
 
@@ -20,6 +20,15 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route {
   @service windowManager;
   @service router;
 
+  // =attributes
+
+  poller = task(async () => {
+    while (!this.session.isAuthenticated) {
+      await timeout(POLL_TIMEOUT_SECONDS * 1000);
+      this.refresh();
+    }
+  });
+
   // =methods
 
   beforeModel;
@@ -43,16 +52,19 @@ export default class ScopesScopeAuthenticateMethodOidcRoute extends Route {
     controller.authMethod = authMethod;
   }
 
-  @runEvery(POLL_TIMEOUT_SECONDS * 1000)
-  poller() {
-    this.refresh();
+  /**
+   * When this route is activated (entered), start polling for authentication.
+   */
+  activate() {
+    this.poller.perform();
   }
 
   /**
    * When this route is deactivated (exited), stop polling for changes and close
    * any windows opened via the window manager service.
    */
   deactivate() {
+    this.poller.cancelAll();
     this.windowManager.closeAll();
   }
 

ui/admin/config/environment.js

@@ -52,7 +52,6 @@ module.exports = function (environment) {
     appName: APP_NAME,
     companyName: 'HashiCorp',
 
-    sessionPollingTimeoutSeconds: 300,
     oidcPollingTimeoutSeconds: 1,
 
     documentation: {
@@ -195,6 +194,8 @@ module.exports = function (environment) {
 
     // Notification timeout should be 0 for fast tests
     ENV.flashMessageDefaults.timeout = 0;
+    // OIDC Authentication timeout should be 0 for fast tests
+    ENV.oidcPollingTimeoutSeconds = 0;
 
     ENV.enableConfirmService = false;
   }

ui/admin/ember-cli-build.js

@@ -18,6 +18,9 @@ module.exports = function (defaults) {
     },
     babel: {
       sourceMaps: 'inline',
+      plugins: [
+        require.resolve('ember-concurrency/async-arrow-task-transform'),
+      ],
     },
     sourcemaps: {
       enabled: true,
@@ -34,7 +37,7 @@ module.exports = function (defaults) {
       },
     },
     // TODO: Update to 4.12 when deprecations are resolved
-    //   as multiple things break when forcing compatability on > 4.6
+    //   as multiple things break when forcing compatibility on > 4.6
     emberData: {
       compatWith: '4.6',
     },

ui/admin/package.json

@@ -71,12 +71,12 @@
     "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
+    "ember-concurrency": "^4.0.3",
     "ember-exam": "^8.0.0",
     "ember-inline-svg": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-pollster": "https://github.com/hashicorp/ember-pollster.git#605d82e986d829b098667e4a5e221877a4ee4ac8",
     "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",

ui/admin/tests/acceptance/authentication-test.js

@@ -16,7 +16,6 @@ import { setupApplicationTest } from 'admin/tests/helpers';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import { setupIndexedDb } from 'api/test-support/helpers/indexed-db';
 import { Response } from 'miragejs';
-import { runAllJobs } from 'ember-pollster/test-support';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import {
   currentSession,
@@ -86,7 +85,7 @@ module('Acceptance | authentication', function (hooks) {
       },
       'withChildren',
     );
-    // create an emtpy org with no auth methods
+    // create an empty org with no auth methods
     this.server.create(
       'scope',
       {
@@ -391,9 +390,6 @@ module('Acceptance | authentication', function (hooks) {
     );
     await visit(authMethodOIDCAuthenticateURL);
     await click('form [type="submit"]');
-    // explicitly poll multiple times to trigger mock OIDC auth
-    await runAllJobs();
-    await runAllJobs();
   });
 
   // TODO:  test OIDC retry and cancel