use correct method to get app actions (#10065)

Author: sam-is-content

apps/klaviyo/src/locations/ConfigScreen.tsx

@@ -21,7 +21,6 @@ import {
   getEntryKlaviyoFieldMappings,
   setEntryKlaviyoFieldMappings,
 } from '../utils/field-mappings';
-import { getOrgIdForSdk } from '../utils/sdk-helpers';
 
 // Helper to ensure klaviyoFieldMappings entry exists
 const ensureKlaviyoFieldMappingsEntry = async (sdk: ConfigAppSDK) => {
@@ -139,7 +138,6 @@ const ConfigScreen = () => {
   const [isDisconnecting, setIsDisconnecting] = useState(false);
   const popupWindowRef = useRef<Window | null>(null);
   const checkWindowIntervalRef = useRef<number | null>(null);
-  const orgId = getOrgIdForSdk(sdk);
 
   // Check Klaviyo connection status with polling to handle race conditions
   const checkKlaviyoStatus = async (
@@ -151,9 +149,9 @@ const ConfigScreen = () => {
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
         console.log(`Checking Klaviyo connection status (attempt ${attempt}/${maxRetries})...`);
-        const appActions = await sdk.cma.appAction.getMany({
-          organizationId: orgId,
-          appDefinitionId: sdk.ids.app,
+        const appActions = await sdk.cma.appAction.getManyForEnvironment({
+          environmentId: sdk.ids.environment,
+          spaceId: sdk.ids.space,
         });
 
         const checkStatusAppAction = appActions.items.find(
@@ -230,9 +228,9 @@ const ConfigScreen = () => {
       console.log('oauth:complete');
       const appDefinitionId = sdk.ids.app;
       // call app action to complete oauth
-      const appActions = await sdk.cma.appAction.getMany({
-        organizationId: orgId,
-        appDefinitionId,
+      const appActions = await sdk.cma.appAction.getManyForEnvironment({
+        environmentId: sdk.ids.environment,
+        spaceId: sdk.ids.space,
       });
       console.log('appActions', appActions);
       const completeOauthAppAction = appActions.items.find(
@@ -283,9 +281,9 @@ const ConfigScreen = () => {
     window.addEventListener('message', messageHandler);
 
     try {
-      const appActions = await sdk.cma.appAction.getMany({
-        organizationId: orgId,
-        appDefinitionId: sdk.ids.app,
+      const appActions = await sdk.cma.appAction.getManyForEnvironment({
+        environmentId: sdk.ids.environment,
+        spaceId: sdk.ids.space,
       });
 
       const initiateOauthAppAction = appActions.items.find(
@@ -324,9 +322,9 @@ const ConfigScreen = () => {
   const handleDisconnect = async () => {
     setIsDisconnecting(true);
     try {
-      const appActions = await sdk.cma.appAction.getMany({
-        organizationId: orgId,
-        appDefinitionId: sdk.ids.app,
+      const appActions = await sdk.cma.appAction.getManyForEnvironment({
+        environmentId: sdk.ids.environment,
+        spaceId: sdk.ids.space,
       });
       const disconnectAppAction = appActions.items.find((action) => action.name === 'Disconnect');
       await sdk.cma.appActionCall.create(

apps/klaviyo/src/utils/sdk-helpers.ts

@@ -1,4 +1,3 @@
-import { ConfigAppSDK } from '@contentful/app-sdk';
 import { logger } from './logger';
 
 // The key used to store the app definition ID in localStorage
@@ -35,11 +34,3 @@ export const getGlobalSDK = async (retries = MAX_RETRIES): Promise<any | null> =
     }, RETRY_DELAY);
   });
 };
-
-const APP_ORGANIZATION_ID = '5EJGHo8tYJcjnEhYWDxivp';
-const APP_DEFINITION_ID = '2x4lsvuxPAGS2UUHwWVYee';
-
-export const getOrgIdForSdk = (sdk: ConfigAppSDK) => {
-  const isMarketplaceVersion = sdk.ids.app === APP_DEFINITION_ID;
-  return isMarketplaceVersion ? APP_ORGANIZATION_ID : sdk.ids.organization;
-};