build: fix sample apps

customerio · Sep 30, 2024 · 6610457 · 6610457
1 parent 55d6145
commit 6610457
Show file tree

Hide file tree

Showing 4 changed files with 489 additions and 2,030 deletions.
diff --git a/.github/workflows/build-sample-apps.yml b/.github/workflows/build-sample-apps.yml
@@ -127,16 +127,16 @@ jobs:
             exit 1
           fi
           
-          # Update the apiKey in the environment file
+          # Update keys in the environment file
           sd "siteId: '.*'" "siteId: '${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_SITE_ID', matrix.sample-app)] }}'" "$ENV_FILE"
-          sd "apiKey: '.*'" "apiKey: '${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_API_KEY', matrix.sample-app)] }}'" "$ENV_FILE"
+          sd "cdpApiKey: '.*'" "cdpApiKey: '${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_CDP_API_KEY', matrix.sample-app)] }}'" "$ENV_FILE"
 
       - name: Setup workspace credentials in iOS environment files
         working-directory: Apps/${{ matrix.sample-app }}/ios
         run: |
           cp "Env.swift.example" "Env.swift"
           sd 'siteId: String = ".*"' "siteId: String = \"${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_SITE_ID', matrix.sample-app)] }}\"" "Env.swift"
-          sd 'apiKey: String = ".*"' "apiKey: String = \"${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_API_KEY', matrix.sample-app)] }}\"" "Env.swift"
+          sd 'cdpApiKey: String = ".*"' "cdpApiKey: String = \"${{ secrets[format('CUSTOMERIO_{0}_WORKSPACE_CDP_API_KEY', matrix.sample-app)] }}\"" "Env.swift"
 
       # Make sure to fetch dependencies only after updating version numbers and workspace credentials
 

diff --git a/Apps/APN/src/services/CustomerIOService.js b/Apps/APN/src/services/CustomerIOService.js
@@ -1,9 +1,9 @@
 import { CustomerIO, CioLogLevel } from 'customerio-reactnative';
-import Env from '../../env';
+
 export const initializeCustomerIoSDK = (sdkConfig) => {
   const config = {
-    cdpApiKey: Env.cdpApiKey, // Mandatory
-    migrationSiteId: Env.siteId, // For migration
+    cdpApiKey: sdkConfig.cdpApiKey, // Mandatory
+    migrationSiteId: sdkConfig.siteId, // For migration
     trackApplicationLifecycleEvents: sdkConfig.trackAppLifecycleEvents,
     autoTrackDeviceAttributes: sdkConfig.autoTrackDeviceAttributes,
     inApp: {

diff --git a/Apps/FCM/src/services/CustomerIOService.ts b/Apps/FCM/src/services/CustomerIOService.ts
@@ -5,12 +5,11 @@ import {
 } from 'customerio-reactnative';
 import User from '../data/models/user';
 import CustomerIoSDKConfig from '../data/sdk/CustomerIoSDKConfig';
-import Env from '../../env';
 
 export const initializeCustomerIoSDK = (sdkConfig: CustomerIoSDKConfig) => {
   const config = {
-    cdpApiKey: Env.cdpApiKey, // Mandatory
-    migrationSiteId: Env.siteId, // For migration
+    cdpApiKey: sdkConfig.cdpApiKey, // Mandatory
+    migrationSiteId: sdkConfig.siteId, // For migration
     trackApplicationLifecycleEvents: sdkConfig.trackAppLifecycleEvents,
     autoTrackDeviceAttributes: sdkConfig.trackDeviceAttributes,
     inApp: {