skip env var and use config lib (#200)

Author: purplecabbage

src/BaseCommand.js

@@ -12,8 +12,25 @@ governing permissions and limitations under the License.
 
 const { Command, flags } = require('@oclif/command')
 const fs = require('fs-extra')
+const chalk = require('chalk')
+const coreConfig = require('@adobe/aio-lib-core-config')
 
 class BaseCommand extends Command {
+  getLaunchUrlPrefix () {
+    // todo: it might make sense to have a value that defines if this is an ExC hosted app, or otherwise
+    // so we can decide what type of url to return here.
+    // at some point we could also just delete the .env value and return our expected url here.
+
+    // note: this is the same value as process.env.AIO_LAUNCH_URL_PREFIX
+    let launchPrefix = coreConfig.get('launch.url.prefix')
+    if (launchPrefix && launchPrefix.search('/myapps/')) {
+      this.log(chalk.redBright(chalk.bold('Warning: your environment variables contains an older version of AIO_LAUNCH_URL_PREFIX')))
+      launchPrefix = launchPrefix.replace('/myapps/', '/apps/')
+      this.log(chalk.redBright(chalk.bold(`You should update your .env file: AIO_LAUNCH_URL_PREFIX='${launchPrefix}'`)))
+    }
+    return launchPrefix
+  }
+
   get pjson () {
     if (!this._pjson) {
       this._pjson = fs.readJSONSync('package.json')

src/commands/app/deploy.js

@@ -120,8 +120,9 @@ class Deploy extends BaseCommand {
         }
         if (deployedFrontendUrl) {
           this.log(chalk.blue(chalk.bold(`To view your deployed application:\n  -> ${deployedFrontendUrl}`)))
-          if (process.env.AIO_LAUNCH_URL_PREFIX) {
-            const launchUrl = process.env.AIO_LAUNCH_URL_PREFIX + deployedFrontendUrl
+          const launchPrefix = this.getLaunchUrlPrefix()
+          if (launchPrefix) {
+            const launchUrl = launchPrefix + deployedFrontendUrl
             this.log(chalk.blue(chalk.bold(`To view your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
           }
         }

src/commands/app/run.js

@@ -101,9 +101,11 @@ class Run extends BaseCommand {
       if (frontendUrl) {
         this.log()
         this.log(chalk.blue(chalk.bold(`To view your local application:\n  -> ${frontendUrl}`)))
-        if (process.env.AIO_LAUNCH_URL_PREFIX) {
-          const launchUrl = process.env.AIO_LAUNCH_URL_PREFIX + frontendUrl
-          this.log(chalk.blue(chalk.bold(`To view your local application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
+
+        const launchPrefix = this.getLaunchUrlPrefix()
+        if (launchPrefix) {
+          const launchUrl = launchPrefix + frontendUrl
+          this.log(chalk.blue(chalk.bold(`To view your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
         }
       }
     } catch (error) {

test/commands/app/deploy.test.js

@@ -17,6 +17,9 @@ const mockFS = require('fs-extra')
 
 const mockScripts = require('@adobe/aio-app-scripts')()
 
+jest.mock('@adobe/aio-lib-core-config')
+const mockConfig = require('@adobe/aio-lib-core-config')
+
 beforeEach(() => {
   mockScripts.mockReset('deployActions')
   mockScripts.mockReset('deployUI')
@@ -268,13 +271,12 @@ describe('run', () => {
   test('deploy should show ui and exc url if AIO_LAUNCH_PREFIX_URL is set', async () => {
     mockFS.existsSync.mockReturnValue(true)
     mockScripts.deployUI.mockResolvedValue('https://example.com')
-    process.env.AIO_LAUNCH_URL_PREFIX = 'http://prefix?fake='
+    mockConfig.get.mockReturnValue('http://prefix?fake=')
     command.argv = []
     await command.run()
     expect(command.error).toHaveBeenCalledTimes(0)
     expect(command.log).toHaveBeenCalledWith(expect.stringContaining('https://example.com'))
     expect(command.log).toHaveBeenCalledWith(expect.stringContaining('http://prefix?fake=https://example.com'))
-    delete process.env.AIO_LAUNCH_PREFIX_URL
   })
 
   test('deploy should show action urls', async () => {

test/commands/app/run.test.js

@@ -89,7 +89,6 @@ beforeEach(() => {
 
   getPort.mockReset()
 
-  delete process.env.AIO_LAUNCH_URL_PREFIX
   delete process.env.REMOTE_ACTIONS
   delete process.env.PORT
 })
@@ -221,6 +220,7 @@ describe('run', () => {
   })
 
   test('run should show ui url', async () => {
+    mockConfig.get.mockReturnValue(null)
     mockFSExists(['web-src/', 'manifest.yml', PRIVATE_KEY_PATH, PUB_CERT_PATH])
     mockScripts.mockResolvedValue('runDev', 'http://localhost:1111')
     command.argv = []
@@ -231,7 +231,7 @@ describe('run', () => {
 
   test('run should show ui and exc url if AIO_LAUNCH_PREFIX_URL is set', async () => {
     mockFSExists(['web-src/', 'manifest.yml', PRIVATE_KEY_PATH, PUB_CERT_PATH])
-    process.env.AIO_LAUNCH_URL_PREFIX = 'http://prefix?fake='
+    mockConfig.get.mockReturnValue('http://prefix?fake=')
     mockScripts.mockResolvedValue('runDev', 'http://localhost:1111')
     command.argv = []
     await command.run()