fix(designer): Fixing the swagger schema returned for http swagger operation (Azure#3375)

Co-authored-by: Priti Sambandam <psamband@microsoft.com>

Author: preetriti1

apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx

@@ -350,7 +350,12 @@ const getDesignerServices = (
       },
       getSwaggerOperationSchema: (args: any) => {
         const { parameters, isInput } = args;
-        return appService.getOperationSchema(parameters.swaggerUrl, parameters.operationId, isInput);
+        return appService.getOperationSchema(
+          parameters.swaggerUrl,
+          parameters.operationId,
+          isInput,
+          true /* supportsAuthenticationParameter */
+        );
       },
     },
     valuesClient: {

apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx

@@ -246,7 +246,21 @@ const getDesignerServices = (
       },
       getSwaggerOperationSchema: (args: any) => {
         const { parameters, isInput } = args;
-        return appServiceService.getOperationSchema(parameters.swaggerUrl, parameters.operationId, isInput);
+        return appServiceService.getOperationSchema(
+          parameters.swaggerUrl,
+          parameters.operationId,
+          isInput,
+          true /* supportsAuthenticationParameter */
+        );
+      },
+      getAppserviceSwaggerOperationSchema: (args: any) => {
+        const { parameters, isInput } = args;
+        return appServiceService.getOperationSchema(
+          parameters.swaggerUrl,
+          parameters.operationId,
+          isInput,
+          false /* supportsAuthenticationParameter */
+        );
       },
       getMapSchema: (_args: any) => {
         throw new Error('getMapSchema not implemented for consumption standalone');

apps/vs-code-designer-react/src/app/servicesHelper.ts

@@ -164,7 +164,12 @@ export const getDesignerServices = (
       },
       getSwaggerOperationSchema: (args: any) => {
         const { parameters, isInput } = args;
-        return appService.getOperationSchema(parameters.swaggerUrl, parameters.operationId, isInput);
+        return appService.getOperationSchema(
+          parameters.swaggerUrl,
+          parameters.operationId,
+          isInput,
+          true /* supportsAuthenticationParameter */
+        );
       },
     },
     valuesClient: {

libs/services/designer-client-services/src/lib/appService.ts

@@ -2,7 +2,7 @@ import { AssertionErrorCode, AssertionException } from '@microsoft/utils-logic-a
 
 export interface IAppServiceService {
   fetchAppServices(): Promise<any>;
-  getOperationSchema(swaggerUrl: string, operationId: string, isInput: boolean): Promise<any>;
+  getOperationSchema(swaggerUrl: string, operationId: string, isInput: boolean, supportsAuthenticationParameter: boolean): Promise<any>;
   getOperations(swaggerUrl: string): Promise<any>;
 }
 

libs/services/designer-client-services/src/lib/base/appService.ts

@@ -38,7 +38,12 @@ export class BaseAppServiceService implements IAppServiceService {
     return response.filter(connectorIsAppService);
   }
 
-  async getOperationSchema(swaggerUrl: string, operationId: string, isInput: boolean): Promise<any> {
+  async getOperationSchema(
+    swaggerUrl: string,
+    operationId: string,
+    isInput: boolean,
+    supportsAuthenticationParameter: boolean
+  ): Promise<any> {
     if (!swaggerUrl) return Promise.resolve();
     const swagger = await this.fetchAppServiceApiSwagger(swaggerUrl);
     if (!operationId) return Promise.resolve();
@@ -68,6 +73,19 @@ export class BaseAppServiceService implements IAppServiceService {
       for (const parameter of rawOperation.parameters ?? []) {
         this._addParameterInSchema(schema, parameter);
       }
+
+      if (supportsAuthenticationParameter) {
+        schema.properties['authentication'] = {
+          type: 'object',
+          title: 'Authentication',
+          description: 'Enter JSON object of authentication parameter',
+          'x-ms-visibility': 'advanced',
+          'x-ms-editor': 'authentication',
+          'x-ms-editor-options': {
+            supportedAuthTypes: ['None', 'Basic', 'ClientCertificate', 'ActiveDirectoryOAuth', 'Raw', 'ManagedServiceIdentity'],
+          },
+        };
+      }
     } else {
       const { responses } = rawOperation;
       let response: any = {};

libs/services/designer-client-services/src/lib/base/manifests/http.ts

@@ -212,7 +212,6 @@ export const httpWithSwaggerManifest = {
         inputs: {
           type: 'object',
           properties: {
-            authentication: authenticationParameter,
             // Dynamic Params
             operationId: {
               required: true,
@@ -244,7 +243,6 @@ export const httpWithSwaggerManifest = {
               },
             },
             operationDetails: {
-              title: 'Swagger Parameters',
               description: 'Enter all swagger parameters',
               'x-ms-dynamic-properties': {
                 dynamicState: {

libs/services/designer-client-services/src/lib/consumption/manifests/appServices.ts

@@ -74,12 +74,11 @@ export const appServiceActionManifest = {
               },
             },
             operationDetails: {
-              title: 'Operation Parameters',
               description: 'Operation parameters for the above operation',
               'x-ms-dynamic-properties': {
                 dynamicState: {
                   extension: {
-                    operationId: 'getSwaggerOperationSchema',
+                    operationId: 'getAppserviceSwaggerOperationSchema',
                   },
                   isInput: true,
                 },
@@ -124,7 +123,7 @@ export const appServiceActionManifest = {
       'x-ms-dynamic-properties': {
         dynamicState: {
           extension: {
-            operationId: 'getSwaggerOperationSchema',
+            operationId: 'getAppserviceSwaggerOperationSchema',
           },
         },
         parameters: {