fix(autodiscovery): await fetching config in beforeModel and afterModel

Author: derrabauke

README.md

@@ -189,6 +189,8 @@ module.exports = function (environment) {
 
 Further there is the possibilty to user the `.well-known` endpoint of your authentication backend (specified [in the OpenID provider configuration chapter](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig). For this to work you must **at least provide a valid `host` configuration value.**
 
+To enforce the autodiscovery, but also providing some keys (autodiscovery will overwrite duplicate keys), set `forceAutodiscovery: true`.
+
 ### Options
 
 Here is a complete list of all possible config options:

addon/routes/oidc-authentication.js

@@ -67,7 +67,9 @@ export default class OIDCAuthenticationRoute extends Route {
    * @param {String} transition.to.queryParams.state The state given by the identity provider
    */
   async afterModel(_, transition) {
-    if (!this.config.authEndpoint) {
+    await this.config.loadConfig();
+
+    if (!this.config.hasEndpointsConfigured) {
       throw new Error(
         "Please define all OIDC endpoints (auth, token, logout, userinfo)",
       );

addon/services/config.js

@@ -25,7 +25,8 @@ const defaultConfig = {
 };
 
 const aliases = {
-  authEndpoint: "authorizationEndpoint",
+  // "originalKey": "aliasKey"
+  authorizationEndpoint: "authEndpoint",
 };
 
 export const applyAliases = (config) => {
@@ -50,12 +51,8 @@ export default class ConfigurationService extends Service {
   constructor(...args) {
     super(...args);
 
-    const envConfig =
-      getOwner(this).resolveRegistration("config:environment")[
-        "ember-simple-auth-oidc"
-      ];
-    if (envConfig) {
-      this.resolvedConfig = applyAliases(camelizeObjectKeys(envConfig));
+    if (this.environment) {
+      this.resolvedConfig = applyAliases(camelizeObjectKeys(this.environment));
     }
 
     this.configKeys.forEach((key) => {
@@ -67,6 +64,12 @@ export default class ConfigurationService extends Service {
     });
   }
 
+  get environment() {
+    return getOwner(this).resolveRegistration("config:environment")[
+      "ember-simple-auth-oidc"
+    ];
+  }
+
   @cached
   get configuration() {
     return { ...defaultConfig, ...this.resolvedConfig, ...this.fetchedConfig };
@@ -85,8 +88,12 @@ export default class ConfigurationService extends Service {
   }
 
   async loadConfig() {
-    if (!this.hasEndpointsConfigured) {
-      await this._fetchAuthConfiguration.perform();
+    if (this.environment.forceAutodiscovery || !this.hasEndpointsConfigured) {
+      if (this._fetchAuthConfiguration.isRunning) {
+        await this._fetchAuthConfiguration.last;
+      } else {
+        await this._fetchAuthConfiguration.perform();
+      }
     }
   }
 
@@ -95,7 +102,7 @@ export default class ConfigurationService extends Service {
    * SPEC: https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig
    */
   @lastValue("_fetchAuthConfiguration") fetchedConfig;
-  _fetchAuthConfiguration = task(async () => {
+  _fetchAuthConfiguration = task({ drop: true }, async () => {
     if (this._fetchAuthConfiguration.lastSuccessful) {
       return this.fetchedConfig;
     }

tests/dummy/config/environment.js

@@ -20,6 +20,7 @@ module.exports = function (environment) {
       loginHintName: "custom_login_hint",
       expiresIn: 60000, // Short expire time (60s) for testing purpose
       refreshLeeway: 1000,
+      forceAutodiscovery: false,
     },
 
     EmberENV: {

tests/unit/services/config-test.js

@@ -30,10 +30,10 @@ module("Unit | Service | config", function (hooks) {
 
   test("alias configuration keys", function (assert) {
     const aliased = applyAliases({
-      authEndpoint: "auth",
+      authorizationEndpoint: "auth",
     });
 
-    assert.strictEqual(aliased.authorizationEndpoint, "auth");
+    assert.strictEqual(aliased.authEndpoint, "auth");
   });
 
   test("fetch configuration if necessary keys are not given", async function (assert) {