#75 Add back configurable access token creation plugin support

README.md

@@ -1,7 +1,8 @@
 [![Version](https://img.shields.io/npm/v/@adobe/aio-lib-ims.svg)](https://npmjs.org/package/@adobe/aio-lib-ims)
 [![Downloads/week](https://img.shields.io/npm/dw/@adobe/aio-lib-ims.svg)](https://npmjs.org/package/@adobe/aio-lib-ims)
-[![Node.js CI](https://github.com/adobe/aio-lib-ims/actions/workflows/node.js.yml/badge.svg)](https://github.com/adobe/aio-lib-ims/actions/workflows/node.js.yml)[![License](https://img.shields.io/npm/l/@adobe/aio-lib-ims.svg)](https://github.com/adobe/aio-lib-ims/blob/master/package.json)
-[![Codecov Coverage](https://img.shields.io/codecov/c/github/adobe/aio-lib-ims/master.svg?style=flat-square)](https://codecov.io/gh/adobe/aio-lib-ims/) 
+[![Build Status](https://travis-ci.com/adobe/aio-lib-ims.svg?branch=master)](https://travis-ci.com/adobe/aio-lib-ims)
+[![License](https://img.shields.io/npm/l/@adobe/aio-lib-ims.svg)](https://github.com/adobe/aio-lib-ims/blob/master/package.json)
+[![Codecov Coverage](https://img.shields.io/codecov/c/github/adobe/aio-lib-ims/master.svg?style=flat-square)](https://codecov.io/gh/adobe/aio-lib-ims/)
 
 
 # Adobe I/O IMS Library
@@ -125,7 +126,7 @@ In general, you do not need to deal with this property.
 
 ## Set Current Context (Advanced)
 
-The default context can be set locally with `await context.setCurrent('contextname')`. 
+The default context can be set locally with `await context.setCurrent('contextname')`.
 This will write the following configuration to the `ims` key in the `.aio` file of the current working directory:
 
 ```js
@@ -165,7 +166,7 @@ JWT (service to service integration) configuration requires the following proper
 
 ## Setting the Private Key
 
-For a JWT configuration, your private key is generated in Adobe I/O Console, and is downloaded to your computer when you generate it. 
+For a JWT configuration, your private key is generated in Adobe I/O Console, and is downloaded to your computer when you generate it.
 
 Adobe I/O Console does not keep the private key (only your corresponding public key) so you will have to set the private key that was downloaded manually in your IMS context configuration.
 
@@ -196,6 +197,31 @@ OAuth2 configuration requires the following properties:
 | redirect_uri | The _Default redirect URI_ from the integration overview screen in the I/O Console. Alternatively, any URI matching one of the _Redirect URI patterns_ may be used. |
 | scope | Scopes to assign to the tokens. This is a string of space separated scope names which depends on the services this integration is subscribed to. Adobe I/O Console does not currently expose the list of scopes defined for OAuth2 integrations, a good list of scopes by service can be found in [OAuth 2.0 Scopes](https://www.adobe.io/authentication/auth-methods.html#!AdobeDocs/adobeio-auth/master/OAuth/Scopes.md). At the very least you may want to enter `openid`. |
 
+
+## Token Creation Plugins
+
+Additional token creation plugins can be registered with the Adobe I/O IMS library configuration.
+Such token creation plugins must comply with the following contract:
+
+* Implemented as a JavaScript module which can be `require()`-ed by the IMS library
+* Registered with the module path used by the `require()` function
+* Implementing 3 functions as follows:
+  * `Promise<any> canSupport(config)` -- Receives the configuration properties of the selected context and returns a promise as to whether the token creation plugin can be used with this configuration. The promise must resolve to `true` if supported or be rejected with an `Error` explaining why the configuration is not supported by the plugin.
+  * `boolean supports(config)` -- Receives the configuration properties of the selected context and returns `true` if supported or `false` if not supported. This is a syncronous function.
+  * `Promise<any> imsLogin(ims, config)` -- Receives an instance of the IMS token manager class and the configuration properties of the selected context to create an access token from. If the token creation plugin does not support the configuration or if an error occurs creating the token, the function must return a `Promise` rejecting with an `Error` explaining the problem. Otherwise the promise should resolve to an `object` containing the access token and optionally a refresh token.
+
+The `Context` class offers two methods to manage token creation plugins:
+
+* `Context.getPlugins()` returning a `Promise<string[]>` listing the additional token creation plugins.
+* `Context.setPlugins(string[])` taking the list of additional token creation plugins to configure.
+
+**Note 1**: the `setPlugins` method completely replaces the current list of plugins.
+Any selective addition of removal must be done in a three step process: Get the plugins, update the list, set the plugins.
+
+**Note 2**: The token creation plugins supporting [JWT](https://github.com/adobe/aio-lib-ims-jwt/blob/master/src/ims-jwt.js), [OAuth2](https://github.com/adobe/aio-lib-ims-oauth/blob/master/src/ims-oauth.js), and [CLI](https://github.com/adobe/aio-lib-ims-oauth/blob/master/src/ims-cli.js) login, are always present.
+As such they are note returned by the `getPlugins` method and should not be provided in the `setPlugins` method.
+
+
 # Contributing
 Contributions are welcomed! Read the [Contributing Guide](CONTRIBUTING.md) for more information.
 

src/context.js

@@ -35,6 +35,9 @@ const CLI = 'cli'
 /** Property holding the current context name */
 const CURRENT = 'current'
 
+/** Property holding the list of additional token creation plugins */
+const PLUGINS = 'plugins'
+
 /** @private */
 function guessContextType () {
   if (process.env.__OW_ACTION_NAME) {
@@ -52,7 +55,7 @@ function getContext () {
     if (guessContextType() === TYPE_ACTION) {
       context = new ActionContext({ IMS, CONTEXTS, CONFIG, CURRENT })
     } else {
-      context = new CliContext({ IMS, CONTEXTS, CONFIG, CURRENT, CLI })
+      context = new CliContext({ IMS, CONTEXTS, CONFIG, CURRENT, CLI, PLUGINS })
     }
   }
   return context
@@ -72,5 +75,6 @@ module.exports = {
   CURRENT,
   CLI,
   CONTEXTS,
-  CONFIG
+  CONFIG,
+  PLUGINS
 }

src/ctx/ConfigCliContext.js

@@ -57,6 +57,36 @@ class ConfigCliContext extends Context {
     this.setContextValue(`${this.keyNames.CLI}`, { ...existingData, ...contextData }, local)
   }
 
+  /**
+   * Override super class implementation to return the plugins configured
+   * in the `plugins` configuration property.
+   *
+   * @override
+   */
+  async getPlugins () {
+    aioLogger.debug('getPlugins()')
+    return this.getConfigValue(this.keyNames.PLUGINS)
+  }
+
+  /**
+   * Override super class implementation to persist the provided plugins
+   * in the `plugins` configuration property.
+   *
+   * This implementation silently ignores a `plugins` parameter which is
+   * neither and array nor `null`.
+   *
+   * @override
+   */
+  async setPlugins (plugins, local = false) {
+    aioLogger.debug('setPlugins(%o, %s)', plugins, !!local)
+
+    if (plugins instanceof Array || plugins === null) {
+      this.setConfigValue(this.keyNames.PLUGINS, plugins, !!local)
+    } else {
+      aioLogger.debug('  > Ignoring unexpected plugins parameter \'%o\'', plugins)
+    }
+  }
+
   /**
    * @protected
    * @override

src/ctx/Context.js

@@ -113,6 +113,41 @@ class Context {
     return this.contextKeys()
   }
 
+  /**
+   * Gets the list of configured token creation plugins. This base
+   * implementation returns an empty array. Extensions supporting
+   * token creation plugins must override to return the list of
+   * plugins which can be require-d.
+   *
+   * @returns {Promise<string[]>} empty list of token creation plugins
+   */
+  async getPlugins () {
+    aioLogger.debug('getPlugins() (none)')
+    return []
+  }
+
+  /**
+   * Sets the list of configured token creation plugins. This base
+   * implementation throws an Error as plugins are not supported.
+   * Extensions supporting token creation plugins must override to
+   * check and persist the list of plugins which can be require-d.
+   *
+   * If the plugins parameter is an empty array or null, the current
+   * plugins configuration is removed. Otherwise the current
+   * configuration is replaced by the new list of plugins.
+   *
+   * Note, that implementations are only required to validate that
+   * the plugins parameter is a possibly empty array of strings or
+   * null. Actually provided string values need not be validated.
+   *
+   * @param {string[]} plugins An array of plugins to configure
+   * @param {boolean} [local=false] set to true to save to local config, false for global config
+   */
+  async setPlugins (plugins, local = false) {
+    aioLogger.debug('setPlugins(%o, %b)', plugins, !!local)
+    throwNotImplemented()
+  }
+
   /* To be implemented */
 
   /**

src/token-helper.js

@@ -13,7 +13,7 @@ governing permissions and limitations under the License.
 const { Ims, ACCESS_TOKEN, REFRESH_TOKEN } = require('./ims')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-lib-ims:token-helper', { provider: 'debug' })
 const { getContext } = require('./context')
-const imsJwtPlugin = require('@adobe/aio-lib-ims-jwt')
+const imsJwtPlugin = '@adobe/aio-lib-ims-jwt'
 const { codes: errors } = require('./errors')
 
 /**
@@ -32,8 +32,8 @@ by aio-lib-runtime */
 const ACTION_BUILD = (typeof WEBPACK_ACTION_BUILD === 'undefined') ? false : WEBPACK_ACTION_BUILD
 if (!ACTION_BUILD) {
   // use OAuth and CLI imports only when WEBPACK_ACTION_BUILD global is not set
-  const imsCliPlugin = require('@adobe/aio-lib-ims-oauth/src/ims-cli')
-  const imsOAuthPlugin = require('@adobe/aio-lib-ims-oauth')
+  const imsCliPlugin = '@adobe/aio-lib-ims-oauth/src/ims-cli'
+  const imsOAuthPlugin = '@adobe/aio-lib-ims-oauth'
 
   DEFAULT_CREATE_TOKEN_PLUGINS = {
     cli: imsCliPlugin,
@@ -42,8 +42,57 @@ if (!ACTION_BUILD) {
   }
 }
 
-const IMS_TOKEN_MANAGER = {
+/**
+ * Returns a consolidated list of login plugins to try for acquiring the token.
+ *
+ * @param {object} context The configuration context providing additional plugins
+ * @returns {Promise<string[]>} The list of login plugins to try
+ */
+async function getMergedPlugins (context) {
+  aioLogger.debug('getMergedPlugins(%o)', context)
+
+  return context.getPlugins()
+    .then((plugins) => {
+      if (plugins instanceof Array && plugins.length > 0) {
+        aioLogger.debug('  > adding configured plugins: %o', plugins)
+        const configPluginMap = Object.fromEntries(plugins.map(element => [element, element]))
+        return Object.assign(configPluginMap, DEFAULT_CREATE_TOKEN_PLUGINS)
+      } else if (plugins !== undefined) {
+        aioLogger.debug('Ignored configured plugins: Expected string[], got: \'%o\'', plugins)
+      }
+
+      aioLogger.debug('  > using default plugins only')
+      return DEFAULT_CREATE_TOKEN_PLUGINS
+    }
+    )
+}
 
+/**
+ * Loads the requested plugin and returns it or a dummy pluggin in case
+ * of a load failure. The dummy plugin returns "false" for the supports()
+ * function and will reject the canSupport() function regardless of supplied
+ * parameters.
+ *
+ * @param {string} name The name of the plugin to try to load
+ * @param {string} location The location from where to load the plugin
+ * @returns {object} The loaded plugin or a dummy in case of failure to load
+ */
+function loadPlugin (name, location) {
+  aioLogger.debug('loadPlugin(%s, %s)', name, location)
+
+  try {
+    return require(location)
+  } catch (error) {
+    aioLogger.debug('Ignoring plugin %s due to load failure from %s', name, location)
+    aioLogger.debug('Error: %o', error)
+    return {
+      supports: () => false,
+      canSupport: async () => Promise.reject(new Error(`Plugin not loaded: ${JSON.stringify(error)}`))
+    }
+  }
+}
+
+const IMS_TOKEN_MANAGER = {
   async getToken (contextName, options) {
     aioLogger.debug('getToken(%s, %o)', contextName, options)
 
@@ -108,13 +157,14 @@ const IMS_TOKEN_MANAGER = {
   async _generateToken (ims, config, reason, options) {
     aioLogger.debug('_generateToken(reason=%s)', reason)
 
-    const imsLoginPlugins = DEFAULT_CREATE_TOKEN_PLUGINS
-    const pluginErrors = []
+    const imsLoginPlugins = await getMergedPlugins(this._context)
+    aioLogger.debug('  > Got imsLoginPlugins: %o', imsLoginPlugins)
+    let pluginErrors = ['Cannot generate token because no plugin supports configuration:'] // eslint-disable-line prefer-const
 
     for (const name of Object.keys(imsLoginPlugins)) {
       aioLogger.debug('  > Trying: %s', name)
       try {
-        const { canSupport, supports, imsLogin } = imsLoginPlugins[name]
+        const { canSupport, supports, imsLogin } = await loadPlugin(name, imsLoginPlugins[name])
         aioLogger.debug('  > supports(%o): %s', config, supports(config))
         if (typeof supports === 'function' && supports(config) && typeof imsLogin === 'function') {
           const loginConfig = (typeof options === 'object') ? { ...config, ...options } : config

test/ctx/ConfigCliContext.test.js

@@ -20,7 +20,8 @@ const keyNames = {
   CONFIG: 'b',
   CONTEXTS: 'c',
   CURRENT: 'd',
-  CLI: 'd'
+  CLI: 'd',
+  PLUGINS: 'e'
 }
 
 let context
@@ -127,3 +128,57 @@ describe('contextKeys', () => {
     expect(aioConfig.get).toHaveBeenCalledWith(`${keyNames.IMS}.${keyNames.CONTEXTS}`)
   })
 })
+
+describe('getPlugins', () => {
+  test('(<no args>), plugins=undefined', async () => {
+    context.getConfigValue = jest.fn().mockResolvedValue(undefined)
+    const ret = await context.getPlugins()
+    expect(ret).toEqual(undefined)
+    expect(context.getConfigValue).toHaveBeenCalledWith(keyNames.PLUGINS)
+  })
+  test('(<no args>), plugins=[]', async () => {
+    context.getConfigValue = jest.fn().mockResolvedValue([])
+    const ret = await context.getPlugins()
+    expect(ret).toEqual([])
+    expect(context.getConfigValue).toHaveBeenCalledWith(keyNames.PLUGINS)
+  })
+  test('(<no args>), plugins=45', async () => {
+    context.getConfigValue = jest.fn().mockResolvedValue(45)
+    const ret = await context.getPlugins()
+    expect(ret).toEqual(45)
+    expect(context.getConfigValue).toHaveBeenCalledWith(keyNames.PLUGINS)
+  })
+  test('(<no args>), plugins=[\'@adobe/internal_plugin\']', async () => {
+    context.getConfigValue = jest.fn().mockResolvedValue(['@adobe/internal_plugin'])
+    const ret = await context.getPlugins()
+    expect(ret).toEqual(['@adobe/internal_plugin'])
+    expect(context.getConfigValue).toHaveBeenCalledWith(keyNames.PLUGINS)
+  })
+})
+
+describe('setPlugins', () => {
+  test('(undefined, false)', async () => {
+    await expect(context.setPlugins()).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledTimes(0)
+  })
+  test('([], false)', async () => {
+    await expect(context.setPlugins([])).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledWith(`${keyNames.IMS}.${keyNames.CONFIG}.${keyNames.PLUGINS}`, [], false)
+  })
+  test('([\'@adobe/internal_plugin\'], false)', async () => {
+    await expect(context.setPlugins(['@adobe/internal_plugin'])).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledWith(`${keyNames.IMS}.${keyNames.CONFIG}.${keyNames.PLUGINS}`, ['@adobe/internal_plugin'], false)
+  })
+  test('(undefined, true)', async () => {
+    await expect(context.setPlugins(undefined, true)).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledTimes(0)
+  })
+  test('([], true)', async () => {
+    await expect(context.setPlugins([], true)).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledWith(`${keyNames.IMS}.${keyNames.CONFIG}.${keyNames.PLUGINS}`, [], true)
+  })
+  test('([\'@adobe/internal_plugin\'], true)', async () => {
+    await expect(context.setPlugins(['@adobe/internal_plugin'], true)).resolves.toEqual(undefined)
+    expect(aioConfig.set).toHaveBeenCalledWith(`${keyNames.IMS}.${keyNames.CONFIG}.${keyNames.PLUGINS}`, ['@adobe/internal_plugin'], true)
+  })
+})

test/ctx/Context.test.js

@@ -47,6 +47,9 @@ describe('not implemented methods', () => {
   test('Context.contextKeys', async () => {
     await expect(context.contextKeys('key', 'value')).rejects.toThrow('abstract method is not implemented')
   })
+  test('Context.setPlugins', async () => {
+    await expect(context.setPlugins(['plugin'])).rejects.toThrow('abstract method is not implemented')
+  })
 })
 
 describe('getCurrent', () => {
@@ -141,3 +144,10 @@ describe('keys', () => {
     expect(context.contextKeys).toHaveBeenCalledWith()
   })
 })
+
+describe('getPlugins', () => {
+  test('(<no args>)', async () => {
+    const ret = await context.getPlugins()
+    expect(ret).toEqual([])
+  })
+})

test/token-helper.test.js

@@ -72,7 +72,7 @@ afterEach(() => {
 })
 
 /** @private */
-function createHandlerForContext (context = {}) {
+function createHandlerForContext (context = {}, withPlugin) {
   const mappedContext = Object.keys(context)
     // prefix ims. to all the keys
     .map(key => {
@@ -85,6 +85,14 @@ function createHandlerForContext (context = {}) {
       return Object.assign(acc, cur)
     }, {})
 
+  // add unresolvable plugin or illegale configuration value depending
+  // on withPlugin parameter (default is unsupported value)
+  if (withPlugin) {
+    mappedContext['ims.config.plugins'] = ['@adobe/__non_existing_login_plugin__']
+  } else {
+    mappedContext['ims.config.plugins'] = '__unsupported_value__'
+  }
+
   const store = {
     ...mappedContext
   }
@@ -176,7 +184,7 @@ test('getToken - string (oauth)', async () => {
 
   setImsPluginMock('oauth', 'abc123')
   config.get.mockImplementation(
-    createHandlerForContext(context)
+    createHandlerForContext(context, true)
   )
 
   // no force
@@ -266,7 +274,7 @@ test('getToken - object (refresh token expired, coverage)', async () => {
 
   setImsPluginMock('jwt', result)
   config.get.mockImplementation(
-    createHandlerForContext(context)
+    createHandlerForContext(context, true)
   )
 
   // no force