update to new changes

Author: moritzraho

src/lib/constants.js

@@ -40,6 +40,5 @@ module.exports = {
   STAGE_LAUNCH_PREFIX: 'https://experience-stage.adobe.com/?devMode=true#/custom-apps/?localDevUrl=',
   PRIVATE_KEY_PATH: `${DEV_KEYS_DIR}/private.key`,
   PUB_CERT_PATH: `${DEV_KEYS_DIR}/cert-pub.crt`,
-  BUNDLE_OPTIONS,
-  IMS_OAUTH_S2S_ENV_KEY: 'IMS_OAUTH_S2S'
+  BUNDLE_OPTIONS
 }

src/lib/run-dev.js

@@ -25,7 +25,7 @@ const coreLogger = require('@adobe/aio-lib-core-logging')
 const { getReasonPhrase } = require('http-status-codes')
 
 const utils = require('./app-helper')
-const { SERVER_HOST, SERVER_DEFAULT_PORT, BUNDLER_DEFAULT_PORT, DEV_API_PREFIX, DEV_API_WEB_PREFIX, BUNDLE_OPTIONS, CHANGED_ASSETS_PRINT_LIMIT, IMS_OAUTH_S2S_ENV_KEY } = require('./constants')
+const { SERVER_HOST, SERVER_DEFAULT_PORT, BUNDLER_DEFAULT_PORT, DEV_API_PREFIX, DEV_API_WEB_PREFIX, BUNDLE_OPTIONS, CHANGED_ASSETS_PRINT_LIMIT } = require('./constants')
 const RAW_CONTENT_TYPES = ['application/octet-stream', 'multipart/form-data']
 
 // for the include-ims-credentials annotation
@@ -89,10 +89,8 @@ async function runDev (runOptions, config, _inprocHookRunner) {
   // ex. console.log('AIO_DEV ', process.env.AIO_DEV ? 'dev' : 'prod')
   process.env.AIO_DEV = 'true'
 
-  // for the include-ims-credentials annotation
-  try {
-    imsAuthObject = JSON.parse(process.env[IMS_OAUTH_S2S_ENV_KEY])
-  } catch (e) {}
+  // include ims credentials inputs __ims_oauth_s2s and __ims_env
+  imsAuthObject = rtLib.utils.loadIMSCredentialsFromEnv()
 
   const serverPortToUse = parseInt(process.env.PORT) || SERVER_DEFAULT_PORT
   const serverPort = await getPort({ port: serverPortToUse })

test/lib/constants.test.js

@@ -23,8 +23,7 @@ const {
   STAGE_LAUNCH_PREFIX,
   PRIVATE_KEY_PATH,
   PUB_CERT_PATH,
-  BUNDLE_OPTIONS,
-  IMS_OAUTH_S2S_ENV_KEY
+  BUNDLE_OPTIONS
 } = require(CONSTANTS_PATH)
 
 test('exports', () => {
@@ -40,7 +39,6 @@ test('exports', () => {
   expect(PRIVATE_KEY_PATH).toBeDefined()
   expect(PUB_CERT_PATH).toBeDefined()
   expect(BUNDLE_OPTIONS).toBeDefined()
-  expect(IMS_OAUTH_S2S_ENV_KEY).toBeDefined()
 })
 
 describe('override via env vars', () => {

test/lib/run-dev.test.js

@@ -1259,9 +1259,9 @@ describe('runDev', () => {
     expect(Object.keys(actionUrls).length).toEqual(0)
   })
 
-  test('parses IMS_OAUTH_S2S environment variable', async () => {
-    const imsAuthData = { access_token: 'test-token', org_id: 'test-org' }
-    process.env.IMS_OAUTH_S2S = JSON.stringify(imsAuthData)
+  test('calls loadIMSCredentialsFromEnv for include-ims-credentials support', async () => {
+    const rtLib = jest.requireActual('@adobe/aio-lib-runtime')
+    const loadIMSCredentialsFromEnvSpy = jest.spyOn(rtLib.utils, 'loadIMSCredentialsFromEnv')
 
     const actionPath = fixturePath('actions/successNoReturnAction.js')
     const config = createConfig({
@@ -1279,31 +1279,10 @@ describe('runDev', () => {
     const { actionUrls, serverCleanup } = await runDev(runOptions, config, hookRunner)
 
     await serverCleanup()
-    // Verify runDev completes successfully when IMS_OAUTH_S2S env var is set with valid JSON
-    expect(Object.keys(actionUrls).length).toBeGreaterThan(0)
-  })
-
-  test('handles invalid IMS_OAUTH_S2S JSON gracefully', async () => {
-    process.env.IMS_OAUTH_S2S = 'not-valid-json'
-
-    const actionPath = fixturePath('actions/successNoReturnAction.js')
-    const config = createConfig({
-      hasFrontend: false,
-      hasBackend: true,
-      packageName: 'mypackage',
-      actions: {
-        myaction: {
-          function: actionPath
-        }
-      }
-    })
-    const runOptions = createRunOptions({ cert: 'my-cert', key: 'my-key' })
-    const hookRunner = () => {}
-    const { actionUrls, serverCleanup } = await runDev(runOptions, config, hookRunner)
 
-    await serverCleanup()
-    // Verify runDev completes successfully even when IMS_OAUTH_S2S contains invalid JSON
+    expect(loadIMSCredentialsFromEnvSpy).toHaveBeenCalled()
     expect(Object.keys(actionUrls).length).toBeGreaterThan(0)
+    loadIMSCredentialsFromEnvSpy.mockRestore()
   })
 
   test('no front end, has back end', async () => {
@@ -1848,8 +1827,8 @@ describe('invokeAction', () => {
       const response = await invokeAction({ actionRequestContext, logger: mockLogger })
 
       expect(getIncludeIMSCredentialsAnnotationInputsSpy).toHaveBeenCalledWith(action, expect.anything())
-      expect(actionParams.__ow_ims_access_token).toBeUndefined()
-      expect(actionParams.__ow_ims_org_id).toBeUndefined()
+      expect(actionParams.__ims_oauth_s2s).toBeUndefined()
+      expect(actionParams.__ims_env).toBeUndefined()
       expect(actionParams.existingParam).toEqual('value')
       expect(response.statusCode).toEqual(200)
     })