@adobe/aio-cli-plugin-app 14.4.2 → 14.5.1

package/README.md

@@ -75,7 +75,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/index.js)_
+_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/index.js)_
 
 ## `aio app add`
 
@@ -94,7 +94,7 @@ DESCRIPTION
   Add a new component to an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/add/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/index.js)_
+_See code: [src/commands/app/add/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/index.js)_
 
 ## `aio app add action`
 
@@ -120,7 +120,7 @@ ALIASES
   $ aio app add actions
 ```
 
-_See code: [src/commands/app/add/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/action.js)_
+_See code: [src/commands/app/add/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/action.js)_
 
 ## `aio app add ci`
 
@@ -139,7 +139,7 @@ DESCRIPTION
   Add CI files
 ```
 
-_See code: [src/commands/app/add/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/ci.js)_
+_See code: [src/commands/app/add/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/ci.js)_
 
 ## `aio app add event`
 
@@ -165,7 +165,7 @@ ALIASES
   $ aio app add events
 ```
 
-_See code: [src/commands/app/add/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/event.js)_
+_See code: [src/commands/app/add/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/event.js)_
 
 ## `aio app add extension`
 
@@ -192,7 +192,7 @@ ALIASES
   $ aio app add extensions
 ```
 
-_See code: [src/commands/app/add/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/extension.js)_
+_See code: [src/commands/app/add/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/extension.js)_
 
 ## `aio app add service`
 
@@ -217,7 +217,7 @@ ALIASES
   $ aio app add services
 ```
 
-_See code: [src/commands/app/add/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/service.js)_
+_See code: [src/commands/app/add/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/service.js)_
 
 ## `aio app add web-assets`
 
@@ -239,7 +239,7 @@ DESCRIPTION
   Add web assets support
 ```
 
-_See code: [src/commands/app/add/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/add/web-assets.js)_
+_See code: [src/commands/app/add/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/add/web-assets.js)_
 
 ## `aio app build`
 
@@ -270,7 +270,7 @@ DESCRIPTION
   Use the --force-build flag to force a build even if one already exists.
 ```
 
-_See code: [src/commands/app/build.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/build.js)_
+_See code: [src/commands/app/build.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/build.js)_
 
 ## `aio app clean`
 
@@ -296,7 +296,7 @@ DESCRIPTION
   Note that this will require a full rebuild on your next build command.
 ```
 
-_See code: [src/commands/app/clean.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/clean.js)_
+_See code: [src/commands/app/clean.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/clean.js)_
 
 ## `aio app create [PATH]`
 
@@ -319,7 +319,7 @@ DESCRIPTION
   Create a new Adobe I/O App with default parameters
 ```
 
-_See code: [src/commands/app/create.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/create.js)_
+_See code: [src/commands/app/create.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/create.js)_
 
 ## `aio app delete`
 
@@ -338,7 +338,7 @@ DESCRIPTION
   Delete a component from an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/delete/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/index.js)_
+_See code: [src/commands/app/delete/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/index.js)_
 
 ## `aio app delete action [ACTION-NAME]`
 
@@ -365,7 +365,7 @@ ALIASES
   $ aio app delete actions
 ```
 
-_See code: [src/commands/app/delete/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/action.js)_
+_See code: [src/commands/app/delete/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/action.js)_
 
 ## `aio app delete ci`
 
@@ -385,7 +385,7 @@ DESCRIPTION
   Delete existing CI files
 ```
 
-_See code: [src/commands/app/delete/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/ci.js)_
+_See code: [src/commands/app/delete/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/ci.js)_
 
 ## `aio app delete extension`
 
@@ -412,7 +412,7 @@ ALIASES
   $ aio app delete extensions
 ```
 
-_See code: [src/commands/app/delete/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/extension.js)_
+_See code: [src/commands/app/delete/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/extension.js)_
 
 ## `aio app delete service`
 
@@ -437,7 +437,7 @@ ALIASES
   $ aio app delete services
 ```
 
-_See code: [src/commands/app/delete/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/service.js)_
+_See code: [src/commands/app/delete/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/service.js)_
 
 ## `aio app delete web-assets`
 
@@ -457,7 +457,7 @@ DESCRIPTION
   Delete existing web assets
 ```
 
-_See code: [src/commands/app/delete/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/delete/web-assets.js)_
+_See code: [src/commands/app/delete/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/delete/web-assets.js)_
 
 ## `aio app deploy`
 
@@ -504,7 +504,7 @@ DESCRIPTION
   Use the --force-deploy flag to force deploy changes, regardless of production Workspace being published in Exchange.
 ```
 
-_See code: [src/commands/app/deploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/deploy.js)_
+_See code: [src/commands/app/deploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/deploy.js)_
 
 ## `aio app get-url [ACTION]`
 
@@ -527,7 +527,7 @@ DESCRIPTION
   Get action URLs
 ```
 
-_See code: [src/commands/app/get-url.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/get-url.js)_
+_See code: [src/commands/app/get-url.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/get-url.js)_
 
 ## `aio app info`
 
@@ -550,7 +550,7 @@ DESCRIPTION
   Display settings/configuration in use by an Adobe I/O App
 ```
 
-_See code: [src/commands/app/info.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/info.js)_
+_See code: [src/commands/app/info.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/info.js)_
 
 ## `aio app init [PATH]`
 
@@ -594,7 +594,7 @@ DESCRIPTION
   Create a new Adobe I/O App
 ```
 
-_See code: [src/commands/app/init.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/init.js)_
+_See code: [src/commands/app/init.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/init.js)_
 
 ## `aio app install PATH`
 
@@ -619,7 +619,7 @@ DESCRIPTION
   This command will support installing apps packaged by 'aio app pack'.
 ```
 
-_See code: [src/commands/app/install.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/install.js)_
+_See code: [src/commands/app/install.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/install.js)_
 
 ## `aio app list`
 
@@ -638,7 +638,7 @@ DESCRIPTION
   List components for Adobe I/O App
 ```
 
-_See code: [src/commands/app/list/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/list/index.js)_
+_See code: [src/commands/app/list/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/list/index.js)_
 
 ## `aio app list extension`
 
@@ -664,7 +664,7 @@ ALIASES
   $ aio app list extensions
 ```
 
-_See code: [src/commands/app/list/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/list/extension.js)_
+_See code: [src/commands/app/list/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/list/extension.js)_
 
 ## `aio app logs`
 
@@ -689,7 +689,7 @@ DESCRIPTION
   Fetch logs for an Adobe I/O App
 ```
 
-_See code: [src/commands/app/logs.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/logs.js)_
+_See code: [src/commands/app/logs.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/logs.js)_
 
 ## `aio app pack [PATH]`
 
@@ -714,7 +714,7 @@ DESCRIPTION
   This command will support packaging apps for redistribution.
 ```
 
-_See code: [src/commands/app/pack.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/pack.js)_
+_See code: [src/commands/app/pack.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/pack.js)_
 
 ## `aio app run`
 
@@ -738,7 +738,7 @@ DESCRIPTION
   Run an Adobe I/O App
 ```
 
-_See code: [src/commands/app/run.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/run.js)_
+_See code: [src/commands/app/run.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/run.js)_
 
 ## `aio app test`
 
@@ -768,7 +768,7 @@ DESCRIPTION
   If the extension has a hook called 'test' in its 'ext.config.yaml', the script specified will be run instead.
 ```
 
-_See code: [src/commands/app/test.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/test.js)_
+_See code: [src/commands/app/test.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/test.js)_
 
 ## `aio app undeploy`
 
@@ -794,7 +794,7 @@ DESCRIPTION
   Undeploys an Adobe I/O App
 ```
 
-_See code: [src/commands/app/undeploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/undeploy.js)_
+_See code: [src/commands/app/undeploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/undeploy.js)_
 
 ## `aio app use [CONFIG_FILE_PATH]`
 
@@ -842,5 +842,5 @@ DESCRIPTION
   page in https://developer.adobe.com/console/
 ```
 
-_See code: [src/commands/app/use.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.4.2/src/commands/app/use.js)_
+_See code: [src/commands/app/use.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.5.1/src/commands/app/use.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -2434,5 +2434,5 @@
       ]
     }
   },
-  "version": "14.4.2"
+  "version": "14.5.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "14.4.2",
+  "version": "14.5.1",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {

package/src/lib/defaults.js

@@ -22,6 +22,7 @@ module.exports = {
   defaultImageCacheDuration: '604800',
   AIO_CONFIG_IMS_ORG_ID: 'project.org.ims_org_id',
   SERVICE_API_KEY_ENV: 'SERVICE_API_KEY',
+  IMS_OAUTH_S2S_ENV: 'IMS_OAUTH_S2S',
   ENTP_INT_CERTS_FOLDER: 'entp-int-certs',
   CONSOLE_API_KEYS: {
     prod: 'aio-cli-console-auth',

package/src/lib/import-helper.js

@@ -734,8 +734,31 @@ const getProjectCredentialType = (projectConfig, flags) => {
   return LibConsoleCLI.OAUTH_SERVER_TO_SERVER_CREDENTIAL
 }
 
+/**
+ * Get the OAuth server_to_server credential in IMS API format, from the console config.
+ *
+ * @param {object} config Console config object
+ * @returns {{ client_id, client_secret, org_id, scopes } | undefined} OAuthS2S credential or undefined
+ */
+const getOAuthS2SCredential = (config) => {
+  const credential = config?.project?.workspace?.details?.credentials
+    ?.find(c => c.integration_type === 'oauth_server_to_server')
+    ?.oauth_server_to_server
+  const imsOrgId = config?.project?.org?.ims_org_id
+
+  if (credential) {
+    return {
+      client_id: credential.client_id,
+      client_secret: credential.client_secrets[0], // take the first secret
+      org_id: imsOrgId,
+      scopes: credential.scopes
+    }
+  }
+}
+
 module.exports = {
   getServiceApiKey,
+  getOAuthS2SCredential,
   writeFile,
   loadConfigFile,
   loadAndValidateConfigFile,

package/src/lib/import.js

@@ -1,5 +1,5 @@
-const { loadAndValidateConfigFile, importConfigJson, loadConfigFile, getServiceApiKey } = require('./import-helper')
-const { SERVICE_API_KEY_ENV } = require('./defaults')
+const { loadAndValidateConfigFile, importConfigJson, loadConfigFile, getServiceApiKey, getOAuthS2SCredential } = require('./import-helper')
+const { SERVICE_API_KEY_ENV, IMS_OAUTH_S2S_ENV } = require('./defaults')
 
 /**
  * Imports the project's console config to the local environment.
@@ -22,8 +22,24 @@ async function importConsoleConfig (consoleConfigFileOrBuffer, flags) {
   const loadFunc = skipValidation ? loadConfigFile : loadAndValidateConfigFile
   const config = loadFunc(consoleConfigFileOrBuffer).values
 
-  const serviceClientId = getServiceApiKey(config, useJwt)
-  const extraEnvVars = { [SERVICE_API_KEY_ENV]: serviceClientId }
+  const serviceClientId = getServiceApiKey(config, useJwt) // = client_id, legacy
+  const oauthS2SCredential = getOAuthS2SCredential(config)
+
+  let extraEnvVars
+  if (typeof oauthS2SCredential === 'object') {
+    // unpack oauthS2S json into IMS_OAUTH_S2S_* env vars
+    const oauthS2SEnv = Object.entries(oauthS2SCredential).reduce((acc, [key, value]) => {
+      if (Array.isArray(value)) {
+        value = JSON.stringify(value) // stringify arrays e.g. scopes to be consistent with AIO_* vars behavior
+      }
+      acc[`${IMS_OAUTH_S2S_ENV}_${key.toUpperCase()}`] = value
+      return acc
+    }, {})
+
+    extraEnvVars = { [SERVICE_API_KEY_ENV]: serviceClientId, ...oauthS2SEnv }
+  } else {
+    extraEnvVars = { [SERVICE_API_KEY_ENV]: serviceClientId }
+  }
 
   await importConfigJson(consoleConfigFileOrBuffer, process.cwd(), { interactive, overwrite, merge, useJwt }, extraEnvVars)
   return config