fix(@W-17233341): changes for minting JWT and SFAP endpoints

Author: neilmathewm

README.md

@@ -2,7 +2,7 @@
 
 # plugin-data-seeding
 
-[![NPM](https://img.shields.io/npm/v/@salesforce/plugin-data-seeding.svg?label=@salesforce/plugin-data-seeding)](https://www.npmjs.com/package/@salesforce/plugin-data-seeding) [![Downloads/week](https://img.shields.io/npm/dw/@salesforce/plugin-data-seeding.svg)](https://npmjs.org/package/@salesforce/plugin-data-seeding) [![License](https://img.shields.io/badge/License-BSD%203--Clause-brightgreen.svg)](https://raw.githubusercontent.com/salesforcecli/plugin-data-seeding/main/LICENSE.txt)
+[![NPM](https://img.shields.io/npm/v/@salesforce/plugin-data-seeding.svg?label=@salesforce/plugin-data-seeding)](https://www.npmjs.com/package/@salesforce/plugin-data-seeding) [![Downloads/week](https://img.shields.io/npm/dw/@salesforce/plugin-data-seeding.svg)](https://npmjs.org/package/@salesforce/plugin-data-seeding) [![License](https://img.shields.io/badge/License-BSD%203--Clause-brightgreen.svg)](https://raw.githubusercontent.com/salesforcecli/plugin-data-seeding/refs/heads/main/LICENSE.txt)
 
 ## Using the template
 
@@ -166,7 +166,7 @@ EXAMPLES
       ./config/seed-config.json --wait 5
 ```
 
-_See code: [src/commands/data-seeding/generate/index.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/v1.0.10/src/commands/data-seeding/generate/index.ts)_
+_See code: [src/commands/data-seeding/generate/index.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/main/src/commands/data-seeding/generate/index.ts)_
 
 ## `sf data-seeding generate report`
 
@@ -201,7 +201,7 @@ EXAMPLES
     $ sf data-seeding generate report --use-most-recent
 ```
 
-_See code: [src/commands/data-seeding/generate/report.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/v1.0.10/src/commands/data-seeding/generate/report.ts)_
+_See code: [src/commands/data-seeding/generate/report.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/main/src/commands/data-seeding/generate/report.ts)_
 
 ## `sf data-seeding migrate`
 
@@ -254,7 +254,7 @@ EXAMPLES
       ./config/data-seed.json --wait 5
 ```
 
-_See code: [src/commands/data-seeding/migrate/index.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/v1.0.10/src/commands/data-seeding/migrate/index.ts)_
+_See code: [src/commands/data-seeding/migrate/index.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/main/src/commands/data-seeding/migrate/index.ts)_
 
 ## `sf data-seeding migrate report`
 
@@ -289,6 +289,6 @@ EXAMPLES
     $ sf data-seeding migrate report --use-most-recent
 ```
 
-_See code: [src/commands/data-seeding/migrate/report.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/v1.0.10/src/commands/data-seeding/migrate/report.ts)_
+_See code: [src/commands/data-seeding/migrate/report.ts](https://github.com/salesforcecli/plugin-data-seeding/blob/main/src/commands/data-seeding/migrate/report.ts)_
 
 <!-- commandsstop -->

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

@@ -8,7 +8,7 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, PollingClient, SfError, StatusResult } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { initiateDataSeed, pollSeedStatus, PollSeedResponse, initiateJWTMint } from '../../../utils/api.js'
+import { initiateDataSeed, pollSeedStatus, PollSeedResponse, initiateJWTMint } from '../../../utils/api.js';
 import { getSeedGenerateMso, getSeedGenerateStage as getStage } from '../../../utils/mso.js';
 import { DataSeedingGenerateResult } from '../../../utils/types.js';
 import { GenerateRequestCache } from '../../../utils/cache.js';
@@ -56,19 +56,18 @@ export default class DataSeedingGenerate extends SfCommand<DataSeedingGenerateRe
   public async run(): Promise<DataSeedingGenerateResult> {
     const { flags } = await this.parse(DataSeedingGenerate);
     const { async, 'config-file': configFile, 'source-org': srcOrgObj, 'target-org': tgtOrgObj, wait } = flags;
-    
+
     const sourceOrg = srcOrgObj.getOrgId();
     const srcAccessToken = srcOrgObj.getConnection().accessToken as string;
-    const srcOrgInstUrl = srcOrgObj.getConnection().instanceUrl as string;
+    const srcOrgInstUrl = srcOrgObj.getConnection().instanceUrl;
 
     const targetOrg = tgtOrgObj.getOrgId();
     const tgtAccessToken = tgtOrgObj.getConnection().accessToken as string;
-    const tgtOrgInstUrl = tgtOrgObj.getConnection().instanceUrl as string;
-    
-    //Fetch Valid JWT with Data Seed Org Perm
-    const { jwt: jwtValue} = await initiateJWTMint(srcOrgInstUrl,srcAccessToken,tgtOrgInstUrl,tgtAccessToken );
-    this.log("\nValid JWT Token Fetched.");
-    const { request_id: jobId } = await initiateDataSeed(configFile, 'data-generation',jwtValue);
+    const tgtOrgInstUrl = tgtOrgObj.getConnection().instanceUrl;
+
+    // Fetch Valid JWT with Data Seed Org Perm
+    const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
+    const { request_id: jobId } = await initiateDataSeed(configFile, 'data-generation', jwtValue);
     const reportMessage = messages.getMessage('report.suggestion', [jobId]);
 
     if (!jobId) throw new Error('Failed to receive job id');

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

@@ -56,20 +56,19 @@ export default class DataSeedingMigrate extends SfCommand<DataSeedingMigrateResu
   public async run(): Promise<DataSeedingMigrateResult> {
     const { flags } = await this.parse(DataSeedingMigrate);
     const { async, 'config-file': configFile, 'source-org': sourceOrgObj, 'target-org': targetOrgObj, wait } = flags;
-    
+
     const sourceOrg = sourceOrgObj.getOrgId();
     const srcAccessToken = sourceOrgObj.getConnection().accessToken as string;
-    const srcOrgInstUrl = sourceOrgObj.getConnection().instanceUrl as string;
+    const srcOrgInstUrl = sourceOrgObj.getConnection().instanceUrl;
 
     const targetOrg = targetOrgObj.getOrgId();
     const tgtAccessToken = targetOrgObj.getConnection().accessToken as string;
-    const tgtOrgInstUrl = targetOrgObj.getConnection().instanceUrl as string;
-    
-    //Fetch Valid JWT with Data Seed Org Perm
-    const { jwt: jwtValue} = await initiateJWTMint(srcOrgInstUrl,srcAccessToken,tgtOrgInstUrl,tgtAccessToken);
-    this.log("\nValid JWT Token Fetched.");
+    const tgtOrgInstUrl = targetOrgObj.getConnection().instanceUrl;
+
+    // Fetch Valid JWT with Data Seed Org Perm
+    const { jwt: jwtValue } = await initiateJWTMint(srcOrgInstUrl, srcAccessToken, tgtOrgInstUrl, tgtAccessToken);
 
-    const { request_id: jobId } = await initiateDataSeed(configFile, 'data-copy',jwtValue);
+    const { request_id: jobId } = await initiateDataSeed(configFile, 'data-copy', jwtValue);
 
     if (!jobId) throw new Error('Failed to receive job id');
 

src/utils/api.ts

@@ -30,7 +30,7 @@ export type PollSeedResponse = {
 export type DataSeedingOperation = 'data-generation' | 'data-copy';
 
 // TODO Change to SFAP Endpoint
-const baseUrl = process.env.SF_DATA_SEEDING_URL ?? 'https://data-seed-gid.sfdc-yfeipo.svc.sfdcfc.net'; 
+const baseUrl = process.env.SF_DATA_SEEDING_URL ?? 'https://data-seed-gid.sfdc-yfeipo.svc.sfdcfc.net';
 const csrfUrl = `${baseUrl}/get-csrf-token`;
 const seedUrl = `${baseUrl}/data-seed`;
 const pollUrl = `${baseUrl}/status`;
@@ -48,9 +48,13 @@ export const getCsrfToken = (cookieJar: CookieJar): string => {
   return csrfToken;
 };
 
-export const initiateDataSeed = async (config: string, operation: DataSeedingOperation, jwt: string): Promise<SeedResponse> => {
-  //const cookieJar = await getCookieJar();
-  //const csrf = getCsrfToken(cookieJar);
+export const initiateDataSeed = async (
+  config: string,
+  operation: DataSeedingOperation,
+  jwt: string
+): Promise<SeedResponse> => {
+  // const cookieJar = await getCookieJar();
+  // const csrf = getCsrfToken(cookieJar);
   const form = new FormData();
   form.append('config_file', fs.createReadStream(config));
   // TODO : Remove credential file once SFAP is active and dataseed endpoint accepts orgurl and token
@@ -60,11 +64,11 @@ export const initiateDataSeed = async (config: string, operation: DataSeedingOpe
   //       Update the return type as well
   const response = await got.post(seedUrl, {
     throwHttpErrors: false,
-    //cookieJar,
+    // cookieJar,
     headers: {
       ...form.getHeaders(),
       // 'X-CSRFToken': csrf,
-      'Authorization': 'Bearer '+jwt,
+      Authorization: 'Bearer ' + jwt,
     },
     body: form,
   });
@@ -76,31 +80,37 @@ export const initiateDataSeed = async (config: string, operation: DataSeedingOpe
   return JSON.parse(response.body) as SeedResponse;
 };
 
-export const initiateJWTMint = async (src_org_url: string, src_access_token: string, tgt_org_url: string, tgt_access_token: string ): Promise<ServletResponse> => {
-
-  const src_servlet_url = src_org_url+'/dataseed/auth'
-  const response_src = await got.post(src_servlet_url, {
+export const initiateJWTMint = async (
+  srcOrgUrl: string,
+  srcAccessToken: string,
+  tgtOrgUrl: string,
+  tgtAccessToken: string
+): Promise<ServletResponse> => {
+  const srcServletUrl = srcOrgUrl + '/dataseed/auth';
+  const responseSrc = await got.post(srcServletUrl, {
     throwHttpErrors: false,
     headers: {
-      'Authorization': 'Bearer '+src_access_token,
+      Authorization: 'Bearer ' + srcAccessToken,
     },
   });
 
-  if (response_src.statusCode !== 200) {
-    const tgt_servlet_url = tgt_org_url+'/dataseed/auth'
-    const response_tgt = await got.post(tgt_servlet_url, {
+  if (responseSrc.statusCode !== 200) {
+    const tgtServletUrl = tgtOrgUrl + '/dataseed/auth';
+    const responseTgt = await got.post(tgtServletUrl, {
       throwHttpErrors: false,
       headers: {
-        'Authorization': 'Bearer '+tgt_access_token,
+        Authorization: 'Bearer ' + tgtAccessToken,
       },
     });
-    if (response_tgt.statusCode !== 200) {
-      throw new SfError(`Org permission for data seed not found in source & target org.\nSource Response: Error Code : ${response_src.statusCode} - ${response_src.body}.  \nTarget Response: Error Code : ${response_tgt.statusCode} - ${response_tgt.body}`);
+    if (responseTgt.statusCode !== 200) {
+      throw new SfError(
+        `Org permission for data seed not found in source & target org.\nSource Response: Error Code : ${responseSrc.statusCode} - ${responseSrc.body}.  \nTarget Response: Error Code : ${responseTgt.statusCode} - ${responseTgt.body}`
+      );
     }
-    return JSON.parse(response_tgt.body) as ServletResponse;
+    return JSON.parse(responseTgt.body) as ServletResponse;
   }
 
-  return JSON.parse(response_src.body) as ServletResponse;
+  return JSON.parse(responseSrc.body) as ServletResponse;
 };
 
 export const pollSeedStatus = async (jobId: string): Promise<PollSeedResponse> => {