fix: remove spec auth support for VS

OfficeDev · Sep 24, 2024 · 0715b5f · 0715b5f
1 parent 6e5f4d8
commit 0715b5f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/packages/fx-core/src/component/generator/apiSpec/helper.ts b/packages/fx-core/src/component/generator/apiSpec/helper.ts
@@ -85,7 +85,11 @@ const enum telemetryEvents {
   failedToGetGenerateWarning = "failed-to-get-generate-warning",
 }
 
-export function getParserOptions(type: ProjectType, isDeclarativeCopilot?: boolean): ParseOptions {
+export function getParserOptions(
+  type: ProjectType,
+  isDeclarativeCopilot?: boolean,
+  platform?: string
+): ParseOptions {
   return type === ProjectType.Copilot
     ? {
         isGptPlugin: isDeclarativeCopilot,
@@ -113,7 +117,7 @@ export function getParserOptions(type: ProjectType, isDeclarativeCopilot?: boole
       }
     : {
         projectType: type,
-        allowBearerTokenAuth: true, // Currently, API key auth support is actually bearer token auth
+        allowBearerTokenAuth: !!platform && platform === Platform.VS ? false : true, // Currently, API key auth support is actually bearer token auth
         allowMultipleParameters: true,
         allowOauth2: featureFlagManager.getBooleanValue(FeatureFlags.SMEOAuth),
       };
@@ -158,7 +162,10 @@ export async function listOperations(
     : ProjectType.SME;
 
   try {
-    const specParser = new SpecParser(apiSpecUrl as string, getParserOptions(projectType));
+    const specParser = new SpecParser(
+      apiSpecUrl as string,
+      getParserOptions(projectType, undefined, inputs.platform)
+    );
     const validationRes = await specParser.validate();
     validationRes.errors = formatValidationErrors(validationRes.errors, inputs);
 

diff --git a/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts b/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts
@@ -1359,6 +1359,36 @@ describe("listOperations", async () => {
       expect(res.error[0].type).to.be.equal(ErrorType.AddedAPINotInOriginalSpec);
     }
   });
+
+  it("should not allow auth for VS project", async () => {
+    const inputs = {
+      platform: Platform.VS,
+    };
+    sandbox.stub(CopilotPluginHelper, "formatValidationErrors").resolves([]);
+    sandbox.stub(CopilotPluginHelper, "logValidationResults").resolves();
+    sandbox.stub(SpecParser.prototype, "validate").resolves({
+      status: ValidationStatus.Valid,
+      warnings: [],
+      errors: [],
+      specHash: "xxx",
+    });
+    sandbox.stub(SpecParser.prototype, "list").resolves({
+      APIs: [
+        {
+          api: "1",
+          server: "https://test",
+          operationId: "id1",
+          isValid: false,
+          reason: [ErrorType.AuthTypeIsNotSupported],
+        },
+      ],
+      allAPICount: 1,
+      validAPICount: 0,
+    });
+
+    const res = await CopilotPluginHelper.listOperations(context, "", inputs, true, false, "");
+    expect(res.isOk()).to.be.true;
+  });
 });
 
 describe("SpecGenerator", async () => {