@W-17233341 - Updating SFAP prod endpoint, adding sourceOrgID body parameter for token update

Author: neilmathewm

src/commands/data-seeding/generate/index.ts

@@ -74,7 +74,8 @@ export default class DataSeedingGenerate extends SfCommand<DataSeedingGenerateRe
       srcOrgInstUrl,
       srcAccessToken,
       tgtOrgInstUrl,
-      tgtAccessToken
+      tgtAccessToken,
+      sourceOrg
     );
     const reportMessage = messages.getMessage('report.suggestion', [jobId]);
 
@@ -100,7 +101,8 @@ export default class DataSeedingGenerate extends SfCommand<DataSeedingGenerateRe
 
       const options: PollingClient.Options = {
         poll: async (): Promise<StatusResult> => {
-          const response = await pollSeedStatus(jobId);
+          const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
+          const response = await pollSeedStatus(jobId,jwtValue);
 
           mso.goto(getStage(response.step), {
             startTime: response.execution_start_time,
@@ -151,7 +153,8 @@ export default class DataSeedingGenerate extends SfCommand<DataSeedingGenerateRe
         throw err;
       }
     } else {
-      const response = await pollSeedStatus(jobId);
+      const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
+      const response = await pollSeedStatus(jobId,jwtValue);
 
       const mso = getSeedGenerateMso({
         jsonEnabled: this.jsonEnabled(),

src/commands/data-seeding/generate/report.ts

@@ -43,7 +43,7 @@ export default class DataSeedingGenerateReport extends SfCommand<DataSeedingRepo
 
     if (!jobId) throw new SfError('No job ID provided or found in cache');
 
-    const response = await pollSeedStatus(jobId);
+    const response = await pollSeedStatus(jobId,"");
 
     const data = {
       jobId,

src/commands/data-seeding/migrate/index.ts

@@ -74,7 +74,8 @@ export default class DataSeedingMigrate extends SfCommand<DataSeedingMigrateResu
       srcOrgInstUrl,
       srcAccessToken,
       tgtOrgInstUrl,
-      tgtAccessToken
+      tgtAccessToken,
+      sourceOrg
     );
 
     if (!jobId) throw new Error('Failed to receive job id');
@@ -101,7 +102,8 @@ export default class DataSeedingMigrate extends SfCommand<DataSeedingMigrateResu
 
       const options: PollingClient.Options = {
         poll: async (): Promise<StatusResult> => {
-          const response = await pollSeedStatus(jobId);
+          const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
+          const response = await pollSeedStatus(jobId,jwtValue);
 
           mso.goto(getStage(response.step), {
             startTime: response.execution_start_time,
@@ -154,7 +156,8 @@ export default class DataSeedingMigrate extends SfCommand<DataSeedingMigrateResu
         throw err;
       }
     } else {
-      const response = await pollSeedStatus(jobId);
+      const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
+      const response = await pollSeedStatus(jobId,jwtValue);
 
       const mso = getSeedMigrateMso({
         jsonEnabled: this.jsonEnabled(),

src/commands/data-seeding/migrate/report.ts

@@ -40,7 +40,7 @@ export default class DataSeedingMigrateReport extends SfCommand<DataSeedingRepor
 
     if (!jobId) throw new SfError('No job ID provided or found in cache');
 
-    const response = await pollSeedStatus(jobId);
+    const response = await pollSeedStatus(jobId,"");
 
     const data = {
       jobId,

src/utils/api.ts

@@ -35,15 +35,16 @@ export type DataSeedingOperation = 'data-generation' | 'data-copy';
 const baseUrl = 'https://api.salesforce.com/platform/data-seed/v1';
 const seedUrl = `${baseUrl}/data-seed`;
 const pollUrl = `${baseUrl}/status`;
-
+const sfRegion = 'us-east-1'
 export const initiateDataSeed = async (
   config: string,
   operation: DataSeedingOperation,
   jwt: string,
   srcOrgUrl: string,
   srcAccessToken: string,
   tgtOrgUrl: string,
-  tgtAccessToken: string
+  tgtAccessToken: string,
+  srcOrgId: string
 ): Promise<SeedResponse> => {
   const form = new FormData();
   form.append('config_file', fs.createReadStream(config));
@@ -52,13 +53,15 @@ export const initiateDataSeed = async (
   form.append('source_instance_url', srcOrgUrl);
   form.append('target_access_token', tgtAccessToken);
   form.append('target_instance_url', tgtOrgUrl);
+  form.append('source_org_id',srcOrgId);
   // TODO: Update to use .json() instead of JSON.parse once the Error response is changed to be JSON
   //       Update the return type as well
   const response = await got.post(seedUrl, {
     throwHttpErrors: false,
     headers: {
       ...form.getHeaders(),
       Authorization: `Bearer ${jwt}`,
+      'x-salesforce-region':sfRegion,
     },
     body: form,
   });
@@ -110,12 +113,16 @@ const callAuthServlet = async (url: string, accessToken: string): Promise<AuthSe
   };
 };
 
-export const pollSeedStatus = async (jobId: string): Promise<PollSeedResponse> => {
+export const pollSeedStatus = async (jobId: string, jwt: string): Promise<PollSeedResponse> => {
   const logger = await Logger.child('PollSeedStatus');
 
   // TODO: Update to use .json() instead of JSON.parse once the Error response is changed to be JSON
   //       Update the return type as well
-  const response = await got.get(`${pollUrl}/${jobId}`, { throwHttpErrors: false });
+  const headers = {
+    Authorization: `Bearer ${jwt}`,
+    'x-salesforce-region': sfRegion,
+  };
+  const response = await got.get(`${pollUrl}/${jobId}`, { throwHttpErrors: false, headers });
 
   if (response.statusCode !== 200) {
     // TODO: Print error body once the Error response is changed to be JSON

src/utils/mso.ts

@@ -28,6 +28,7 @@ type MsoGet = string | undefined;
 //  - They have been converted to lowercase for later comparison
 // The values in this Map are used as the stage names in mso
 const seedGenerateStagesMap = new Map<string, string>([
+  ['init','Initializing'],
   ['querying source org', 'Querying Source Org'],
   ['data generation', 'Data Generation'],
   ['populating target org', 'Populating Target Org'],