Merge pull request #205 from snyk/fix/fedramp_urls

fix: add orgId to code-client calls
snyk · Oct 5, 2023 · 0fc951e · 0fc951e
2 parents f84f737 + 5369805
commit 0fc951e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/bundles.ts b/src/bundles.ts
@@ -47,7 +47,16 @@ async function* prepareRemoteBundle(
   emitter.createBundleProgress(cumulativeProgress, options.files.length);
   for (const chunkedFiles of composeFilePayloads(options.files)) {
     const apiParams = {
-      ...pick(options, ['baseURL', 'sessionToken', 'source', 'extraHeaders', 'removedFiles', 'requestId', 'org']),
+      ...pick(options, [
+        'baseURL',
+        'sessionToken',
+        'source',
+        'extraHeaders',
+        'removedFiles',
+        'requestId',
+        'org',
+        'orgId',
+      ]),
       files: chunkedFiles.reduce((d, f) => {
         // deepcode ignore PrototypePollution: FP this is an internal code
         d[f.bundlePath] = f.hash;
@@ -98,6 +107,7 @@ export async function uploadRemoteBundle(options: UpdateRemoteBundleOptions): Pr
     'bundleHash',
     'requestId',
     'org',
+    'orgId',
     'extraHeaders',
   ]);
 
@@ -137,7 +147,15 @@ async function fullfillRemoteBundle(options: FullfillRemoteBundleOptions): Promi
   // Check remove bundle to make sure no missing files left
   let attempts = 0;
   let { remoteBundle } = options;
-  const connectionOptions = pick(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']);
+  const connectionOptions = pick(options, [
+    'baseURL',
+    'sessionToken',
+    'source',
+    'requestId',
+    'org',
+    'orgId',
+    'extraHeaders',
+  ]);
 
   while (remoteBundle.missingFiles.length && attempts < (options.maxAttempts || MAX_UPLOAD_ATTEMPTS)) {
     const missingFiles = await resolveBundleFiles(options.baseDir, remoteBundle.missingFiles);
@@ -171,6 +189,7 @@ export async function remoteBundleFactory(options: RemoteBundleFactoryOptions):
     'baseDir',
     'requestId',
     'org',
+    'orgId',
     'extraHeaders',
   ]);
   const bundleFactory = prepareRemoteBundle(omit(options, ['baseDir']));
@@ -292,7 +311,7 @@ export async function createBundleWithCustomFiles(
   }
 
   const bundleOptions = {
-    ...pick(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'extraHeaders']),
+    ...pick(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'orgId', 'extraHeaders']),
     baseDir,
     files: bundleFiles,
   };

diff --git a/src/cli.ts b/src/cli.ts
@@ -19,6 +19,7 @@ function parseConnectionOptions(options: {
   token: string;
   source: string;
   org?: string;
+  orgId?: string;
   headers?: string[];
 }): ConnectionOptions {
   let headers: { [key: string]: string } = {};
@@ -34,6 +35,7 @@ function parseConnectionOptions(options: {
     sessionToken: options.token,
     source: options.source,
     ...(options.org ? { org: options.org } : {}),
+    ...(options.orgId ? { orgId: options.orgId } : {}),
     extraHeaders: headers,
     // requestId?: string; - not supported
   };
@@ -79,7 +81,7 @@ async function createBundleAction(options: {
 
 async function readBundleAction(
   bundleHash: string,
-  options: { url: string; token: string; source: string; org?: string },
+  options: { url: string; token: string; source: string; org?: string; orgId?: string },
 ) {
   const opts = {
     ...parseConnectionOptions(options),
@@ -95,7 +97,7 @@ async function readBundleAction(
 
 async function analysisBundleAction(
   bundleHash: string,
-  options: { url: string; token: string; source: string; org?: string },
+  options: { url: string; token: string; source: string; org?: string; orgId?: string },
 ) {
   const opts = {
     ...parseConnectionOptions(options),

diff --git a/src/report.ts b/src/report.ts
@@ -54,7 +54,7 @@ async function initAndPollReportGeneric(
   while (true) {
     // eslint-disable-next-line no-await-in-loop
     apiResponse = await getReportFunc({
-      ...pick(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org']),
+      ...pick(options, ['baseURL', 'sessionToken', 'source', 'requestId', 'org', 'orgId']),
       pollId,
     });