Merge branch 'main' into desktop-update-feature

addons/api/addon/models/auth-method.js

@@ -8,4 +8,18 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
    * @type {boolean}
    */
   @equal('primary', true) isPrimary;
+
+  /**
+   * @type {boolean}
+   */
+  get isPassword() {
+    return this.type === 'password';
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isOIDC() {
+    return this.type === 'oidc';
+  }
 }

addons/api/mirage/config.js

@@ -69,7 +69,7 @@ export default function () {
     if (scope.primaryAuthMethodId === id) {
       scope.update({ primaryAuthMethodId: null });
     }
-    return new Response(204);
+    return new Response(202);
   });
 
   // Auth Method Accounts

addons/api/mirage/factories/auth-method.js

@@ -1,9 +1,14 @@
 import factory from '../generated/factories/auth-method';
 import { trait } from 'ember-cli-mirage';
 
+const types = ['password', 'oidc'];
+
 export default factory.extend({
   id: (i) => `auth-method-id-${i}`,
 
+  // Cycle through available types
+  type: (i) => types[i % types.length],
+
   /**
    * Adds accounts (with associated users) to auth method.
    */

addons/api/mirage/factories/target.js

@@ -1,6 +1,6 @@
 import factory from '../generated/factories/target';
 import { trait } from 'ember-cli-mirage';
-import { random } from 'faker';
+import { random, datatype } from 'faker';
 
 const randomBoolean = (chance = 0.5) => Math.random() < chance;
 const hostSetChance = 0.3;
@@ -9,7 +9,7 @@ export default factory.extend({
   /**
    * -1 means "unlimited" and we want to generate these on occassion.
    */
-  session_connection_limit: () => random.arrayElement([-1, random.number()]),
+  session_connection_limit: () => random.arrayElement([-1, datatype.number()]),
 
   /**
    * Generates attributes fields by type.
@@ -18,7 +18,7 @@ export default factory.extend({
     if (target.type === 'tcp') {
       target.update({
         attributes: {
-          default_port: random.number(),
+          default_port: datatype.number(),
         },
       });
     }

addons/api/mirage/generated/factories/account.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedAccountFactory
@@ -10,6 +10,6 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  version: () => random.number(),
+  version: () => datatype.number(),
   attributes: () => ({ login_name: random.words() }),
 });

addons/api/mirage/generated/factories/auth-method.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedAuthMethodModelFactory
@@ -10,5 +10,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/generated/factories/group.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedGroupModelFactory
@@ -10,5 +10,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/generated/factories/host-catalog.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedHostCatalogModelFactory
@@ -10,5 +10,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/generated/factories/host-set.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedHostSetModelFactory
@@ -10,6 +10,6 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  version: () => random.number(),
-  size: () => random.number(),
+  version: () => datatype.number(),
+  size: () => datatype.number(),
 });

addons/api/mirage/generated/factories/host.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, internet } from 'faker';
+import { random, date, internet, datatype } from 'faker';
 
 /**
  * GeneratedHostModelFactory
@@ -10,7 +10,7 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  version: () => random.number(),
+  version: () => datatype.number(),
   attributes: () => {
     return { address: internet.ipv6() };
   },

addons/api/mirage/generated/factories/project.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedProjectModelFactory
@@ -10,5 +10,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/generated/factories/role.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedRoleModelFactory
@@ -10,6 +10,6 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
-  version: () => random.number(),
+  disabled: () => datatype.boolean(),
+  version: () => datatype.number(),
 });

addons/api/mirage/generated/factories/scope.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedScopeModelFactory
@@ -9,5 +9,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/generated/factories/session.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { date, datatype } from 'faker';
 
 /**
  * GeneratedSessionModelFactory
@@ -8,5 +8,5 @@ export default Factory.extend({
   type: 'tcp',
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  version: () => random.number(),
+  version: () => datatype.number(),
 });

addons/api/mirage/generated/factories/target.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedTargetModelFactory
@@ -7,11 +7,11 @@ import { random, date } from 'faker';
 export default Factory.extend({
   type: 'tcp',
   name: () => random.words(),
-  session_max_seconds: () => random.number(),
-  session_connection_limit: () => random.number(),
+  session_max_seconds: () => datatype.number(),
+  session_connection_limit: () => datatype.number(),
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
-  version: () => random.number(),
+  disabled: () => datatype.boolean(),
+  version: () => datatype.number(),
 });

addons/api/mirage/generated/factories/user.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { random, date, datatype } from 'faker';
 
 /**
  * GeneratedUserModelFactory
@@ -10,5 +10,5 @@ export default Factory.extend({
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
-  disabled: () => random.boolean(),
+  disabled: () => datatype.boolean(),
 });

addons/api/mirage/route-handlers/auth.js

@@ -12,7 +12,7 @@ import { Response } from 'miragejs';
 //  */
 // export default function authenticateHandler(schema, request) {
 //   const payload = JSON.parse(request.requestBody);
-//   if (payload.credentials.login_name === 'error') {
+//   if (payload.attributes.login_name === 'error') {
 //     return new Response(400);
 //   } else {
 //     const cookieName = config.auth.passwordCookieName;
@@ -23,32 +23,98 @@ import { Response } from 'miragejs';
 //   }
 // }
 
+// Quick and dirty counter system to simulate the polling behavior
+// of the API.  If the OIDC flow is pending, the route returns 100.
+// If complete it returns 200 with the token JSON.
+let oidcAttemptCounter = 0;
+const oidcRequiredAttempts = 3;
+
+const commandHandlers = {
+  password: {
+    login: (payload, scopeAttrs) => {
+      if (payload.attributes.login_name === 'error') {
+        return new Response(400);
+      } else {
+        return new Response(
+          200,
+          {},
+          {
+            attributes: {
+              scope: scopeAttrs,
+              id: 'token123',
+              token: 'thetokenstring',
+              account_id: '1',
+              user_id: 'user123',
+              auth_method_id: 'authmethod123',
+              created_time: '',
+              updated_time: '',
+              last_used_time: '',
+              expiration_time: '',
+            },
+          }
+        );
+      }
+    },
+  },
+
+  /**
+   * OIDC authentication is a two-step process:
+   *
+   * 1. `authenticate:start` kicks of authentication by requesting some details
+   *    from the Boundary server about the request, including the third-party
+   *    URL to which to redirect the user.
+   * 2. `authenticate` accepts the token_id and state parameters in
+   *    order to retrieve a Boundary token.  This endpoint may be polled until
+   *    the authentication flow is completed.
+   */
+  oidc: {
+    start: () =>
+      new Response(
+        200,
+        {},
+        {
+          attributes: {
+            auth_url: 'https://www.duckduckgo.com',
+            token_id: 'token_1234',
+          },
+        }
+      ),
+    token: (_, scopeAttrs) => {
+      oidcAttemptCounter++;
+      if (oidcAttemptCounter < oidcRequiredAttempts) {
+        return new Response(202);
+      } else {
+        return new Response(
+          200,
+          {},
+          {
+            attributes: {
+              scope: scopeAttrs,
+              id: 'token123',
+              token: 'thetokenstring',
+              account_id: '1',
+              user_id: 'user123',
+              auth_method_id: 'authmethod123',
+              created_time: '',
+              updated_time: '',
+              last_used_time: '',
+              expiration_time: '',
+            },
+          }
+        );
+      }
+    },
+  },
+};
+
 export function authHandler({ scopes, authMethods }, request) {
   const payload = JSON.parse(request.requestBody);
-  if (payload.credentials.login_name === 'error') {
-    return new Response(400);
-  } else {
-    const id = request.params.id_method.split(':')[0];
-    const authMethod = authMethods.find(id);
-    const scope = scopes.find(authMethod.scopeId);
-    const scopeAttrs = this.serialize(scopes.find(scope.id));
-    return new Response(
-      200,
-      {},
-      {
-        scope: scopeAttrs,
-        id: 'token123',
-        token: 'thetokenstring',
-        account_id: '1',
-        user_id: 'authenticateduser',
-        auth_method_id: 'authmethod123',
-        created_time: '',
-        updated_time: '',
-        last_used_time: '',
-        expiration_time: '',
-      }
-    );
-  }
+  const [, id] = request.params.id_method.match(/(?<id>.[^:]*)/);
+  const { command } = payload;
+  const authMethod = authMethods.find(id);
+  const scope = scopes.find(authMethod.scopeId);
+  const scopeAttrs = this.serialize(scopes.find(scope.id));
+  return commandHandlers[authMethod.type][command](payload, scopeAttrs);
 }
 
 export function deauthHandler() {

addons/api/mirage/scenarios/ipc.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import config from 'ember-get-config';
-import { random } from 'faker';
+import { datatype } from 'faker';
 
 export default function initializeMockIPC(server) {
   /**
@@ -55,7 +55,7 @@ export default function initializeMockIPC(server) {
       });
       return {
         address: window.location.hostname,
-        port: random.number(),
+        port: datatype.number(),
         protocol: type,
         session_id: newSession.id,
       };

addons/auth/addon/authenticators/base.js

@@ -4,10 +4,31 @@ import fetch from 'fetch';
 
 /**
  * Encapsulates common authenticator functionality.
+ *
+ * Upon session invalidation, deauthentication should be attempted at the URL
+ * generated by `buildDeauthEndpointURL` on a best-effort basis.
+ *
+ * When a session is restored, a call should be made to the endpoint specified
+ * by `buildTokenValidationEndpointURL`.  If this endpoint responds with 401 or
+ * 404, then the session is invalid and the restoration should be rejected.
+ * All other responses should resolve the session restoration successfully.
  */
 export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
   // =unimplemented methods
 
+  /**
+   * Generates an auth method URL with which to authenticate.
+   * @override
+   * @param {object} options
+   * @param {string} options.scope.scope_id
+   * @param {string} options.authMethod.id
+   * @return {string}
+   */
+  buildAuthEndpointURL(/* {
+    scope: { id: scopeID },
+    authMethod: { id: authMethodID },
+  } */) {}
+
   /**
    * Generates a scope URL with which to deauthenticate.
    * @override
@@ -51,9 +72,10 @@ export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
    */
   async restore(data) {
     if (!data) return reject();
-    return this.validateToken(data.token, data.id).then(() =>
-      this.normalizeData(data)
-    );
+    return this.validateToken(
+      data.attributes.token,
+      data.attributes.id
+    ).then(() => this.normalizeData(data));
   }
 
   /**
@@ -65,6 +87,10 @@ export default class BaseAuthenticator extends SimpleAuthBaseAuthenticator {
    * @return {object}
    */
   normalizeData(data, username) {
+    // Pull fields up from `data.attributes` for easier access in JavaScript.
+    // The `attributes` field exists on the Go side for its convenience but is
+    // unnecessary here.
+    Object.assign(data, data.attributes);
     // Add booleans indicated the scope type
     data.isGlobal = data?.scope?.type === 'global';
     data.isOrg = data?.scope?.type === 'org';

addons/auth/addon/authenticators/oidc.js

@@ -0,0 +1,107 @@
+import BaseAuthenticator from './base';
+import { inject as service } from '@ember/service';
+import { reject } from 'rsvp';
+import fetch from 'fetch';
+
+/**
+ * The OIDC base authenticator encapsulates the multistep OIDC flow.
+ *
+ * 1. Start authentication flow:  this step is actually a combination of two
+ *    sub steps:
+ *    1. Initiate a call via `startAuthentication` to the API at
+ *       `buildAuthEndpointURL` using the `start` command to fetch the URL of
+ *       the external authentication provider (`auth_url`).
+ *    2. Open `auth_url`.  This may be either inline (same tab)
+ *       or external in a new tab or browser window.
+ * 2. Requests the token from `buildAuthEndpointURL` using the `token` command.
+ *       A token isn't guaranteed to be ready, so the OIDC flow can be in a
+ *       "pending" state.
+ *
+ * This authenticator should not be used directly because it does not specify
+ * URL-building endpoints of its own.
+ * To use, generate an application authenticator in your app
+ * `authenticators/application.js` and extend this class.
+ */
+export default class OIDCAuthenticator extends BaseAuthenticator {
+  // =services
+
+  @service session;
+
+  // =methods
+
+  /**
+   * Kicks-off the OIDC flow:  calls the `authenticate:start` action on the
+   * specified auth method, which returns some meta data along with an
+   * authorization request URL.  The response data is saved for later and
+   * authentication enters a pending state.
+   *
+   * @param {boolean} requestCookies request cookie tokens (default `true`)
+   * @param {object} options
+   * @return {object}
+   */
+  async startAuthentication(options) {
+    const url = this.buildAuthEndpointURL(options);
+    const body = JSON.stringify({ command: 'start' });
+    const response = await fetch(url, { method: 'post', body });
+    const json = await response.json();
+    if (response.status < 400) {
+      // Store meta about the pending OIDC flow
+      this.session.set('data.pending', {
+        oidc: json,
+      });
+      return json;
+    } else {
+      return reject();
+    }
+  }
+
+  /**
+   * OIDC is a _process_ and does not have a singular "authenticate" step.  Thus
+   * this authenticate method simply normalizes the data passed into it once
+   * `attemptFetchToken` completes.  Notably, no requests are made by calling
+   * authenticate.  A Boundary token must already have been obtained.
+   * @param {object} json
+   * @return {object}
+   */
+  async authenticate(json) {
+    return this.normalizeData(json);
+  }
+
+  /**
+   * This request attempts to fetch a Boundary token.  This method represents a
+   * single request the polling sequence used to wait for authentication.
+   * There are three possible outcomes:
+   *
+   * 1. If the token is ready, it is persisted into the session, the session
+   *    enters an authenticated state, and this method returns `true`.
+   * 2. If the token is not yet ready, this method returns false.
+   * 3. If the request errors, this method returns to a rejection,
+   *    requiring appropriate error handling.
+   */
+  async attemptFetchToken(options) {
+    // Get the URL and setup the request body
+    const url = this.buildAuthEndpointURL(options);
+    const body = JSON.stringify({
+      command: 'token',
+      attributes: {
+        //state: this.session.get('data.pending.oidc.attributes.state'),
+        token_id: this.session.get('data.pending.oidc.attributes.token_id'),
+      },
+    });
+    // Fetch the endpoint and get the response JSON
+    const response = await fetch(url, { method: 'post', body });
+    if (response.status === 202) {
+      // The token isn't ready yet, keep trying.
+      return false;
+    } else if (response.status < 400) {
+      // Response was successful, meaning a token was obtained.
+      // Authenticate with the session service using the response JSON.
+      const json = await response.json();
+      await this.session.authenticate('authenticator:oidc', json);
+      return true;
+    } else {
+      // Response errors, return a rejection for further handling.
+      return reject();
+    }
+  }
+}

addons/auth/addon/authenticators/password.js

@@ -34,21 +34,6 @@ import fetch from 'fetch';
  *
  */
 export default class PasswordAuthenticator extends BaseAuthenticator {
-  // =unimplemented methods
-
-  /**
-   * Generates an auth method URL with which to authenticate.
-   * @override
-   * @param {object} options
-   * @param {string} options.scope.scope_id
-   * @param {string} options.authMethod.id
-   * @return {string}
-   */
-  buildAuthEndpointURL(/* {
-    scope: { id: scopeID },
-    authMethod: { id: authMethodID },
-  } */) {}
-
   // =methods
 
   /**
@@ -71,8 +56,9 @@ export default class PasswordAuthenticator extends BaseAuthenticator {
     options
   ) {
     const body = JSON.stringify({
+      command: 'login',
       token_type: requestCookies ? 'cookie' : null,
-      credentials: { login_name, password },
+      attributes: { login_name, password },
     });
     const authEndpointURL = this.buildAuthEndpointURL(options);
     const response = await fetch(authEndpointURL, { method: 'post', body });

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

@@ -0,0 +1,15 @@
+import OIDCAuthenticator from 'auth/authenticators/oidc';
+
+export default class ApplicationOIDCAuthenticator extends OIDCAuthenticator {
+  buildTokenValidationEndpointURL(id) {
+    return `/validate/${id}`;
+  }
+
+  buildAuthEndpointURL() {
+    return '/authenticate';
+  }
+
+  buildDeauthEndpointURL() {
+    return '/deauthenticate';
+  }
+}

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

@@ -32,29 +32,25 @@ module('Unit | Authenticator | base', function (hooks) {
 
   test('it passes token validation on restoration if receiving 200', async function (assert) {
     assert.expect(1);
-    const mockData = { id: 'token_123' };
+    const id = 'token_123';
+    const mockData = { attributes: { id } };
     const authenticator = this.owner.lookup('authenticator:base');
-    this.server.get(
-      authenticator.buildTokenValidationEndpointURL(mockData.id),
-      () => {
-        assert.ok(true, 'token validation was requested');
-        return new Response(200);
-      }
-    );
+    this.server.get(authenticator.buildTokenValidationEndpointURL(id), () => {
+      assert.ok(true, 'token validation was requested');
+      return new Response(200);
+    });
     await authenticator.restore(mockData);
   });
 
   test('it fails token validation on restoration if receiving 401', async function (assert) {
     assert.expect(2);
-    const mockData = { id: 'token_123' };
+    const id = 'token_123';
+    const mockData = { attributes: { id } };
     const authenticator = this.owner.lookup('authenticator:base');
-    this.server.get(
-      authenticator.buildTokenValidationEndpointURL(mockData.id),
-      () => {
-        assert.ok(true, 'token validation was requested');
-        return new Response(401);
-      }
-    );
+    this.server.get(authenticator.buildTokenValidationEndpointURL(id), () => {
+      assert.ok(true, 'token validation was requested');
+      return new Response(401);
+    });
     try {
       await authenticator.restore(mockData);
     } catch (e) {
@@ -64,15 +60,13 @@ module('Unit | Authenticator | base', function (hooks) {
 
   test('it fails token validation on restoration if receiving 404', async function (assert) {
     assert.expect(2);
-    const mockData = { id: 'token_123' };
+    const id = 'token_123';
+    const mockData = { attributes: { id } };
     const authenticator = this.owner.lookup('authenticator:base');
-    this.server.get(
-      authenticator.buildTokenValidationEndpointURL(mockData.id),
-      () => {
-        assert.ok(true, 'token validation was requested');
-        return new Response(404);
-      }
-    );
+    this.server.get(authenticator.buildTokenValidationEndpointURL(id), () => {
+      assert.ok(true, 'token validation was requested');
+      return new Response(404);
+    });
     try {
       await authenticator.restore(mockData);
     } catch (e) {

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

@@ -0,0 +1,36 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import { Response } from 'miragejs';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+
+module('Unit | Authenticator | OIDC', function (hooks) {
+  setupTest(hooks);
+  setupMirage(hooks);
+
+  test('`startAuthentication` initiates the authentication flow and returns the response', async function (assert) {
+    assert.expect(2);
+    const authenticator = this.owner.lookup('authenticator:oidc');
+    this.server.post(
+      authenticator.buildAuthEndpointURL(),
+      () => new Response(200, {}, { foo: 'bar' })
+    );
+    const response = await authenticator.startAuthentication();
+    assert.ok(true, 'authentication succeeded');
+    assert.deepEqual(response, { foo: 'bar' });
+  });
+
+  test('`startAuthentication` rejects/errors if API returns an error response', async function (assert) {
+    assert.expect(1);
+    const authenticator = this.owner.lookup('authenticator:oidc');
+    this.server.post(
+      authenticator.buildAuthEndpointURL(),
+      () => new Response(400)
+    );
+    // Because assert.throws doesn't work with async errors/promise rejections
+    try {
+      await authenticator.startAuthentication();
+    } catch (e) {
+      assert.ok(true);
+    }
+  });
+});

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

@@ -47,8 +47,9 @@ module('Unit | Authenticator | password', function (hooks) {
       (schema, request) => {
         const json = JSON.parse(request.requestBody);
         assert.deepEqual(json, {
+          command: 'login',
           token_type: 'cookie',
-          credentials: {
+          attributes: {
             login_name: 'foo',
             password: 'bar',
           },

addons/core/addon/authenticators/oidc.js

@@ -1,17 +1,15 @@
-import BasePasswordAuthenticator from 'auth/authenticators/password';
+import BaseOIDCAuthenticator from 'auth/authenticators/oidc';
 import { inject as service } from '@ember/service';
 
 /**
- * A username/password authenticator that authenticates with
- * a scope/auth-method endpoint.  Authentication occurs on an auth method
- * endpoint, while deauthentication occurs on a scope endpoint.
+ * An OIDC authenticator that handles flow kick-off and polling.
  */
-export default class PasswordAuthenticator extends BasePasswordAuthenticator {
+export default class OIDCAuthenticator extends BaseOIDCAuthenticator {
   // =services
 
   @service store;
 
-  // =attributes
+  // =methods
 
   /**
    * Generates an auth method URL with which to authenticate.
@@ -30,19 +28,6 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
     return adapter.buildURL('auth-method', authMethodID, options, 'findRecord');
   }
 
-  /**
-   * Generates a scope URL with which to deauthenticate.
-   * @override
-   * @param {object} options
-   * @param {string} scopeID
-   * @return {string}
-   */
-  buildDeauthEndpointURL({ scope: { id: scopeID } }) {
-    const adapter = this.store.adapterFor('application');
-    const options = { adapterOptions: { method: 'deauthenticate' } };
-    return adapter.buildURL('scope', scopeID, options, 'findRecord');
-  }
-
   /**
    * Generates an auth token validation URL used to check tokens on restoration.
    * @override
@@ -62,7 +47,7 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
    */
   authenticate() {
     return super.authenticate(...arguments).then((data) => {
-      const token = data?.token;
+      const token = data?.attributes?.token;
       this.addTokenToAuthorization(token);
       return data;
     });
@@ -76,7 +61,7 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
    * @return {object}
    */
   restore(data) {
-    const token = data?.token;
+    const token = data?.attributes?.token;
     this.addTokenToAuthorization(token);
     return super.restore(data);
   }
@@ -85,6 +70,9 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
    * Assigns a token string all future requests via the `Authorization` header
    * on the application adapter prototype.  Only application and adapters that
    * extend the application adapter receive this header (which is most).
+   *
+   * TODO:  if cookies were requested, this step should be skipped.
+   *
    * @param {string} token
    */
   addTokenToAuthorization(token) {

addons/core/addon/authenticators/password.js

@@ -62,7 +62,7 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
    */
   authenticate() {
     return super.authenticate(...arguments).then((data) => {
-      const token = data?.token;
+      const token = data?.attributes?.token;
       this.addTokenToAuthorization(token);
       return data;
     });
@@ -76,7 +76,7 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator {
    * @return {object}
    */
   restore(data) {
-    const token = data?.token;
+    const token = data?.attributes?.token;
     this.addTokenToAuthorization(token);
     return super.restore(data);
   }

addons/core/addon/components/form/authenticate/oidc/index.hbs

@@ -0,0 +1,13 @@
+<Rose::Form
+  class="full-width"
+  @onSubmit={{@submit}}
+  @cancel={{false}}
+  @disabled={{@disabled}}
+  as |form|
+>
+
+  <form.actions
+    @submitText={{t "actions.authenticate"}}
+    @showCancel={{false}} />
+
+</Rose::Form>

addons/core/app/authenticators/oidc.js

@@ -0,0 +1 @@
+export { default } from 'core/authenticators/oidc';

addons/core/app/components/form/authenticate/oidc.js

@@ -0,0 +1 @@
+export { default } from 'core/components/form/authenticate/oidc';

addons/core/package.json

@@ -37,6 +37,7 @@
     "ember-loading": "^0.4.0",
     "ember-page-title": "^6.0.3",
     "ember-route-action-helper": "^2.0.8",
+    "ember-feature-flags": "^6.0.0",
     "rose": "*"
   },
   "devDependencies": {
@@ -71,7 +72,7 @@
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
-    "faker": "^5.1.0",
+    "faker": "^5.5.3",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",

addons/core/tests/unit/authenticators/password-test.js

@@ -26,13 +26,11 @@ module('Unit | Authenticator | password', function (hooks) {
 
   test('it adds an authorization header to application adapter on restore', async function (assert) {
     assert.expect(1);
-    const mockData = { id: 'token1234', token: 'token1234' };
-    this.server.get(
-      authenticator.buildTokenValidationEndpointURL(mockData.id),
-      () => {
-        return new Response(200);
-      }
-    );
+    const id = 'token1234';
+    const mockData = { attributes: { id, token: 'token1234' } };
+    this.server.get(authenticator.buildTokenValidationEndpointURL(id), () => {
+      return new Response(200);
+    });
     authenticator.restore(mockData);
     assert.equal(applicationAdapter.headers.Authorization, 'Bearer token1234');
   });

addons/core/translations/resources/en-us.yaml

@@ -27,8 +27,12 @@ auth-method:
     no-primary-auth-method:
       title: "Recommendation: Select a Primary Auth Method"
       description: A primary auth method auto-creates users when they authenticate for the first time.  Scopes without primary auth methods may experience authentication failures.
+    pending:
+      title: Authentication Pending
+      description: Complete authentication in the newly-opened window.
   types:
     password: Password
+    oidc: OIDC
   actions:
     create: Create Auth Method
     delete: Delete Auth Method
@@ -42,6 +46,7 @@ auth-method:
     remove-as-primary: Remove primary auth method?
     make-primary-confirm: "A primary auth method auto-creates users on their first authentication attempt if needed.  Note:  if you change the primary auth method, the previous primary will no longer auto-create users."
     remove-as-primary-confirm: Removing the primary auth method may lead to authentication failures for this scope.
+    no-see-window: Don't see the new window?
 group:
   title: Group
   title_plural: Groups

addons/rose/addon/styles/rose/components/dialog/_cover.scss

@@ -1,6 +1,7 @@
 .rose-dialog-cover {
   position: fixed;
   top: 0;
+  left: 0;
   width: 100vw;
   height: 100vh;
   display: flex;
@@ -16,6 +17,8 @@
 
   .rose-dialog-cover-header,
   .rose-dialog-cover-body {
+    position: relative;
+    top: -10vh;
     max-width: 650px;
   }
 }

package.json

@@ -58,7 +58,8 @@
     "highlight.js": "^10.4.1",
     "hoek": "~4.2.0",
     "elliptic": "~6.5.4",
-    "react-dev-utils": "~11.0.4"
+    "react-dev-utils": "~11.0.4",
+    "yargs-parser": "~20.2.7"
   },
   "config": {
     "commitizen": {

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

@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthenticateMethodOidcController extends Controller {
+  // =services
+
+  @service session;
+
+  // =attributes
+
+  /**
+   * Authetnication URL for the pending OIDC flow, if any.
+   * @type {?string}
+   */
+  get authURL() {
+    return this.session.data.pending.oidc.attributes.auth_url;
+  }
+}

ui/admin/app/router.js

@@ -13,7 +13,9 @@ Router.map(function () {
   this.route('scopes', function () {
     this.route('scope', { path: ':scope_id' }, function () {
       this.route('authenticate', function () {
-        this.route('method', { path: ':auth_method_id' });
+        this.route('method', { path: ':auth_method_id' }, function () {
+          this.route('oidc');
+        });
       });
 
       this.route('scopes', function () {});

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

@@ -1,5 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 import loading from 'ember-loading/decorator';
 import { notifyError } from 'core/decorators/notify';
@@ -23,6 +24,27 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
     return this.store.findRecord('auth-method', id, adapterOptions);
   }
 
+  /**
+   *
+   */
+  async startOIDCAuthentication(authenticatorName, options) {
+    const oidc = getOwner(this).lookup(authenticatorName);
+    // TODO: delegate this call from the session service so that we don't have
+    // to look up the authenticator directly
+    const json = await oidc.startAuthentication(options);
+    await this.openExternalOIDCFlow(json.attributes.auth_url);
+  }
+
+  /**
+   * Opens the specified URL in a new tab or window.  By default this uses
+   * `window.open`, but may be overriden.
+   * @param {string} url
+   */
+  async openExternalOIDCFlow(url) {
+    // TODO don't use window directly
+    await window.open(url);
+  }
+
   // =actions
 
   /**
@@ -37,10 +59,23 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
     const authMethod = this.modelFor('scopes.scope.authenticate.method');
     const authenticatorName = `authenticator:${authMethod.type}`;
     const requestCookies = false;
-    await this.session.authenticate(authenticatorName, creds, requestCookies, {
-      scope,
-      authMethod,
-    });
-    this.transitionTo('index');
+    switch (authMethod.type) {
+      case 'password':
+        await this.session.authenticate(
+          authenticatorName,
+          creds,
+          requestCookies,
+          { scope, authMethod }
+        );
+        this.transitionTo('index');
+        break;
+      case 'oidc':
+        await this.startOIDCAuthentication(authenticatorName, {
+          scope,
+          authMethod,
+        });
+        this.transitionTo('scopes.scope.authenticate.method.oidc');
+        break;
+    }
   }
 }

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

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthenticateMethodIndexRoute extends Route {}

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

@@ -0,0 +1,82 @@
+import Route from '@ember/routing/route';
+import { getOwner } from '@ember/application';
+import { inject as service } from '@ember/service';
+import { task, timeout } from 'ember-concurrency';
+import { action } from '@ember/object';
+import { notifyError } from 'core/decorators/notify';
+import config from '../../../../../config/environment';
+
+const POLL_TIMEOUT_SECONDS = config.oidcPollingTimeoutSeconds;
+
+export default class ScopesScopeAuthenticateMethodOidcRoute extends Route {
+
+  // =services
+
+  @service session;
+
+  // =attributes
+
+  /**
+   * A simple Ember Concurrency-based polling task that refreshes the route
+   * every POLL_TIMEOUT_SECONDS seconds.  This is necessary to display changes
+   * to session `status` that may occur.
+   *
+   * NOTE:  tasks are sort of attributes and sort of methods, but they are not
+   * language-level constructs.  Thus we annotate this task as if it
+   * is an attribute.
+   * @type {Task}
+   */
+  @task(function * () {
+    while(!this.session.isAuthenticated) {
+      yield timeout(POLL_TIMEOUT_SECONDS * 1000);
+      yield this.refresh();
+    }
+  /* eslint-disable-next-line prettier/prettier */
+  }).drop() poller;
+
+  // =methods
+
+  model() {
+    const scope = this.modelFor('scopes.scope');
+    const authMethod = this.modelFor('scopes.scope.authenticate.method');
+    const authenticatorName = `authenticator:${authMethod.type}`;
+    const oidc = getOwner(this).lookup(authenticatorName);
+    // TODO: delegate this call from the session service so that we don't have
+    // to look up the authenticator directly
+    return oidc.attemptFetchToken({ scope, authMethod });
+  }
+
+  /**
+   * If authenticated, redirects to index for further processing.
+   */
+  redirect() {
+    if (this.session.isAuthenticated) this.replaceWith('index');
+  }
+
+  /**
+   * When this route is activated (entered), begin polling for changes.
+   */
+  activate() {
+    this.poller.perform();
+  }
+
+  /**
+   * When this route is deactivated (exited), stop polling for changes.
+   */
+  deactivate() {
+    this.poller.cancelAll();
+  }
+
+  /**
+   * An error in this route indicates authentication failed.  The user is
+   * notified and returned to the index.
+   */
+  @action
+  @notifyError(() => 'errors.authentication-failed.title', { catch: true })
+  error(e) {
+    this.transitionTo('scopes.scope.authenticate.method.index');
+    // rethrow the error to activate the notifyError decorator
+    throw e;
+  }
+
+}

ui/admin/app/templates/scopes/scope/auth-methods/index.hbs

@@ -58,12 +58,30 @@
           {{#each @model as |authMethod|}}
             <body.row as |row|>
               <row.headerCell>
-                <LinkTo
-                  @route="scopes.scope.auth-methods.auth-method"
-                  @model={{authMethod.id}}
-                >
-                  {{authMethod.displayName}}
-                </LinkTo>
+                {{!
+                  Show link to auth method route if non-OIDC and when
+                  oidc-crud feature is enabled, otherwise show just the name
+                  (when the method is OIDC and oidc-crud is disabled)
+                }}
+                {{#if authMethod.isOIDC}}
+                  {{#if (feature-flag 'oidc-crud')}}
+                    <LinkTo
+                      @route="scopes.scope.auth-methods.auth-method"
+                      @model={{authMethod.id}}
+                    >
+                      {{authMethod.displayName}}
+                    </LinkTo>
+                  {{else}}
+                    {{authMethod.displayName}}
+                  {{/if}}
+                {{else}}
+                  <LinkTo
+                    @route="scopes.scope.auth-methods.auth-method"
+                    @model={{authMethod.id}}
+                  >
+                    {{authMethod.displayName}}
+                  </LinkTo>
+                {{/if}}
                 <p>{{authMethod.description}}</p>
               </row.headerCell>
               <row.cell>

ui/admin/app/templates/scopes/scope/authenticate.hbs

@@ -28,15 +28,31 @@
           <Rose::Separator />
 
           <Rose::Nav::Tabs as |nav|>
-            {{#each @model.authMethods as |authMethod|}}
-              <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
-                {{#if authMethod.name}}
-                  {{authMethod.name}}
-                {{else}}
-                  {{t (concat "resources.auth-method.types." authMethod.type)}}
-                {{/if}}
-              </nav.link>
-            {{/each}}
+            {{#if (feature-flag 'oidc')}}
+              {{! OIDC enable:  list all auth methods }}
+              {{#each @model.authMethods as |authMethod|}}
+                <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
+                  {{#if authMethod.name}}
+                    {{authMethod.name}}
+                  {{else}}
+                    {{t (concat "resources.auth-method.types." authMethod.type)}}
+                  {{/if}}
+                </nav.link>
+              {{/each}}
+            {{else}}
+              {{! OIDC disabled:  filter out OIDC auth methods}}
+              {{#each @model.authMethods as |authMethod|}}
+                {{#unless authMethod.isOIDC}}
+                  <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
+                    {{#if authMethod.name}}
+                      {{authMethod.name}}
+                    {{else}}
+                      {{t (concat "resources.auth-method.types." authMethod.type)}}
+                    {{/if}}
+                  </nav.link>
+                {{/unless}}
+              {{/each}}
+            {{/if}}
           </Rose::Nav::Tabs>
 
           {{#if @model.authMethods}}

ui/admin/app/templates/scopes/scope/authenticate/method.hbs

@@ -1,5 +1 @@
-<Form::Authenticate
-  @model={{@model}}
-  @submit={{route-action "authenticate"}}
-  @disabled={{is-loading}}
-/>
+{{outlet}}

ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs

@@ -0,0 +1,17 @@
+{{#if (feature-flag 'oidc')}}
+  {{! OIDC enabled:  show form for any auth method}}
+  <Form::Authenticate
+    @model={{@model}}
+    @submit={{route-action "authenticate"}}
+    @disabled={{is-loading}}
+  />
+{{else}}
+  {{! OIDC disabled:  hide OIDC auth form}}
+  {{#unless @model.isOIDC}}
+    <Form::Authenticate
+      @model={{@model}}
+      @submit={{route-action "authenticate"}}
+      @disabled={{is-loading}}
+    />
+  {{/unless}}
+{{/if}}

ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs

@@ -0,0 +1,24 @@
+<Rose::Dialog::Cover>
+  <:header>
+    {{inline-svg "logo-app-full"}}
+    <h1>{{t 'resources.auth-method.messages.pending.title'}}</h1>
+  </:header>
+  <:body>
+    <p>{{t 'resources.auth-method.messages.pending.description'}}</p>
+    <p>
+      {{t 'resources.auth-method.questions.no-see-window'}}
+      <a
+        href="{{this.authURL}}"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        {{t 'actions.retry'}}
+      </a>
+    </p>
+    <p>
+      <LinkTo @route="scopes.scope.authenticate.method">
+        {{t 'actions.cancel'}}
+      </LinkTo>
+    </p>
+  </:body>
+</Rose::Dialog::Cover>

ui/admin/config/environment.js

@@ -36,6 +36,7 @@ module.exports = function (environment) {
 
     notifyTimeout: 4000,
     sessionPollingTimeoutSeconds: 2.5,
+    oidcPollingTimeoutSeconds: 1,
 
     documentation: {
       baseURL: 'https://boundaryproject.io/help/admin-ui',
@@ -85,6 +86,8 @@ module.exports = function (environment) {
     },
 
     featureFlags: {
+      oidc: true,
+      'oidc-crud': false,
       'primary-auth-method': false,
     },
   };
@@ -122,6 +125,8 @@ module.exports = function (environment) {
 
     // Enable features in development
     ENV.featureFlags['primary-auth-method'] = true;
+    ENV.featureFlags['oidc'] = true;
+    //ENV.featureFlags['oidc-crud'] = true;
   }
 
   if (environment === 'test') {

ui/admin/package.json

@@ -65,7 +65,6 @@
     "ember-concurrency": "^1.3.0",
     "ember-exam": "^6.0.1",
     "ember-export-application-global": "^2.0.1",
-    "ember-feature-flags": "^6.0.0",
     "ember-inline-svg": "^1.0.0",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
@@ -81,7 +80,7 @@
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
-    "faker": "^5.1.0",
+    "faker": "^5.5.3",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",

ui/admin/public/logo-app-full.svg

@@ -0,0 +1 @@
+<svg id="LOGOS" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 377 132"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#f04e54;}</style></defs><path class="cls-1" d="M125.45,41.34V35.68h-5.18v5.66h-2.64V27.75h2.64v5.7h5.18v-5.7h2.64V41.34Zm12.32,0h-2.09l-.19-.67a5.69,5.69,0,0,1-3,.87c-1.87,0-2.66-1.23-2.66-2.92,0-2,.9-2.75,3-2.75h2.46v-1c0-1.09-.32-1.47-1.95-1.47a14.85,14.85,0,0,0-2.83.3l-.32-1.87a14,14,0,0,1,3.5-.46c3.21,0,4.15,1.08,4.15,3.54Zm-2.55-3.7h-1.89c-.84,0-1.07.22-1.07,1s.23,1,1,1a4.1,4.1,0,0,0,1.93-.51Zm7.91,3.9a12.53,12.53,0,0,1-3.52-.56L140,39.1a11.5,11.5,0,0,0,3,.43c1.13,0,1.3-.24,1.3-1s-.12-.9-1.78-1.29c-2.49-.58-2.79-1.18-2.79-3.08s.9-2.83,3.82-2.83a14.07,14.07,0,0,1,3.06.34l-.25,2a19,19,0,0,0-2.81-.28c-1.11,0-1.3.24-1.3.84,0,.79.06.85,1.44,1.19,2.85.73,3.13,1.09,3.13,3.1S146.21,41.54,143.13,41.54Zm11.7-.2V34.5c0-.53-.23-.79-.81-.79a7.22,7.22,0,0,0-2.67.83v6.8H148.8V27.56l2.55.38v4.34a9.38,9.38,0,0,1,3.73-.94c1.7,0,2.31,1.14,2.31,2.89v7.11Zm4.71-11.19v-2.4h2.55v2.4Zm0,11.19v-9.8h2.55v9.8Zm4.6-9.72c0-2.46,1.48-3.88,5-3.88a16.63,16.63,0,0,1,3.8.44l-.3,2.19a21.49,21.49,0,0,0-3.41-.34c-1.83,0-2.41.6-2.41,2v5.15c0,1.43.58,2,2.41,2a21.57,21.57,0,0,0,3.41-.35l.3,2.2a16.63,16.63,0,0,1-3.8.44c-3.48,0-5-1.43-5-3.88Zm14.41,9.92c-3.5,0-4.45-1.85-4.45-3.86V35.2c0-2,1-3.86,4.45-3.86S183,33.19,183,35.2v2.48C183,39.69,182.05,41.54,178.55,41.54Zm0-8.11c-1.37,0-1.89.58-1.89,1.69v2.64c0,1.1.52,1.69,1.89,1.69s1.88-.59,1.88-1.69V35.12C180.43,34,179.91,33.43,178.55,33.43Zm11.64.16A20.64,20.64,0,0,0,187.48,35v6.32h-2.55v-9.8h2.16l.16,1.09a11.23,11.23,0,0,1,2.69-1.29Zm10.22,4.49c0,2.17-1,3.46-3.38,3.46a14.74,14.74,0,0,1-2.72-.28v4l-2.56.38V31.54h2l.25.82a5.54,5.54,0,0,1,3.22-1c2.06,0,3.15,1.16,3.15,3.4Zm-6.1,1.11a11.85,11.85,0,0,0,2.26.26c.93,0,1.28-.43,1.28-1.31V34.68c0-.81-.31-1.25-1.26-1.25a3.66,3.66,0,0,0-2.28.89Z"/><path class="cls-1" d="M139.64,70.53c3.08-1.33,4.48-3.21,4.48-6.53V59.82c0-5.45-3.09-8.59-10.72-8.59H117.55V91.52h16.94c7.33,0,11-3.56,11-9.25V78C145.51,74,143.33,71.31,139.64,70.53Zm-14.46-13h7.32c2.78,0,4,1,4,3.27v3.57c0,2.36-1.08,3.75-4.06,3.75h-7.25ZM137.89,81.3c0,3-1.46,3.93-4.91,3.93h-7.8v-11h8.47c3,0,4.24,1.33,4.24,4.06Z"/><path class="cls-1" d="M161.54,61.45c-10.11,0-12.82,5.57-12.82,11.62v7.44c0,6,2.71,11.62,12.82,11.62s12.83-5.57,12.83-11.62V73.07C174.37,67,171.64,61.45,161.54,61.45ZM167,80.76c0,3.32-1.51,5.08-5.45,5.08s-5.44-1.76-5.44-5.08V72.83c0-3.33,1.51-5.08,5.44-5.08S167,69.5,167,72.83Z"/><path class="cls-1" d="M196.51,62.06V82.51c-2.66,1.39-5.87,2.48-7.68,2.48s-2.36-.78-2.36-2.36V62.06h-7.38V83.42c0,5.26,1.75,8.71,6.65,8.71A29.44,29.44,0,0,0,197.54,89l.72,2.48h5.64V62.06Z"/><path class="cls-1" d="M228.4,61.45a29.61,29.61,0,0,0-11.8,3.09l-.72-2.48h-5.64V91.52h7.39V71.08c2.66-1.39,5.87-2.48,7.68-2.48s2.36.78,2.36,2.35V91.52h7.38V70.17C235.05,64.9,233.3,61.45,228.4,61.45Z"/><path class="cls-1" d="M257.5,50V62.31a40.19,40.19,0,0,0-7.87-.86c-6.83,0-9.74,3.88-9.74,10.41v10c0,6.71,3.15,10.22,9.08,10.22A15.49,15.49,0,0,0,258.29,89l.72,2.48h5.87V49Zm0,33.16a10.43,10.43,0,0,1-6.59,2.66c-2.73,0-3.63-1.33-3.63-3.75V71.68c0-2.66,1-3.93,3.68-3.93a32.33,32.33,0,0,1,6.54.79Z"/><path class="cls-1" d="M280.8,61.45a38.34,38.34,0,0,0-10.11,1.4l.91,5.62a41.47,41.47,0,0,1,8.17-.9c4.71,0,5.62,1.15,5.62,4.42v3.08h-7.08c-6,0-8.59,2.3-8.59,8.29,0,5.08,2.3,8.77,7.68,8.77a16.18,16.18,0,0,0,8.78-2.6l.54,2h6.06V72.1C292.78,64.72,290.05,61.45,280.8,61.45Zm4.59,23.3a11.57,11.57,0,0,1-5.56,1.51c-2.3,0-3-.91-3-3,0-2.23.67-2.9,3.09-2.9h5.44Z"/><path class="cls-1" d="M313,61.45a33,33,0,0,0-7.74,3.88l-.48-3.27h-6.24V91.52h7.38v-19a57.85,57.85,0,0,1,7.81-4.3Z"/><path class="cls-1" d="M335.67,62.06,328.9,84.44l-6.72-22.38h-7.56l9.32,29.46h2.59l-3.68,11.92h7l3.93-11.92,9.43-29.46Z"/><polygon class="cls-2" points="44.94 102.47 44.94 97.64 54.96 97.64 54.96 94.67 50.1 94.67 50.1 89.82 73.03 89.82 62.38 71.38 73.03 52.93 49.53 52.93 49.53 78.51 36.88 78.51 36.88 40.29 80.4 40.29 87.67 52.87 76.98 71.38 87.88 90.26 80.84 102.47 44.94 102.47"/><rect class="cls-2" x="42.04" y="89.82" width="4.85" height="4.85"/><rect class="cls-2" x="36.88" y="97.61" width="4.85" height="4.85"/></svg>

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

@@ -66,9 +66,12 @@ module('Acceptance | authentication', function (hooks) {
     scope = { id: orgScope.id, type: orgScope.type };
     globalAuthMethod = this.server.create('auth-method', {
       scope: globalScope,
+      type: 'password',
+    });
+    authMethod = this.server.create('auth-method', {
+      scope: orgScope,
+      type: 'password',
     });
-    this.server.create('user', { scope: globalScope });
-    authMethod = this.server.create('auth-method', { scope: orgScope });
     orgScopeID = orgScope.id;
     globalAuthMethodID = globalAuthMethod.id;
     authMethodID = authMethod.id;

ui/admin/tests/unit/controllers/scopes/scope/authenticate/method/oidc-test.js

@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/authenticate/method/oidc',
+  function (hooks) {
+    setupTest(hooks);
+
+    // TODO: Replace this with your real tests.
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/authenticate/method/oidc'
+      );
+      assert.ok(controller);
+    });
+  }
+);

ui/admin/tests/unit/routes/scopes/scope/authenticate/method/index-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/authenticate/method/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/authenticate/method/index'
+      );
+      assert.ok(route);
+    });
+  }
+);

ui/admin/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/authenticate/method/oidc',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/authenticate/method/oidc'
+      );
+      assert.ok(route);
+    });
+  }
+);

ui/desktop/app/controllers/scopes/scope/authenticate/method/oidc.js

@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthenticateMethodOidcController extends Controller {
+  // =services
+
+  @service session;
+
+  // =attributes
+
+  /**
+   * Authetnication URL for the pending OIDC flow, if any.
+   * @type {?string}
+   */
+  get authURL() {
+    return this.session.data.pending.oidc.attributes.auth_url;
+  }
+}

ui/desktop/app/router.js

@@ -10,7 +10,9 @@ Router.map(function () {
   this.route('scopes', function () {
     this.route('scope', { path: ':scope_id' }, function () {
       this.route('authenticate', function () {
-        this.route('method', { path: ':auth_method_id' });
+        this.route('method', { path: ':auth_method_id' }, function () {
+          this.route('oidc');
+        });
       });
       this.route('projects', function () {
         this.route('targets', function () {

ui/desktop/app/routes/scopes/scope/authenticate/method.js

@@ -1,5 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 import loading from 'ember-loading/decorator';
 import { notifyError } from 'core/decorators/notify';
@@ -9,6 +10,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
 
   @service session;
   @service notify;
+  @service ipc;
   @service intl;
 
   // =methods
@@ -23,6 +25,26 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
     return this.store.findRecord('auth-method', id, adapterOptions);
   }
 
+  /**
+   *
+   */
+  async startOIDCAuthentication(authenticatorName, options) {
+    const oidc = getOwner(this).lookup(authenticatorName);
+    // TODO: delegate this call from the session service so that we don't have
+    // to look up the authenticator directly
+    const json = await oidc.startAuthentication(options);
+    await this.openExternalOIDCFlow(json.attributes.auth_url);
+  }
+
+  /**
+   * Opens the specified URL in a new tab or window.  By default this uses
+   * `window.open`, but may be overriden.
+   * @param {string} url
+   */
+  async openExternalOIDCFlow(url) {
+    await this.ipc.invoke('openExternal', url);
+  }
+
   // =actions
 
   /**
@@ -37,10 +59,23 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route {
     const authMethod = this.modelFor('scopes.scope.authenticate.method');
     const authenticatorName = `authenticator:${authMethod.type}`;
     const requestCookies = false;
-    await this.session.authenticate(authenticatorName, creds, requestCookies, {
-      scope,
-      authMethod,
-    });
-    this.replaceWith('index');
+    switch (authMethod.type) {
+      case 'password':
+        await this.session.authenticate(
+          authenticatorName,
+          creds,
+          requestCookies,
+          { scope, authMethod }
+        );
+        this.transitionTo('index');
+        break;
+      case 'oidc':
+        await this.startOIDCAuthentication(authenticatorName, {
+          scope,
+          authMethod,
+        });
+        this.transitionTo('scopes.scope.authenticate.method.oidc');
+        break;
+    }
   }
 }

ui/desktop/app/routes/scopes/scope/authenticate/method/index.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthenticateMethodIndexRoute extends Route {}

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

@@ -0,0 +1,82 @@
+import Route from '@ember/routing/route';
+import { getOwner } from '@ember/application';
+import { inject as service } from '@ember/service';
+import { task, timeout } from 'ember-concurrency';
+import { action } from '@ember/object';
+import { notifyError } from 'core/decorators/notify';
+import config from '../../../../../config/environment';
+
+const POLL_TIMEOUT_SECONDS = config.oidcPollingTimeoutSeconds;
+
+export default class ScopesScopeAuthenticateMethodOidcRoute extends Route {
+
+  // =services
+
+  @service session;
+
+  // =attributes
+
+  /**
+   * A simple Ember Concurrency-based polling task that refreshes the route
+   * every POLL_TIMEOUT_SECONDS seconds.  This is necessary to display changes
+   * to session `status` that may occur.
+   *
+   * NOTE:  tasks are sort of attributes and sort of methods, but they are not
+   * language-level constructs.  Thus we annotate this task as if it
+   * is an attribute.
+   * @type {Task}
+   */
+  @task(function * () {
+    while(!this.session.isAuthenticated) {
+      yield timeout(POLL_TIMEOUT_SECONDS * 1000);
+      yield this.refresh();
+    }
+  /* eslint-disable-next-line prettier/prettier */
+  }).drop() poller;
+
+  // =methods
+
+  model() {
+    const scope = this.modelFor('scopes.scope');
+    const authMethod = this.modelFor('scopes.scope.authenticate.method');
+    const authenticatorName = `authenticator:${authMethod.type}`;
+    const oidc = getOwner(this).lookup(authenticatorName);
+    // TODO: delegate this call from the session service so that we don't have
+    // to look up the authenticator directly
+    return oidc.attemptFetchToken({ scope, authMethod });
+  }
+
+  /**
+   * If authenticated, redirects to index for further processing.
+   */
+  redirect() {
+    if (this.session.isAuthenticated) this.replaceWith('index');
+  }
+
+  /**
+   * When this route is activated (entered), begin polling for changes.
+   */
+  activate() {
+    this.poller.perform();
+  }
+
+  /**
+   * When this route is deactivated (exited), stop polling for changes.
+   */
+  deactivate() {
+    this.poller.cancelAll();
+  }
+
+  /**
+   * An error in this route indicates authentication failed.  The user is
+   * notified and returned to the index.
+   */
+  @action
+  @notifyError(() => 'errors.authentication-failed.title', { catch: true })
+  error(e) {
+    this.transitionTo('scopes.scope.authenticate.method.index');
+    // rethrow the error to activate the notifyError decorator
+    throw e;
+  }
+
+}

ui/desktop/app/templates/scopes/scope/authenticate.hbs

@@ -21,11 +21,23 @@
     </Rose::Dropdown>
 
     <Rose::Nav::Tabs as |nav|>
-      {{#each @model.authMethods as |authMethod|}}
-        <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
-          {{t (concat "resources.auth-method.types." authMethod.type)}}
-        </nav.link>
-      {{/each}}
+      {{#if (feature-flag 'oidc')}}
+        {{! OIDC enable:  list all auth methods }}
+        {{#each @model.authMethods as |authMethod|}}
+          <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
+            {{t (concat "resources.auth-method.types." authMethod.type)}}
+          </nav.link>
+        {{/each}}
+      {{else}}
+        {{! OIDC disabled:  filter out OIDC auth methods}}
+        {{#each @model.authMethods as |authMethod|}}
+          {{#unless authMethod.isOIDC}}
+            <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
+              {{t (concat "resources.auth-method.types." authMethod.type)}}
+            </nav.link>
+          {{/unless}}
+        {{/each}}
+      {{/if}}
     </Rose::Nav::Tabs>
 
     {{#if @model.authMethods}}

ui/desktop/app/templates/scopes/scope/authenticate/method.hbs

@@ -1,5 +1 @@
-<Form::Authenticate
-  @model={{@model}}
-  @submit={{route-action "authenticate"}}
-  @disabled={{is-loading}}
-/>
+{{outlet}}

ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs

@@ -0,0 +1,17 @@
+{{#if (feature-flag 'oidc')}}
+  {{! OIDC enabled:  show form for any auth method}}
+  <Form::Authenticate
+    @model={{@model}}
+    @submit={{route-action "authenticate"}}
+    @disabled={{is-loading}}
+  />
+{{else}}
+  {{! OIDC disabled:  hide OIDC auth form}}
+  {{#unless @model.isOIDC}}
+    <Form::Authenticate
+      @model={{@model}}
+      @submit={{route-action "authenticate"}}
+      @disabled={{is-loading}}
+    />
+  {{/unless}}
+{{/if}}

ui/desktop/app/templates/scopes/scope/authenticate/method/oidc.hbs

@@ -0,0 +1,23 @@
+<Rose::Dialog::Cover>
+  <:header>
+    <h1>{{t 'resources.auth-method.messages.pending.title'}}</h1>
+  </:header>
+  <:body>
+    <p>{{t 'resources.auth-method.messages.pending.description'}}</p>
+    <p>
+      {{t 'resources.auth-method.questions.no-see-window'}}
+      <a
+        href="{{this.authURL}}"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        {{t 'actions.retry'}}
+      </a>
+    </p>
+    <p>
+      <LinkTo @route="scopes.scope.authenticate.method">
+        {{t 'actions.cancel'}}
+      </LinkTo>
+    </p>
+  </:body>
+</Rose::Dialog::Cover>

ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs

@@ -58,11 +58,11 @@
               <row.cell>
                 <div>
                   <Copyable
-                    @text={{model.target.id}}
+                    @text={{model.project.id}}
                     @buttonText={{t "actions.copy-to-clipboard"}}
                     @acknowledgeText={{t "states.copied"}}
                   >
-                    <code>{{model.target.id}}</code>
+                    <code>{{model.project.id}}</code>
                   </Copyable>
                 </div>
                 <Rose::Badge @style='informational'>

ui/desktop/config/environment.js

@@ -44,6 +44,7 @@ module.exports = function (environment) {
 
     notifyTimeout: 4000,
     sessionPollingTimeoutSeconds: 2.5,
+    oidcPollingTimeoutSeconds: 1,
 
     documentation: {
       baseURL: 'https://boundaryproject.io/help/desktop',
@@ -52,6 +53,10 @@ module.exports = function (environment) {
         sessions: '/sessions',
       },
     },
+
+    featureFlags: {
+      oidc: true,
+    },
   };
 
   if (process.env.ENABLE_MIRAGE) {
@@ -69,6 +74,9 @@ module.exports = function (environment) {
     // of the UI, which only makes sense in development where the origin is
     // usually the same as the application origin.
     ENV.autoOrigin = true;
+
+    // Enable features in development
+    ENV.featureFlags['oidc'] = true;
   }
 
   if (environment === 'test') {

ui/desktop/electron-app/package.json

@@ -39,6 +39,7 @@
   },
   "resolutions": {
     "highlight.js": "^10.4.1",
-    "xmldom": "~0.5.0"
+    "xmldom": "~0.5.0",
+    "yargs-parser": "~20.2.7"
   }
 }

ui/desktop/electron-app/src/handlers.js

@@ -1,4 +1,5 @@
 const { shell } = require('electron');
+const isDev = require('electron-is-dev');
 const handle = require('./ipc-handler');
 const boundaryCli = require('./boundary-cli');
 const origin = require('./origin.js');
@@ -26,12 +27,17 @@ handle('resetOrigin', async (requestOrigin) => {
 });
 
 /**
- * Opens the specified URL in an external browser.  Only HTTPS URLs are allowed.
+ * Opens the specified URL in an external browser.  Only secure HTTPs URLs are
+ * allowed except in the case of localhost (which enables development and
+ * testing workflows).  Insecure URLs are allowed in dev mode.
  */
 handle('openExternal', async (href) => {
-  if (href.startsWith('https://')) {
+  const isSecure = href.startsWith('https://');
+  const isLocalhost = href.startsWith('http://localhost')
+    || href.startsWith('http://127.0.0.1');
+  if (isSecure || isLocalhost || isDev) {
     // openExternal is necessary in order to display documentation and to
-    // support arbitrary OIDC flows.  The protocol is validated.
+    // support arbitrary OIDC flows.  The protocol is validated (see above).
     shell.openExternal(href); /* eng-disable OPEN_EXTERNAL_JS_CHECK */
   } else {
     throw new Error(

ui/desktop/electron-app/yarn.lock

@@ -231,22 +231,22 @@
     fs-extra "^9.0.1"
 
 "@electron/get@^1.0.1", "@electron/get@^1.6.0", "@electron/get@^1.9.0":
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
-  integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab"
+  integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
     got "^9.6.0"
     progress "^2.0.3"
-    sanitize-filename "^1.6.2"
+    semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
-"@malept/cross-spawn-promise@^1.1.0":
+"@malept/cross-spawn-promise@^1.1.0", "@malept/cross-spawn-promise@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
   integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
@@ -308,16 +308,11 @@
     "@types/node" "*"
 
 "@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
+  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
 
-"@types/node@*":
-  version "14.14.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340"
-  integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==
-
-"@types/node@^14.6.2":
+"@types/node@*", "@types/node@^14.6.2":
   version "14.14.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
   integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
@@ -357,11 +352,11 @@ ajv@^6.12.3:
     uri-js "^4.2.2"
 
 ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -475,16 +470,18 @@ aws4@^1.8.0:
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 "base32-encode@^0.1.0 || ^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/base32-encode/-/base32-encode-1.1.1.tgz#d022d86aca0002a751bbe1bf20eb4a9b1cef4e95"
-  integrity sha512-eqa0BeGghj3guezlasdHJhr3+J5ZbbQvxeprkcDMbRQrjlqOT832IUDT4Al4ofAwekFYMqkkM9KMUHs9Cu0HKA==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/base32-encode/-/base32-encode-1.2.0.tgz#e150573a5e431af0a998e32bdfde7045725ca453"
+  integrity sha512-cHFU8XeRyx0GgmoWi5qHMCVRiqU6J3MHWxVgun7jggCBUpVzm1Ir7M9dYr2whjSNc3tFeXfQ/oZjQu/4u55h9A==
+  dependencies:
+    to-data-view "^1.1.0"
 
-base64-js@^1.2.3, base64-js@^1.3.1:
+base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -504,10 +501,10 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
-bl@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
-  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
@@ -524,9 +521,9 @@ boolbase@^1.0.0:
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boolean@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
-  integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024"
+  integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==
 
 bplist-creator@~0.0.3:
   version "0.0.8"
@@ -628,7 +625,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -664,9 +661,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047"
-  integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
+  integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
 
 cli-width@^3.0.0:
   version "3.0.0"
@@ -777,9 +774,9 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 core-js@^3.6.5:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044"
-  integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.1.tgz#e683963978b6806dcc6c0a4a8bd4ab0bdaf3f21a"
+  integrity sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -954,9 +951,9 @@ defer-to-connect@^1.0.1:
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
 defer-to-connect@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
-  integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
 define-properties@^1.1.3:
   version "1.1.3"
@@ -981,9 +978,9 @@ detect-libc@^1.0.2, detect-libc@^1.0.3:
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
+  integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
 
 devtron@^1.4.0:
   version "1.4.0"
@@ -1115,11 +1112,11 @@ electron-packager@^15.0.0:
     yargs-parser "^20.0.0"
 
 electron-rebuild@^2.0.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-2.3.4.tgz#59d49b37d5cc690aa60500aa5e5ecd168cbb5ba2"
-  integrity sha512-EHr1bkqXTN/jQJuh2/IunF9QGa9yOgpE9KdQ9A7VHshd7ycWvoXjWzaXaimfa1nu1l7vKqLLu7N2COe3Jn9NuA==
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-2.3.5.tgz#10dc38d1ffe1515ba2eef8b8be8e973ad1e1d597"
+  integrity sha512-1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==
   dependencies:
-    "@malept/cross-spawn-promise" "^1.1.0"
+    "@malept/cross-spawn-promise" "^1.1.1"
     colors "^1.3.3"
     debug "^4.1.1"
     detect-libc "^1.0.3"
@@ -1176,9 +1173,9 @@ entities@^2.0.0:
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 env-paths@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
-  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 error-ex@^1.2.0:
   version "1.3.2"
@@ -1418,14 +1415,14 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     universalify "^0.1.0"
 
 fs-extra@^9.0.0, fs-extra@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
-    universalify "^1.0.0"
+    universalify "^2.0.0"
 
 fs-minipass@^1.2.5:
   version "1.2.7"
@@ -1569,9 +1566,9 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@^7.1.6:
     path-is-absolute "^1.0.0"
 
 global-agent@^2.0.2:
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
-  integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc"
+  integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==
   dependencies:
     boolean "^3.0.1"
     core-js "^3.6.5"
@@ -1612,16 +1609,16 @@ global-tunnel-ng@^2.7.1:
     tunnel "^0.0.6"
 
 globalthis@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
-  integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b"
+  integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==
   dependencies:
     define-properties "^1.1.3"
 
 got@^11.7.0:
-  version "11.8.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d"
-  integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q==
+  version "11.8.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.2.tgz#7abb3959ea28c31f3576f1576c1effce23f33599"
+  integrity sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==
   dependencies:
     "@sindresorhus/is" "^4.0.0"
     "@szmarczak/http-timer" "^4.0.5"
@@ -1653,9 +1650,9 @@ got@^9.6.0:
     url-parse-lax "^3.0.0"
 
 graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
 har-schema@^2.0.0:
   version "2.0.0"
@@ -1693,9 +1690,9 @@ he@1.2.0:
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 highlight.js@^10.4.1, highlight.js@^9.3.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz#0073aa71d566906965ba6e1b7be7b2682f5e18b6"
-  integrity sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==
+  version "10.7.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360"
+  integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
@@ -1705,9 +1702,9 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 http-cache-semantics@^4.0.0:
   version "4.1.0"
@@ -1724,9 +1721,9 @@ http-signature@~1.2.0:
     sshpk "^1.7.0"
 
 http2-wrapper@^1.0.0-beta.5.2:
-  version "1.0.0-beta.5.2"
-  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3"
-  integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
   dependencies:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
@@ -1819,7 +1816,7 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-core-module@^2.1.0:
+is-core-module@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
   integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
@@ -1827,9 +1824,9 @@ is-core-module@^2.1.0:
     has "^1.0.3"
 
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-finite@^1.0.0:
   version "1.1.0"
@@ -1894,6 +1891,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -2000,9 +2002,9 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6"
-  integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
+  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -2084,21 +2086,22 @@ lodash.get@^4.0.0:
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
 lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.20:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+log-symbols@^4.0.0, log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
-    chalk "^4.0.0"
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
 
 lookpath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.1.0.tgz#932d68371a2f0b4a5644f03d6a2b4728edba96d2"
-  integrity sha512-B9NM7XpVfkyWqfOBI/UW0kVhGw7pJztsduch+1wkbYDi90mYK6/InFul3lG0hYko/VEcVMARVBJ5daFRc5aKCw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.2.0.tgz#5fccf91497acec085e66d98cb12446c21fe665ae"
+  integrity sha512-cUl+R2bGJcSJiHLVKzGHRTYTBhudbHIgd7s63gfGHteaz0BBKEEz2yw2rgbxZAFze92KlbkiWzL1ylYOmqIPVA==
 
 loud-rejection@^1.0.0:
   version "1.6.0"
@@ -2193,17 +2196,17 @@ meow@^3.1.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+mime-db@1.47.0:
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
   dependencies:
-    mime-db "1.45.0"
+    mime-db "1.47.0"
 
 mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
@@ -2323,9 +2326,9 @@ nice-try@^1.0.4:
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-abi@^2.19.2:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
-  integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48"
+  integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg==
   dependencies:
     semver "^5.4.1"
 
@@ -2523,16 +2526,17 @@ open@^7.2.1:
     is-wsl "^2.1.1"
 
 ora@^5.0.0, ora@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.2.0.tgz#de10bfd2d15514384af45f3fa9d9b1aaf344fda1"
-  integrity sha512-+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.0.tgz#42eda4855835b9cd14d33864c97a3c95a3f56bf4"
+  integrity sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==
   dependencies:
-    bl "^4.0.3"
+    bl "^4.1.0"
     chalk "^4.1.0"
     cli-cursor "^3.1.0"
     cli-spinners "^2.5.0"
     is-interactive "^1.0.0"
-    log-symbols "^4.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
@@ -2560,9 +2564,9 @@ p-cancelable@^1.0.0:
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
 p-cancelable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e"
-  integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.0.tgz#4d51c3b91f483d02a0d300765321fca393d758dd"
+  integrity sha512-HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==
 
 p-defer@^1.0.0:
   version "1.0.0"
@@ -2760,13 +2764,13 @@ pkg-dir@^4.2.0:
     find-up "^4.0.0"
 
 plist@^3.0.0, plist@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
-  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc"
+  integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==
   dependencies:
-    base64-js "^1.2.3"
+    base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
-    xmldom "0.1.x"
+    xmldom "^0.5.0"
 
 prepend-http@^2.0.0:
   version "2.0.0"
@@ -2980,9 +2984,9 @@ require-directory@^2.1.1:
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 resolve-alpn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c"
-  integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.1.1.tgz#4a006a7d533c81a5dd04681612090fde227cd6e1"
+  integrity sha512-0KbFjFPR2bnJhNx1t8Ad6RqVc8+QPJC4y561FYyC/Q/6OzB3fhUzB5PEgitYhPK6aifwR5gXBSnDMllaDWixGQ==
 
 resolve-dir@^1.0.0:
   version "1.0.1"
@@ -3000,11 +3004,11 @@ resolve-package@^1.0.1:
     get-installed-path "^2.0.3"
 
 resolve@^1.1.6, resolve@^1.10.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    is-core-module "^2.1.0"
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
 responselike@^1.0.2:
@@ -3061,9 +3065,9 @@ run-async@^2.4.0:
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -3082,13 +3086,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-filename@^1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
-  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-  dependencies:
-    truncate-utf8-bytes "^1.0.0"
-
 sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -3111,10 +3108,15 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -3270,9 +3272,9 @@ string-width@^1.0.1:
     strip-ansi "^4.0.0"
 
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
@@ -3455,6 +3457,11 @@ to-buffer@^1.1.1:
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
+to-data-view@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/to-data-view/-/to-data-view-1.1.0.tgz#08d6492b0b8deb9b29bdf1f61c23eadfa8994d00"
+  integrity sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==
+
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
@@ -3480,13 +3487,6 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-truncate-utf8-bytes@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
-  dependencies:
-    utf8-byte-length "^1.0.1"
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -3509,16 +3509,16 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
-
 type-fest@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -3537,11 +3537,6 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
-  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -3562,9 +3557,9 @@ unzip-crx-3@^0.2.0:
     yaku "^0.16.6"
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -3583,11 +3578,6 @@ username@^5.1.0:
     execa "^1.0.0"
     mem "^4.3.0"
 
-utf8-byte-length@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -3662,7 +3652,7 @@ xmlbuilder@^9.0.7:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@0.1.x, xmldom@~0.5.0:
+xmldom@^0.5.0, xmldom@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
   integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
@@ -3680,9 +3670,9 @@ xtend@~2.1.1:
     object-keys "~0.4.0"
 
 y18n@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
-  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yaku@^0.16.6:
   version "0.16.7"
@@ -3699,10 +3689,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@^20.0.0, yargs-parser@^20.2.2:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yargs-parser@^20.0.0, yargs-parser@^20.2.2, yargs-parser@~20.2.7:
+  version "20.2.7"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
+  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
 
 yargs@^16.0.0:
   version "16.2.0"

ui/desktop/package.json

@@ -36,6 +36,9 @@
     "postinstall": "cd electron-app && yarn install",
     "posttest": "ember coverage-merge && yarn clean:coverage"
   },
+  "dependencies": {
+    "ember-named-blocks-polyfill": "^0.2.4"
+  },
   "devDependencies": {
     "@doyensec/electronegativity": "^1.8.1",
     "@ember/jquery": "^1.1.0",
@@ -83,7 +86,7 @@
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
-    "faker": "^5.1.0",
+    "faker": "^5.5.3",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",

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

@@ -87,9 +87,11 @@ module('Acceptance | authentication', function (hooks) {
     // create other resources
     instances.authMethods.global = this.server.create('auth-method', {
       scope: instances.scopes.global,
+      type: 'password',
     });
     instances.authMethods.org = this.server.create('auth-method', {
       scope: instances.scopes.org,
+      type: 'password',
     });
 
     urls.scopes.global = `/scopes/${instances.scopes.global.id}`;

ui/desktop/tests/unit/authenticators/password-test.js

@@ -1,53 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
-import { Response } from 'miragejs';
-
-module('Unit | Authenticator | password', function (hooks) {
-  setupTest(hooks);
-  setupMirage(hooks);
-
-  let store;
-  let applicationAdapter;
-  let session;
-  let authenticator;
-
-  hooks.beforeEach(function () {
-    store = this.owner.lookup('service:store');
-    applicationAdapter = store.adapterFor('application');
-    session = this.owner.lookup('service:session');
-    authenticator = this.owner.lookup('authenticator:password');
-    session.invalidate();
-  });
-
-  hooks.afterEach(function () {
-    session.invalidate();
-  });
-
-  test('it adds an authorization header to application adapter on restore', async function (assert) {
-    assert.expect(1);
-    const mockData = { id: 'token1234', token: 'token1234' };
-    this.server.get(
-      authenticator.buildTokenValidationEndpointURL(mockData.id),
-      () => {
-        return new Response(200);
-      }
-    );
-    authenticator.restore(mockData);
-    assert.equal(applicationAdapter.headers.Authorization, 'Bearer token1234');
-  });
-
-  test('it adds an authorization header to application adapter on authenticate', async function (assert) {
-    assert.expect(1);
-    const creds = { identification: 'foo', password: 'bar' };
-    const scope = { id: 'global' };
-    const authMethod = { id: 'paum_1234' };
-    this.server.create('scope', { id: 'global', type: 'global' });
-    this.server.create('auth-method', { id: authMethod.id, scopeId: 'global' });
-    await authenticator.authenticate(creds, null, { scope, authMethod });
-    assert.equal(
-      applicationAdapter.headers.Authorization,
-      'Bearer thetokenstring'
-    );
-  });
-});

ui/desktop/tests/unit/controllers/scopes/scope/authenticate/method/oidc-test.js

@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/authenticate/method/oidc',
+  function (hooks) {
+    setupTest(hooks);
+
+    // TODO: Replace this with your real tests.
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/authenticate/method/oidc'
+      );
+      assert.ok(controller);
+    });
+  }
+);

ui/desktop/tests/unit/routes/scopes/scope/authenticate/method/index-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/authenticate/method/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/authenticate/method/index'
+      );
+      assert.ok(route);
+    });
+  }
+);

ui/desktop/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/authenticate/method/oidc',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/authenticate/method/oidc'
+      );
+      assert.ok(route);
+    });
+  }
+);