Modifying CoPilot Plugin to Graph Connectors Plugin

packages/cli/src/commands/models/create.ts

@@ -30,8 +30,8 @@ function adjustOptions(options: CLICommandOption[]) {
     //skip copilot plugin options if API copilot plugin is not enabled
     const copilotPluginQuestionNames = [
       QuestionNames.ApiSpecLocation.toString(),
-      QuestionNames.OpenAIPluginManifest.toString(),
-      QuestionNames.ApiOperation.toString(),
+      //QuestionNames.OpenAIPluginManifest.toString(),
+      //QuestionNames.ApiOperation.toString(),
     ];
     options = options.filter((option) => !copilotPluginQuestionNames.includes(option.name));
   }

packages/fx-core/resource/package.nls.json

@@ -276,25 +276,25 @@
   "core.createProjectQuestion.projectType.outlookAddin.title": "App Features Using an Outlook Add-in",
   "core.createProjectQuestion.projectType.tab.detail": "Embed your own web content in Teams, Outlook, and the Micosoft 365 app",
   "core.createProjectQuestion.projectType.tab.title": "App Features Using a Tab",
-  "core.createProjectQuestion.projectType.copilotPlugin.detail": "Create a plugin to extend Copilot using your APIs",
-  "core.createProjectQuestion.projectType.copilotPlugin.label": "Plugin for Copilot",
-  "core.createProjectQuestion.projectType.copilotPlugin.title": "Plugin for Copilot",
+  "core.createProjectQuestion.projectType.copilotPlugin.detail": "Develop a Graph Connection using your OpenAPI",
+  "core.createProjectQuestion.projectType.copilotPlugin.label": "Graph Connectors",
+  "core.createProjectQuestion.projectType.copilotPlugin.title": "Graph Connectors",
   "core.createProjectQuestion.projectType.copilotPlugin.placeholder": "Select an option",
   "core.createProjectQuestion.title": "New Project",
   "core.createProjectQuestion.capability.copilotPluginNewApiOption.label": "Start with a new API",
   "core.createProjectQuestion.capability.copilotPluginNewApiOption.detail": "Create a plugin with a new API from Azure Functions",
   "core.createProjectQuestion.capability.copilotPluginApiSpecOption.label": "Start with an OpenAPI Description Document",
   "core.createProjectQuestion.capability.copilotPluginApiSpecOption.detail": "Create a plugin from your existing API",
   "core.createProjectQuestion.capability.copilotPluginAIPluginOption.label": "Start with an OpenAI Plugin",
-  "core.createProjectQuestion.capability.copilotPluginAIPluginOption.detail": "Convert an OpenAI Plugin to Microsoft 365 Copilot plugin",
+  "core.createProjectQuestion.capability.copilotPluginAIPluginOption.detail": "Convert an OpenAI Plugin to Microsoft 365 CoPilot plugin",
   "core.createProjectQuestion.apiSpec.title": "OpenAPI Description Document",
   "core.createProjectQuestion.apiSpec.placeholder": "Enter OpenAPI Description Document URL",
-  "core.createProjectQuestion.apiSpecInputUrl.label": "Enter OpenAPI Description Document Location",
+  "core.createProjectQuestion.apiSpecInputUrl.label": "Enter OpenAPI Document Location",
   "core.createProjectQuestion.OpenAIPluginDomain": "OpenAI Plugin Manifest",
   "core.createProjectQuestion.OpenAIPluginDomain.placeholder": "Enter your website domain or manifest URL",
   "core.createProjectQuestion.invalidUrl.message": "Please enter a valid URL",
   "core.createProjectQuestion.apiSpec.operation.title": "Select Operation(s) Teams Can Interact with",
-  "core.createProjectQuestion.apiSpec.operation.placeholder": "GET/POST methods with at most one required parameter and no auth are listed",
+  "core.createProjectQuestion.apiSpec.operation.placeholder": "GET methods are listed",
   "core.createProjectQuestion.apiSpec.operation.invalidMessage": "%s API(s) selected. You can select at least one and at most %s APIs.",
   "core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting": "Methods defined in manifest.json are not listed",
   "core.createProjectQuestion.apiSpec.multipleValidationErrors.message": "Invalid OpenAPI description document. Check output panel for details.",

packages/fx-core/src/common/featureFlags.ts

@@ -41,12 +41,12 @@ export function isImportSPFxEnabled(): boolean {
 }
 
 export function isCopilotPluginEnabled(): boolean {
-  return isFeatureFlagEnabled(FeatureFlagName.CopilotPlugin, false);
+  return true;
 }
 
 export function isApiCopilotPluginEnabled(): boolean {
   // return isFeatureFlagEnabled(FeatureFlagName.ApiCopilotPlugin, true) && isCopilotPluginEnabled();
-  return isFeatureFlagEnabled(FeatureFlagName.ApiCopilotPlugin, false) && isCopilotPluginEnabled();
+  return true;
 }
 
 export function isCliNewUxEnabled(): boolean {

packages/fx-core/src/common/spec-parser/manifestUpdater.ts

@@ -41,6 +41,129 @@ export async function updateManifest(
     };
 
     const updatedManifest = { ...originalManifest, ...updatedPart };
+    updatedManifest.graphConnector = {
+      connectionId: "DevicesCatalog",
+      connectionName: "DevicesCatalog",
+      authenticationEntity: {
+        path: "https://devicescatalog.contoso.com/api/v1",
+        authenticationKind: "Basic",
+      },
+      schema: [
+        {
+          name: "SysUpdatedOn",
+          type: "DateTime",
+          fieldPath: "result.sys_updated_on",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["lastModifiedDateTime"],
+        },
+        {
+          name: "SysUpdatedBy",
+          type: "String",
+          fieldPath: "result.sys_updated_by",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["lastModifiedBy"],
+        },
+        {
+          name: "SysCreatedOn",
+          type: "DateTime",
+          fieldPath: "result.sys_created_on",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["createdDateTime"],
+        },
+        {
+          name: "SysCreatedBy",
+          type: "String",
+          fieldPath: "result.sys_created_by",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["createdBy"],
+        },
+        {
+          name: "Name",
+          type: "String",
+          fieldPath: "result.name",
+          selectedAnnotations: ["search", "retrieve"],
+          semanticLabels: ["title"],
+        },
+        {
+          name: "ShortDescription",
+          type: "String",
+          fieldPath: "result.short_description",
+          selectedAnnotations: ["search", "retrieve"],
+        },
+        {
+          name: "Description",
+          type: "String",
+          fieldPath: "result.description",
+          selectedAnnotations: ["search", "content"],
+        },
+        {
+          name: "SysId",
+          type: "String",
+          fieldPath: "result.sys_id",
+          selectedAnnotations: ["retrieve"],
+        },
+        {
+          name: "ScCatalogs",
+          type: "String",
+          fieldPath: "result.sc_catalogs",
+          selectedAnnotations: ["query"],
+        },
+        {
+          name: "Category",
+          type: "String",
+          fieldPath: "result.category",
+          selectedAnnotations: [],
+        },
+        {
+          name: "AccessUrl",
+          type: "String",
+          fieldPath: "result.sys_id",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["url"],
+        },
+        {
+          name: "IconUrl",
+          type: "String",
+          fieldPath: "result.sys_id",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["iconUrl"],
+        },
+        {
+          name: "Authors",
+          type: "StringCollection",
+          fieldPath: "result.sys_created_by",
+          selectedAnnotations: ["retrieve"],
+          semanticLabels: ["authors"],
+        },
+      ],
+      ApiParameters: {
+        Url: "https://devicescatalog.contoso.com/api/v1",
+        Headers: {
+          Accept: "application/vnd.github.v3+json",
+          "User-Agent": ".NET Foundation Repository Reporter",
+        },
+        QueryParameters: ["sysparm_limit", "sysparm_offset"],
+        Pagination: {
+          PageSize: 100,
+          OffsetStart: 0,
+          OffsetType: "item",
+          Parameters: {
+            Limit: "sysparm_limit",
+            Offset: "sysparm_offset",
+          },
+        },
+        ItemId: "SysId",
+      },
+      aclSetting: {
+        useItemLevelAcl: false,
+      },
+      identityConfiguration: {
+        isIdentitySyncRequired: false,
+      },
+      refreshSetting: {
+        fullSyncInterval: 3600,
+      },
+    };
 
     return [updatedManifest, warnings];
   } catch (err) {

packages/fx-core/src/common/spec-parser/specFilter.ts

@@ -3,7 +3,7 @@
 "use strict";
 
 import { OpenAPIV3 } from "openapi-types";
-import { convertPathToCamelCase, isSupportedApi } from "./utils";
+import { convertPathToCamelCase, isSupportedApiForGraphConnectors } from "./utils";
 import { SpecParserError } from "./specParserError";
 import { ErrorType } from "./interfaces";
 import { ConstantString } from "./constants";
@@ -20,7 +20,7 @@ export function specFilter(
       const [method, path] = filterItem.split(" ");
       const methodName = method.toLowerCase();
 
-      if (!isSupportedApi(methodName, path, resolvedSpec)) {
+      if (!isSupportedApiForGraphConnectors(methodName, path, resolvedSpec)) {
         continue;
       }
 

packages/fx-core/src/common/spec-parser/specParser.ts

@@ -21,7 +21,7 @@ import { ConstantString } from "./constants";
 import jsyaml from "js-yaml";
 import fs from "fs-extra";
 import { specFilter } from "./specFilter";
-import { convertPathToCamelCase, isSupportedApi, validateServer } from "./utils";
+import { convertPathToCamelCase, isSupportedApiForGraphConnectors, validateServer } from "./utils";
 import { updateManifest } from "./manifestUpdater";
 import { generateAdaptiveCard } from "./adaptiveCardGenerator";
 import path from "path";
@@ -294,7 +294,7 @@ export class SpecParser {
       const methods = paths[path];
       for (const method in methods) {
         // For developer preview, only support GET operation with only 1 parameter without auth
-        if (isSupportedApi(method, path, spec)) {
+        if (isSupportedApiForGraphConnectors(method, path, spec)) {
           const operationObject = (methods as any)[method] as OpenAPIV3.OperationObject;
           result[`${method.toUpperCase()} ${path}`] = operationObject;
         }

packages/fx-core/src/common/spec-parser/utils.ts

@@ -124,6 +124,68 @@ export function checkPostBody(
   return paramResult;
 }
 
+/**
+ * Checks if the given API is supported.
+ * @param {string} method - The HTTP method of the API.
+ * @param {string} path - The path of the API.
+ * @param {OpenAPIV3.Document} spec - The OpenAPI specification document.
+ * @returns {boolean} - Returns true if the API is supported, false otherwise.
+ * @description The following APIs are supported:
+ * 1. only support Get/Post operation without auth property
+ * 2. parameter inside query or path only support string, number, boolean and integer
+ * 3. parameter inside post body only support string, number, boolean, integer and object
+ * 4. request body + required parameters <= 1
+ * 5. response body should be “application/json” and not empty, and response code should be 20X
+ * 6. only support request body with “application/json” content type
+ */
+export function isSupportedApiForGraphConnectors(
+  method: string,
+  path: string,
+  spec: OpenAPIV3.Document
+): boolean {
+  const pathObj = spec.paths[path];
+  method = method.toLocaleLowerCase();
+  if (pathObj) {
+    if (method === ConstantString.GetMethod && pathObj[method] && !pathObj[method]?.security) {
+      const operationObject = pathObj[method] as OpenAPIV3.OperationObject;
+      const paramObject = operationObject.parameters as OpenAPIV3.ParameterObject[];
+
+      const requestBody = operationObject.requestBody as OpenAPIV3.RequestBodyObject;
+      const requestJsonBody = requestBody?.content["application/json"];
+
+      const responseJson = getResponseJson(operationObject);
+      if (Object.keys(responseJson).length === 0) {
+        return false;
+      }
+
+      let requestBodyParamResult = {
+        requiredNum: 0,
+        optionalNum: 0,
+        isValid: true,
+      };
+
+      if (requestJsonBody) {
+        const requestBodySchema = requestJsonBody.schema as OpenAPIV3.SchemaObject;
+        requestBodyParamResult = checkPostBody(requestBodySchema, requestBody.required);
+      }
+
+      if (!requestBodyParamResult.isValid) {
+        return false;
+      }
+
+      const paramResult = checkParameters(paramObject);
+
+      if (!paramResult.isValid) {
+        return false;
+      }
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
 /**
  * Checks if the given API is supported.
  * @param {string} method - The HTTP method of the API.
@@ -321,7 +383,7 @@ export function validateServer(spec: OpenAPIV3.Document): ErrorResult[] {
 
     for (const method in methods) {
       const operationObject = (methods as any)[method] as OpenAPIV3.OperationObject;
-      if (isSupportedApi(method, path, spec)) {
+      if (isSupportedApiForGraphConnectors(method, path, spec)) {
         if (operationObject?.servers && operationObject.servers.length >= 1) {
           hasOperationLevelServers = true;
           const serverErrors = checkServerUrl(operationObject.servers);

packages/fx-core/src/component/driver/teamsApp/constants.ts

@@ -261,9 +261,9 @@ export const DEFAULT_OUTLINE_PNG_FILENAME = "outline.png";
 // Default values for the developer fields in manifest.
 export const DEFAULT_DEVELOPER = {
   name: "Teams App, Inc.",
-  websiteUrl: "https://www.example.com",
-  privacyUrl: "https://www.example.com/termofuse",
-  termsOfUseUrl: "https://www.example.com/privacy",
+  websiteUrl: "https://www.contoso.com",
+  privacyUrl: "https://www.contoso.com/termofuse",
+  termsOfUseUrl: "https://www.contoso.com/privacy",
 };
 
 // Default values for the description fields in manifest.

packages/fx-core/src/component/generator/copilotPlugin/generator.ts

@@ -19,6 +19,7 @@ import {
   ResponseTemplatesFolderName,
   AppPackageFolderName,
   Warning,
+  TeamsAppManifest,
 } from "@microsoft/teamsfx-api";
 import { Generator } from "../generator";
 import path from "path";

packages/fx-core/src/question/create.ts

@@ -120,7 +120,7 @@ export class ProjectTypeOptions {
   static copilotPlugin(platform?: Platform): OptionItem {
     return {
       id: "copilot-plugin-type",
-      label: `${platform === Platform.VSCode ? "$(sparkle) " : ""}${getLocalizedString(
+      label: `${platform === Platform.VSCode ? "$(debug-disconnect) " : ""}${getLocalizedString(
         "core.createProjectQuestion.projectType.copilotPlugin.label"
       )}`,
       detail: getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.detail"),
@@ -440,9 +440,9 @@ export class CapabilityOptions {
 
   static copilotPlugins(): OptionItem[] {
     return [
-      CapabilityOptions.copilotPluginNewApi(),
+      //CapabilityOptions.copilotPluginNewApi(),
       CapabilityOptions.copilotPluginApiSpec(),
-      CapabilityOptions.copilotPluginOpenAIPlugin(),
+      //CapabilityOptions.copilotPluginOpenAIPlugin(),
     ];
   }