@microsoft/teamsfx-core 2.0.4-alpha.6ff4defd0.0 → 2.0.4-alpha.7313f757f.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "2.0.4-alpha.6ff4defd0.0",
+  "version": "2.0.4-alpha.7313f757f.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -51,15 +51,13 @@
     "test:azureFuncDeploy": "nyc mocha \"tests/component/driver/deploy/azure/AzureFunctionDeployDriver.test.ts\"",
     "test:devportal": "nyc mocha \"tests/component/developerPortalScaffoldUtils.test.ts\"",
     "test:visitor": "nyc mocha \"tests/ui/qm.visitor.test.ts\"",
+    "test:validUtils": "nyc mocha \"tests/ui/validationUtils.test.ts\"",
     "test:question": "nyc mocha \"tests/question/*.test.ts\"",
     "test:coll": "nyc mocha \"tests/core/collaborator.test.ts\"",
-    "test:specParser": "npx mocha \"tests/common/spec-parser/**/specParser.test.ts\"",
-    "test:specFilter": "npx mocha \"tests/common/spec-parser/**/specFilter.test.ts\"",
-    "test:specParserUtils": "npx mocha \"tests/common/spec-parser/**/utils.test.ts\"",
-    "test:manifestUpdater": "npx mocha \"tests/common/spec-parser/**/manifestUpdater.test.ts\"",
-    "test:adaptiveCardGenerator": "npx mocha \"tests/common/spec-parser/**/adaptiveCardGenerator.test.ts\"",
+    "test:specParser": "npx mocha \"tests/common/spec-parser/**/*.test.ts\"",
     "test:error": "nyc mocha \"tests/error/*.test.ts\"",
     "test:cutils": "nyc mocha \"tests/component/utils.test.ts\"",
+    "test:globalVars": "nyc mocha \"tests/core/globalVars.test.ts\"",
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
     "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
@@ -71,7 +69,8 @@
     "install:tabs": "cd tabs && npm install",
     "installAll": "npm run install:tabs",
     "checkUnusedStrings": "node ./scripts/find-unused-strings.js ./resource/package.nls.json ./src || exit 1",
-    "deleteUnusedStrings": "node ./scripts/delete-unused-strings.js ./resource/package.nls.json ./src"
+    "clean:strings": "node ./scripts/delete-unused-strings.js ./resource/package.nls.json ./src",
+    "gen:cli": "npx ts-node ./src/question/generator.ts && npx prettier --write \"src/question/options/*.ts\" && npx prettier --write \"src/question/inputs/*.ts\""
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
@@ -89,9 +88,10 @@
     "@feathersjs/hooks": "^0.6.5",
     "@microsoft/dev-tunnels-contracts": "~1.0.7360",
     "@microsoft/dev-tunnels-management": "~1.0.7360",
-    "@microsoft/teamsfx-api": "0.22.4-alpha.6ff4defd0.0",
+    "@microsoft/teamsfx-api": "0.22.4-alpha.7313f757f.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/proper-lockfile": "^4.1.1",
+    "@types/swagger2openapi": "^7.0.0",
     "adm-zip": "^0.5.5",
     "ajv": "^8.5.0",
     "axios": "^0.21.2",
@@ -116,7 +116,7 @@
     "md5": "^2.3.0",
     "mime": "^2.5.2",
     "mustache": "^4.2.0",
-    "node-forge": "^1.0.0",
+    "node-forge": "^1.3.1",
     "node-ts-uuid": "^1.0.8",
     "office-addin-manifest": "^1.12.4",
     "office-addin-project": "^0.7.0",
@@ -126,6 +126,7 @@
     "reflect-metadata": "^0.1.13",
     "semver": "^7.5.2",
     "strip-bom": "^4.0.0",
+    "swagger2openapi": "^7.0.8",
     "tedious": "^15.1.2",
     "typedi": "^0.10.0",
     "unzipper": "^0.10.11",
@@ -138,7 +139,6 @@
   "devDependencies": {
     "@azure/storage-blob": "^12.5.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@microsoft/eslint-plugin-teamsfx": "0.0.5-alpha.6ff4defd0.0",
     "@types/adm-zip": "^0.4.33",
     "@types/chai": "^4.2.14",
     "@types/chai-as-promised": "^7.1.3",
@@ -155,7 +155,7 @@
     "@types/md5": "^2.3.0",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^8.2.1",
-    "@types/mock-fs": "^4.13.0",
+    "@types/mock-fs": "^4.13.1",
     "@types/mustache": "^4.1.1",
     "@types/node": "^14.14.21",
     "@types/node-forge": "^0.9.7",
@@ -173,6 +173,7 @@
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
     "ahocorasick": "^1.0.2",
+    "axios-mock-adapter": "^1.20.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
@@ -186,20 +187,23 @@
     "faker": "^5.5.2",
     "find-process": "^1.4.4",
     "lint-staged": "^10.5.4",
+    "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mock-fs": "^4.13.0",
+    "mock-fs": "5.2.0",
     "mocked-env": "^1.3.5",
-    "nock": "^13.2.9",
     "nyc": "^15.1.0",
     "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
     "rewire": "^6.0.0",
+    "rimraf": "^5.0.1",
     "sinon": "^9.2.2",
     "source-map-support": "^0.5.19",
     "tmp": "^0.2.1",
     "ts-loader": "^8.0.3",
+    "ts-morph": "^19.0.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.2.3",
+    "tslib": "^2.3.1",
+    "typescript": "4.3.5",
     "webpack": "^5.61.0"
   },
   "files": [
@@ -207,7 +211,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "f3ffa26c4e10bb85e5efdbf467e409197aa0fe0f",
+  "gitHead": "edee81033cb4176b4d24b1eef0a9ac6234e6e796",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -18,10 +18,9 @@
   "core.option.learnMore": "Learn more",
   "core.option.upgrade": "Upgrade",
   "core.option.moreInfo": "More Info",
-  "core.progress.generateTemplate": "Generating Template",
-  "core.progress.generateTemplate.detail": "Downloading Template %s",
-  "core.progress.generateSample": "Generating Sample",
-  "core.progress.generateSample.detail": "Downloading Sample %s",
+  "core.progress.create": "Create",
+  "core.progress.createFromTemplate": "Downloading app template.",
+  "core.progress.createFromSample": "Downloading sample %s",
   "core.progress.deploy": "Deploy",
   "core.progress.publish": "Publish",
   "core.progress.provision": "Provision",
@@ -66,6 +65,7 @@
   "core.collaboration.Permission": ", Permission: ",
   "core.developerPortal.scaffold.CannotFindManifest": "Could not find manifest from the downloaded package for teams app %s.",
   "plugins.spfx.questions.framework.title": "Framework",
+  "plugins.spfx.questions.webpartName": "Name for SharePoint Framework Web Part",
   "plugins.spfx.questions.webpartName.error.duplicate": "The folder %s already exists. Choose a different name for your component.",
   "plugins.spfx.questions.webpartName.error.notMatch": "%s doesn't match pattern: %s",
   "plugins.spfx.questions.packageSelect.title": "SharePoint Framework",
@@ -143,23 +143,18 @@
   "plugins.appstudio.viewDeveloperPortal": "View in Developer Portal",
   "plugins.bot.questionHostTypeTrigger.title": "Choose triggers",
   "plugins.bot.questionHostTypeTrigger.placeholder": "Choose triggers",
-  "plugins.bot.triggers.http-functions.cliName": "http-functions",
   "plugins.bot.triggers.http-functions.description": "Azure Functions",
   "plugins.bot.triggers.http-functions.detail": "A running function hosted on Azure Functions can listen to HTTP requests.",
   "plugins.bot.triggers.http-functions.label": "HTTP Trigger",
-  "plugins.bot.triggers.http-and-timer-functions.cliName": "http-and-timer-functions",
   "plugins.bot.triggers.http-and-timer-functions.description": "Azure Functions",
   "plugins.bot.triggers.http-and-timer-functions.detail": "A running function hosted on Azure Functions can listen to HTTP requests and respond based on a specific schedule.",
   "plugins.bot.triggers.http-and-timer-functions.label": "HTTP and Timer Trigger",
-  "plugins.bot.triggers.http-restify.cliName": "http-restify",
   "plugins.bot.triggers.http-restify.description": "Restify Server",
   "plugins.bot.triggers.http-restify.detail": "A running restify server hosted on Azure App Service can listen to HTTP requests.",
   "plugins.bot.triggers.http-restify.label": "HTTP Trigger",
-  "plugins.bot.triggers.http-webapi.cliName": "http-webapi",
   "plugins.bot.triggers.http-webapi.description": "Web API Server",
   "plugins.bot.triggers.http-webapi.detail": "A running Web API server hosted on Azure App Service can listen to HTTP requests.",
   "plugins.bot.triggers.http-webapi.label": "HTTP Trigger",
-  "plugins.bot.triggers.timer-functions.cliName": "timer-functions",
   "plugins.bot.triggers.timer-functions.description": "Azure Functions",
   "plugins.bot.triggers.timer-functions.detail": "A running function hosted on Azure Functions can respond based on a specific schedule.",
   "plugins.bot.triggers.timer-functions.label": "Timer Trigger",
@@ -203,6 +198,8 @@
   "error.appstudio.BotProvisionReturnsConflictResult": "Botframework provisioning returns conflict result from attempting to create bot registration.",
   "_error.appstudio.BotProvisionReturnsConflictResult.comment": "This is to describe API call, no need to translate 'Botframework'.",
   "error.generator.TemplateZipFallbackError": "Unable to download zip package and open local zip package.",
+  "error.generator.TemplateNotFoundError": "Unable to find template: %s.",
+  "error.generator.SampleNotFoundError": "Unable to find sample: %s.",
   "error.generator.FetchZipFromUrlError": "Unable to download zip package from %s.",
   "error.generator.UnzipError": "Unable to unzip templates and write to disk.",
   "error.generator.MissKeyError": "Unable to find key %s",
@@ -210,6 +207,7 @@
   "error.generator.DownloadSampleNetworkError": "Unable to download sample due to network error. Check your network connection and retry. Alternatively, you can go to %s to git clone the repo manually",
   "error.generator.ParseUrlError": "Unable to parse url %s",
   "error.copilotPlugin.openAiPluginManifest.CannotGetManifest": "Unable to get OpenAI plugin manifest from '%s'.",
+  "error.copilotPlugin.noExtraAPICanBeAdded": "No API can be added. Only GET and POST methods with single parameter and no auth are supported. Methods defined in manifest.json are not listed.",
   "error.m365.NotExtendedToM365Error": "Unable to extend Teams app to Microsoft 365. Use 'teamsApp/extendToM365' action to extend your Teams app to Microsoft 365.",
   "core.QuestionAppName.validation.pattern": "Application name must start with letters and contain at least two letters or digits. It can not contain some special characters.",
   "core.QuestionAppName.validation.maxlength": "Application name is longer than the maximum length of 30.",
@@ -220,12 +218,16 @@
   "core.option.github": "Open a GitHub guide",
   "core.option.inProduct": "Open a in-product guide",
   "core.TabOption.label": "Tab",
+  "core.generator.officeAddin.importProject.title": "Importing an existing Outlook add-in project",
+  "core.generator.officeAddin.importProject.copyFiles": "Copying files",
+  "core.generator.officeAddin.importProject.convertProject": "Converting project",
+  "core.generator.officeAddin.importProject.updateManifest": "Modifying manifest",
   "core.TabOption.description": "UI-based app",
   "core.TabOption.detail": "Teams-aware webpages embedded in Microsoft Teams",
   "core.DashboardOption.label": "Dashboard",
   "core.DashboardOption.detail": "A canvas with cards and widgets for displaying important information",
   "core.BotNewUIOption.label": "Basic Bot",
-  "core.BotNewUIOption.detail": "A simple implementation of a bot that's ready to customize",
+  "core.BotNewUIOption.detail": "A simple implementation of an echo bot that's ready to customize",
   "core.LinkUnfurlingOption.label": "Link Unfurling",
   "core.LinkUnfurlingOption.detail": "Display information and actions when a URL is pasted into the compose message area",
   "core.MessageExtensionOption.labelNew": "Collect Form Input and Process Data",
@@ -246,6 +248,15 @@
   "core.copilotPlugin.validate.openAIPluginManifest.summary": "Teams Toolkit has checked your OpenAI plugin manifest:\n\nSummary:\n%s.\n%s\n%s",
   "core.copilotPlugin.validate.summary.validate.failed": "%s failed",
   "core.copilotPlugin.validate.summary.validate.warning": "%s warning",
+  "core.copilotPlugin.scaffold.summary": "We have detected the following issues for your OpenAPI specification file:\n%s",
+  "core.copilotPlugin.scaffold.summary.warning.operationId": "%s Mitigation: Not required, operationId has been automatically generated and added into \"%s\" file.",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.lengthExceeding": "\"%s\" must not have more than %s characters. ",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingFullDescription": "Missing full description. ",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.mitigation": "Mitigation: update \"%s\" field in \"%s\".",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate": "Missing \"%s\" in command \"%s\".",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCardTemlate.mitigation": " Mitigation: create Adaptive Card template in \"%s\" and then update \"%s\" field to the relative path in \"%s\".",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCommandParameters": "Missing parameters in command \"%s\".",
+  "core.copilotPlugin.scaffold.summary.warning.teamsManifest.missingCommandParameters.mitigation": " Mitigation: add at least one parameter for command \"%s\" in \"%s\". The parameter name should match what's defined in \"%s\".",
   "core.createCapabilityQuestion.titleNew": "Capabilities",
   "core.createCapabilityQuestion.placeholder": "Select a capability",
   "core.createProjectQuestion.option.description.previewOnWindow": "Preview on Windows",
@@ -280,12 +291,16 @@
   "core.createProjectQuestion.invalidUrl.message": "Please enter a valid URL",
   "core.createProjectQuestion.invalidDomain.message": "Please enter a valid domain",
   "core.createProjectQuestion.apiSpec.operation.title": "Select an Operation",
-  "core.createProjectQuestion.apiSpec.operation.placeholder": "Only GET and POST methods are listed.",
+  "core.createProjectQuestion.apiSpec.operation.placeholder": "Only GET and POST methods with single parameter and no auth are listed",
   "core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting": "Methods defined in manifest.json are not listed",
   "core.createProjectQuestion.apiSpec.multipleValidationErrors.message": "Invalid API specification. Check output panel for details.",
   "core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message": "Invalid API specification. Check [output panel](command:fx-extension.showOutputChannel) for details.",
   "core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.message": "Invalid OpenAI plugin manifest. Check output panel for details.",
   "core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.vscode.message": "Invalid OpenAI plugin manifest. Check [output panel](command:fx-extension.showOutputChannel) for details.",
+  "core.createProjectQuestion.openAiPluginManifest.validationError.missingApiUrl": "Missing URL in \"%s\".",
+  "core.createProjectQuestion.openAiPluginManifest.validationError.authNotSupported": "Auth type is not supported. Supported auth type: \"%s\".",
+  "core.aiBotOption.label": "AI Chat Bot",
+  "core.aiBotOption.detail": "A chat bot using Teams AI library",
   "core.spfxFolder.title": "SPFx solution folder",
   "core.spfxFolder.placeholder": "Select the folder that contains your SPFx solution",
   "core.QuestionSelectTargetEnvironment.title": "Select an environment",
@@ -309,7 +324,6 @@
   "core.ScratchOptionNo.detail": "Use an existing sample as a starting point for your new application.",
   "core.RuntimeOptionNodeJS.detail": "A fast JavaScript server runtime",
   "core.RuntimeOptionDotNet.detail": "Free. Cross-platform. Open Source.",
-  "core.getCreateNewOrFromSampleQuestion.title": "Teams Toolkit: Create a New App",
   "core.getRuntimeQuestion.title": "Teams Toolkit: select runtime for your app",
   "core.getCreateNewOrFromSampleQuestion.placeholder": "Select an option",
   "core.getRuntimeQuestion.placeholder": "Select a runtime",
@@ -355,6 +369,7 @@
   "core.M365SsoLaunchPageOptionItem.detail": "A web app that uses Fluent UI React components to get a Teams look and feel",
   "core.M365SearchAppOptionItem.label": "Custom Search Results",
   "core.M365SearchAppOptionItem.detail": "Display data directly in Teams and Outlook search results from search or the chat area",
+  "core.SearchAppOptionItem.detail": "Display data directly in Teams search results from search or the chat area",
   "core.M365HostQuestion.title": "Platform",
   "core.M365HostQuestion.placeholder": "Select a platform to preview the app",
   "core.options.separator.additional": "Additional features",
@@ -370,8 +385,18 @@
   "core.common.OutlookDesktopClientName": "Outlook desktop client id",
   "core.common.OutlookWebClientName1": "Outlook web access client id 1",
   "core.common.OutlookWebClientName2": "Outlook web access client id 2",
-  "core.importAddin.label": "Import an Existing Outlook Add-in",
-  "core.importAddin.detail": "Upgrade and add-in project to the latest app manifest and project structure",
+  "core.common.CancelledMessage": "Operation is cancelled.",
+  "core.common.SpecVersionNotSupported": "OpenAPI version lower than 3.0.0 is not supported.",
+  "core.common.NoServerInformation":  "No server information is found in the OpenAPI specification file.",
+  "core.common.MultipleServerInformation": "Multiple server information is found in the OpenAPI specification file.",
+  "core.common.RemoteRefNotSupported": "Remote reference is not supported: %s.",
+  "core.common.MissingOperationId": "Missing operationIds: %s.",
+  "core.common.NoSupportedApi": "No supported API is found in the OpenAPI specification file.",
+  "core.common.AdditionalPropertiesNotSupported": "'additionalProperties' is not supported, and will be ignored.",
+  "core.common.SchemaNotSupported": "'oneOf', 'anyOf', and 'not' schema are not supported: %s.",
+  "core.common.UnknownSchema": "Unknown schema: %s.",
+  "core.importAddin.label": "Import an Existing Outlook Add-ins",
+  "core.importAddin.detail": "Upgrade an Add-ins project to the latest app manifest and project structure",
   "core.newTaskpaneAddin.label": "Taskpane",
   "core.newTaskpaneAddin.detail": "Customize the Ribbon with a button and embed content in the Taskpane",
   "core.summary.actionDescription": "Action %s%s",
@@ -395,6 +420,7 @@
   "error.aad.manifest.OptionalClaimsIsMissing": "optionalClaims is missing\n",
   "error.aad.manifest.OptionalClaimsMissingIdtypClaim": "optionalClaims access token doesn't contain idtyp claim\n",
   "error.aad.manifest.AADManifestIssues": "AAD manifest has following issues that may potentially break the Teams App:\n",
+  "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual AAD application and try again.\n",
   "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s",
   "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s",
   "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s, if you're using permission as resourceAccess id, please try to use permission id instead.",
@@ -513,7 +539,7 @@
   "driver.deploy.azureFunctionsDeployDetailSummary": "Successfully deployed `%s` to Azure Functions.",
   "driver.deploy.azureStorageDeployDetailSummary": "Successfully deployed `%s` to Azure Storage.",
   "driver.deploy.enableStaticWebsiteSummary": "Azure Storage enable static website successfully.",
-  "driver.deploy.deployToAzureAppServiceDescription": "deploy the project to the Azure APP Service.",
+  "driver.deploy.deployToAzureAppServiceDescription": "deploy the project to the Azure App Service.",
   "driver.deploy.deployToAzureFunctionsDescription": "deploy the project to the Azure Functions.",
   "driver.deploy.deployToAzureStorageDescription": "deploy the project to the Azure Storage.",
   "driver.deploy.enableStaticWebsiteInAzureStorageDescription": "enable static website setting in Azure Storage.",
@@ -562,7 +588,7 @@
   "driver.botFramework.progressBar.createOrUpdateBot": "Creating or updating bot registration.",
   "driver.botFramework.error.InvalidBotId": "Bot ID %s is invalid. It must be a GUID.",
   "error.yaml.InvalidYamlSchemaError": "Unable to parse yaml file: %s. Please open the yaml file for detailed errors.",
-  "error.yaml.InvalidYamlSchemaErrorWithReason": "Unable to parse yaml file: %s. Reason: %s Please review the yaml file.",
+  "error.yaml.InvalidYamlSchemaErrorWithReason": "Unable to parse yaml file: %s. Reason: %s Please review the yaml file or upgrade to the latest Teams Toolkit.",
   "error.yaml.VersionNotSupported": "version %s is not supported. Supported versions: %s.",
   "error.yaml.YamlFieldTypeError": "Field '%s' should have %s type, yaml file: %s",
   "error.yaml.YamlFieldMissingError": "Field '%s' is missing, yaml file: %s",

package/resource/yaml-schema/{1.1.1 → v1.2}/yaml.schema.json

@@ -14,12 +14,18 @@
     "version": {
       "type": "string",
       "description": "The version of the yaml file schema",
-      "const": "1.1.1"
+      "const": "v1.2"
     },
-    "sampleTag": {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9-_]+:[a-zA-Z0-9-_]+$",
-      "description": "The tag of sample repo and sample name, used for telemetry purpose only. E.g. <sample-repo>:<sample-name>"
+    "additionalMetadata": {
+      "type": "object",
+      "description": "Metadata property, used by Teams Toolkit only.",
+      "additionalProperties": true,
+      "properties": {
+        "sampleTag": {
+          "type": ["number","string","boolean","object","array", "null", "integer"],
+          "description": "A tag for the sample app used to track telemetry events sent by Teams Toolkit associated with that sample. Pattern: <sample-repo>:<sample-name>"
+        }
+      }
     },
     "provision": {
       "$ref": "#/definitions/lifeCycleArray",

package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor

@@ -92,8 +92,7 @@
 
     private GraphServiceClient GetGraphServiceClient()
     {
-        var msGraphAuthProvider = new MsGraphAuthProvider(teamsUserCredential, _scope);
-        var client = new GraphServiceClient(msGraphAuthProvider);
+        var client = new GraphServiceClient(teamsUserCredential, new string[] { _scope });
         return client;
     }
 }