Use services details if present in config (#450)

These details can also be set as env var and need to be converted to json object from string for such cases. Added unit tests
adobe · Aug 5, 2021 · d1d645c · d1d645c
1 parent 6214800
commit d1d645c
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 10 deletions.
diff --git a/src/lib/app-helper.js b/src/lib/app-helper.js
@@ -379,15 +379,24 @@ function setOrgServicesConfig (supportedServices) {
  * @returns {object} op['view'] metadata OR null
  */
 async function buildExcShellViewExtensionMetadata (libConsoleCLI, aioConfig) {
-  const serviceProperties = await libConsoleCLI.getServicePropertiesFromWorkspace(
-    aioConfig.project.org.id,
-    aioConfig.project.id,
-    aioConfig.project.workspace
-  )
-  const services = serviceProperties.map(s => ({
-    name: s.name,
-    code: s.sdkCode
-  }))
+  let serviceProperties
+  let services
+  if (aioConfig.project.workspace.details) {
+    serviceProperties = aioConfig.project.workspace.details.services
+  }
+  if (serviceProperties) {
+    services = (Array.isArray(serviceProperties)) ? serviceProperties : JSON.parse(serviceProperties)
+  } else {
+    serviceProperties = await libConsoleCLI.getServicePropertiesFromWorkspace(
+      aioConfig.project.org.id,
+      aioConfig.project.id,
+      aioConfig.project.workspace
+    )
+    services = serviceProperties.map(s => ({
+      name: s.name,
+      code: s.sdkCode
+    }))
+  }
   return {
     services: Object.assign([], services),
     profile: {

diff --git a/test/commands/lib/app-helper.test.js b/test/commands/lib/app-helper.test.js
@@ -571,7 +571,7 @@ test('setOrgServicesConfig', () => {
 })
 
 describe('buildExcShellViewExtensionMetadata', () => {
-  test('with service properties', async () => {
+  test('with service properties from console', async () => {
     const mockConsoleCLIInstance = {
       getServicePropertiesFromWorkspace: jest.fn()
     }
@@ -604,6 +604,91 @@ describe('buildExcShellViewExtensionMetadata', () => {
     })
     expect(mockConsoleCLIInstance.getServicePropertiesFromWorkspace).toHaveBeenCalledWith('hola', 'bonjour', { id: 'yay', name: 'yo' })
   })
+
+  test('with service properties in config', async () => {
+    const mockConsoleCLIInstance = {
+      getServicePropertiesFromWorkspace: jest.fn()
+    }
+    const mockAIOConfig = {
+      project: {
+        org: {
+          id: 'hola'
+        },
+        workspace: {
+          id: 'yay',
+          name: 'yo',
+          details: {
+            services: [
+              {
+                code: 'service1code',
+                name: 'service1'
+              },
+              {
+                code: 'service2code',
+                name: 'service2'
+              }
+            ]
+          }
+        },
+        id: 'bonjour'
+      }
+    }
+    const res = await appHelper.buildExcShellViewExtensionMetadata(mockConsoleCLIInstance, mockAIOConfig)
+    expect(res).toEqual({
+      services: [
+        { name: 'service1', code: 'service1code' },
+        { name: 'service2', code: 'service2code' }
+      ],
+      profile: {
+        client_id: 'firefly-app',
+        scope: 'ab.manage,additional_info.job_function,additional_info.projectedProductContext,additional_info.roles,additional_info,AdobeID,adobeio_api,adobeio.appregistry.read,audiencemanager_api,creative_cloud,mps,openid,read_organizations,read_pc.acp,read_pc.dma_tartan,read_pc,session'
+      }
+    })
+    expect(mockConsoleCLIInstance.getServicePropertiesFromWorkspace).toHaveBeenCalledTimes(0)
+  })
+
+  test('with service properties set as string', async () => {
+    const services = JSON.stringify([
+      {
+        code: 'service1code',
+        name: 'service1'
+      },
+      {
+        code: 'service2code',
+        name: 'service2'
+      }
+    ])
+    const mockConsoleCLIInstance = {
+      getServicePropertiesFromWorkspace: jest.fn()
+    }
+    const mockAIOConfig = {
+      project: {
+        org: {
+          id: 'hola'
+        },
+        workspace: {
+          id: 'yay',
+          name: 'yo',
+          details: {
+            services: services
+          }
+        },
+        id: 'bonjour'
+      }
+    }
+    const res = await appHelper.buildExcShellViewExtensionMetadata(mockConsoleCLIInstance, mockAIOConfig)
+    expect(res).toEqual({
+      services: [
+        { name: 'service1', code: 'service1code' },
+        { name: 'service2', code: 'service2code' }
+      ],
+      profile: {
+        client_id: 'firefly-app',
+        scope: 'ab.manage,additional_info.job_function,additional_info.projectedProductContext,additional_info.roles,additional_info,AdobeID,adobeio_api,adobeio.appregistry.read,audiencemanager_api,creative_cloud,mps,openid,read_organizations,read_pc.acp,read_pc.dma_tartan,read_pc,session'
+      }
+    })
+    expect(mockConsoleCLIInstance.getServicePropertiesFromWorkspace).toHaveBeenCalledTimes(0)
+  })
 })
 
 describe('buildExtensionPointPayloadWoMetadata', () => {