@microsoft/teamsfx-core 2.0.14-rc.1 → 2.0.15-alpha.0b985f7da.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/featureFlags.d.ts +0 -31
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +2 -34
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +1 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -1
- package/build/common/projectTypeChecker.js +6 -1
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/secretmasker/masker.d.ts +1 -1
- package/build/common/secretmasker/masker.d.ts.map +1 -1
- package/build/common/secretmasker/masker.js +2 -2
- package/build/common/secretmasker/masker.js.map +1 -1
- package/build/common/stringUtils.js +1 -1
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/actionInjector.d.ts +1 -1
- package/build/component/configManager/actionInjector.d.ts.map +1 -1
- package/build/component/configManager/actionInjector.js +17 -8
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +11 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +18 -4
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +31 -12
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts +8 -3
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +109 -16
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts +2 -1
- package/build/component/driver/aad/utility/buildAadManifest.d.ts.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/add/utility/constants.d.ts +1 -1
- package/build/component/driver/add/utility/constants.d.ts.map +1 -1
- package/build/component/driver/add/utility/constants.js +1 -1
- package/build/component/driver/add/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/utility.js +4 -3
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +26 -21
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +1 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +0 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +12 -7
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +0 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +23 -15
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +14 -4
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +2 -0
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +2 -0
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +12 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.js +4 -4
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
- package/build/component/generator/apiSpec/generator.js +72 -28
- package/build/component/generator/apiSpec/generator.js.map +1 -1
- package/build/component/generator/apiSpec/helper.d.ts +4 -2
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/apiSpec/helper.js +143 -33
- package/build/component/generator/apiSpec/helper.js.map +1 -1
- package/build/component/generator/copilotExtension/generator.d.ts.map +1 -1
- package/build/component/generator/copilotExtension/generator.js +4 -5
- package/build/component/generator/copilotExtension/generator.js.map +1 -1
- package/build/component/generator/generator.d.ts +2 -2
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +25 -13
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +3 -5
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +28 -103
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +1 -1
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.d.ts.map +1 -1
- package/build/component/generator/templates/ssrTabGenerator.js +7 -3
- package/build/component/generator/templates/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +0 -5
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +2 -47
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +8 -1
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +1 -0
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/m365/packageService.d.ts +9 -1
- package/build/component/m365/packageService.d.ts.map +1 -1
- package/build/component/m365/packageService.js +144 -5
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +2 -1
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
- package/build/component/utils/envFunctionUtils.js +0 -4
- package/build/component/utils/envFunctionUtils.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts +1 -0
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +7 -0
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts +10 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +210 -38
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +5 -2
- package/build/core/collaborator.js.map +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +2 -3
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +13 -11
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +59 -129
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +1 -11
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +49 -134
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +2 -0
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +3 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +9 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/AddAuthActionInputs.d.ts +20 -0
- package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -0
- package/build/question/inputs/AddAuthActionInputs.js +5 -0
- package/build/question/inputs/AddAuthActionInputs.js.map +1 -0
- package/build/question/inputs/AddPluginInputs.d.ts +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +4 -6
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/index.d.ts +1 -0
- package/build/question/inputs/index.d.ts.map +1 -1
- package/build/question/inputs/index.js +1 -0
- package/build/question/inputs/index.js.map +1 -1
- package/build/question/options/AddAuthActionOptions.d.ts +10 -0
- package/build/question/options/AddAuthActionOptions.d.ts.map +1 -0
- package/build/question/options/AddAuthActionOptions.js +39 -0
- package/build/question/options/AddAuthActionOptions.js.map +1 -0
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +2 -10
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/index.d.ts +1 -0
- package/build/question/options/index.d.ts.map +1 -1
- package/build/question/options/index.js +1 -0
- package/build/question/options/index.js.map +1 -1
- package/build/question/other.d.ts +7 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +147 -1
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/resource/package.nls.cs.json +543 -263
- package/resource/package.nls.de.json +531 -251
- package/resource/package.nls.es.json +543 -263
- package/resource/package.nls.fr.json +557 -277
- package/resource/package.nls.it.json +546 -266
- package/resource/package.nls.ja.json +536 -256
- package/resource/package.nls.json +48 -42
- package/resource/package.nls.ko.json +532 -252
- package/resource/package.nls.pl.json +539 -259
- package/resource/package.nls.pt-BR.json +555 -275
- package/resource/package.nls.ru.json +547 -267
- package/resource/package.nls.tr.json +541 -261
- package/resource/package.nls.zh-Hans.json +528 -248
- package/resource/package.nls.zh-Hant.json +539 -259
- package/resource/yaml-schema/v1.8/yaml.schema.json +1858 -0
- package/resource/yaml-schema/yaml.schema.json +5 -1
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +2 -2
- package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json +87 -77
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +2 -2
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +2 -2
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +2 -2
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +2 -2
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +2 -2
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +2 -2
- package/templates/plugins/resource/aad/manifest/aad.template.json +109 -97
- package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json +90 -81
- package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json +93 -89
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
export declare function isFeatureFlagEnabled(featureFlagName: string, defaultValue?: boolean): boolean;
|
|
2
2
|
export declare class FeatureFlagName {
|
|
3
3
|
static readonly CLIDotNet = "TEAMSFX_CLI_DOTNET";
|
|
4
|
-
static readonly OfficeAddin = "TEAMSFX_OFFICE_ADDIN";
|
|
5
4
|
static readonly OfficeMetaOS = "TEAMSFX_OFFICE_METAOS";
|
|
6
|
-
static readonly CopilotExtension = "DEVELOP_COPILOT_EXTENSION";
|
|
7
|
-
static readonly CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
|
|
8
5
|
static readonly SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
|
|
9
6
|
static readonly TestTool = "TEAMSFX_TEST_TOOL";
|
|
10
7
|
static readonly METestTool = "TEAMSFX_ME_TEST_TOOL";
|
|
@@ -19,11 +16,8 @@ export declare class FeatureFlagName {
|
|
|
19
16
|
static readonly TelemetryTest = "TEAMSFX_TELEMETRY_TEST";
|
|
20
17
|
static readonly DevTunnelTest = "TEAMSFX_DEV_TUNNEL_TEST";
|
|
21
18
|
static readonly SyncManifest = "TEAMSFX_SYNC_MANIFEST";
|
|
22
|
-
static readonly EnvFileFunc = "TEAMSFX_ENV_FILE_FUNC";
|
|
23
19
|
static readonly KiotaIntegration = "TEAMSFX_KIOTA_INTEGRATION";
|
|
24
|
-
static readonly ApiPluginAAD = "TEAMSFX_API_PLUGIN_AAD";
|
|
25
20
|
static readonly CEAEnabled = "TEAMSFX_CEA_ENABLED";
|
|
26
|
-
static readonly MultiTenant = "TEAMSFX_MULTI_TENANT";
|
|
27
21
|
}
|
|
28
22
|
export interface FeatureFlag {
|
|
29
23
|
name: string;
|
|
@@ -35,14 +29,6 @@ export declare class FeatureFlags {
|
|
|
35
29
|
name: string;
|
|
36
30
|
defaultValue: string;
|
|
37
31
|
};
|
|
38
|
-
static readonly CopilotExtension: {
|
|
39
|
-
name: string;
|
|
40
|
-
defaultValue: string;
|
|
41
|
-
};
|
|
42
|
-
static readonly CopilotPlugin: {
|
|
43
|
-
name: string;
|
|
44
|
-
defaultValue: string;
|
|
45
|
-
};
|
|
46
32
|
static readonly TestTool: {
|
|
47
33
|
name: string;
|
|
48
34
|
defaultValue: string;
|
|
@@ -51,10 +37,6 @@ export declare class FeatureFlags {
|
|
|
51
37
|
name: string;
|
|
52
38
|
defaultValue: string;
|
|
53
39
|
};
|
|
54
|
-
static readonly OfficeAddin: {
|
|
55
|
-
name: string;
|
|
56
|
-
defaultValue: string;
|
|
57
|
-
};
|
|
58
40
|
static readonly OfficeMetaOS: {
|
|
59
41
|
name: string;
|
|
60
42
|
defaultValue: string;
|
|
@@ -99,28 +81,15 @@ export declare class FeatureFlags {
|
|
|
99
81
|
name: string;
|
|
100
82
|
defaultValue: string;
|
|
101
83
|
};
|
|
102
|
-
static readonly EnvFileFunc: {
|
|
103
|
-
name: string;
|
|
104
|
-
defaultValue: string;
|
|
105
|
-
};
|
|
106
84
|
static readonly KiotaIntegration: {
|
|
107
85
|
name: string;
|
|
108
86
|
defaultValue: string;
|
|
109
87
|
};
|
|
110
|
-
static readonly ApiPluginAAD: {
|
|
111
|
-
name: string;
|
|
112
|
-
defaultValue: string;
|
|
113
|
-
};
|
|
114
88
|
static readonly CEAEnabled: {
|
|
115
89
|
name: string;
|
|
116
90
|
defaultValue: string;
|
|
117
91
|
};
|
|
118
|
-
static readonly MultiTenant: {
|
|
119
|
-
name: string;
|
|
120
|
-
defaultValue: string;
|
|
121
|
-
};
|
|
122
92
|
}
|
|
123
|
-
export declare function isCopilotExtensionEnabled(): boolean;
|
|
124
93
|
export declare class FeatureFlagManager {
|
|
125
94
|
getBooleanValue(featureFlag: FeatureFlag): boolean;
|
|
126
95
|
setBooleanValue(featureFlag: FeatureFlag, value: boolean): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,uBAAuB;IAC/C,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAA0B;IACpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wBAAwB;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,mCAAmC;IACrE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,wBAAwB,sCAAsC;IAC9E,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAe;IACvC,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,aAAa,6BAA6B;IAC1D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,+BAA+B;IAC/D,MAAM,CAAC,QAAQ,CAAC,UAAU,yBAAyB;CACpD;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,SAAS;;;MAA8D;IACvF,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;MAA4D;IACpF,MAAM,CAAC,QAAQ,CAAC,UAAU;;;MAA8D;IACxF,MAAM,CAAC,QAAQ,CAAC,YAAY;;;MAG1B;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB;;;MAGhC;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB;;;MAGhC;IACF,MAAM,CAAC,QAAQ,CAAC,cAAc;;;MAAkE;IAChG,MAAM,CAAC,QAAQ,CAAC,eAAe;;;MAG7B;IACF,MAAM,CAAC,QAAQ,CAAC,wBAAwB;;;MAGtC;IACF,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;MAA6D;IACrF,MAAM,CAAC,QAAQ,CAAC,eAAe;;;MAG7B;IACF,MAAM,CAAC,QAAQ,CAAC,aAAa;;;MAG3B;IACF,MAAM,CAAC,QAAQ,CAAC,aAAa;;;MAG3B;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY;;;MAG1B;IACF,MAAM,CAAC,QAAQ,CAAC,gBAAgB;;;MAG9B;IACF,MAAM,CAAC,QAAQ,CAAC,UAAU;;;MAGxB;CACH;AAED,qBAAa,kBAAkB;IAC7B,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO;IAMlD,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAG/D,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM;IAGhD,IAAI,IAAI,WAAW,EAAE;IAGrB,WAAW,IAAI,MAAM,EAAE;CAKxB;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.featureFlagManager = exports.FeatureFlagManager = exports.
|
|
5
|
+
exports.featureFlagManager = exports.FeatureFlagManager = exports.FeatureFlags = exports.FeatureFlagName = exports.isFeatureFlagEnabled = void 0;
|
|
6
6
|
// Determine whether feature flag is enabled based on environment variable setting
|
|
7
7
|
function isFeatureFlagEnabled(featureFlagName, defaultValue = false) {
|
|
8
8
|
const flag = process.env[featureFlagName];
|
|
@@ -18,10 +18,7 @@ class FeatureFlagName {
|
|
|
18
18
|
}
|
|
19
19
|
exports.FeatureFlagName = FeatureFlagName;
|
|
20
20
|
FeatureFlagName.CLIDotNet = "TEAMSFX_CLI_DOTNET";
|
|
21
|
-
FeatureFlagName.OfficeAddin = "TEAMSFX_OFFICE_ADDIN";
|
|
22
21
|
FeatureFlagName.OfficeMetaOS = "TEAMSFX_OFFICE_METAOS";
|
|
23
|
-
FeatureFlagName.CopilotExtension = "DEVELOP_COPILOT_EXTENSION";
|
|
24
|
-
FeatureFlagName.CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
|
|
25
22
|
FeatureFlagName.SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
|
|
26
23
|
FeatureFlagName.TestTool = "TEAMSFX_TEST_TOOL";
|
|
27
24
|
FeatureFlagName.METestTool = "TEAMSFX_ME_TEST_TOOL";
|
|
@@ -36,26 +33,14 @@ FeatureFlagName.ShowDiagnostics = "TEAMSFX_SHOW_DIAGNOSTICS";
|
|
|
36
33
|
FeatureFlagName.TelemetryTest = "TEAMSFX_TELEMETRY_TEST";
|
|
37
34
|
FeatureFlagName.DevTunnelTest = "TEAMSFX_DEV_TUNNEL_TEST";
|
|
38
35
|
FeatureFlagName.SyncManifest = "TEAMSFX_SYNC_MANIFEST";
|
|
39
|
-
FeatureFlagName.EnvFileFunc = "TEAMSFX_ENV_FILE_FUNC";
|
|
40
36
|
FeatureFlagName.KiotaIntegration = "TEAMSFX_KIOTA_INTEGRATION";
|
|
41
|
-
FeatureFlagName.ApiPluginAAD = "TEAMSFX_API_PLUGIN_AAD";
|
|
42
37
|
FeatureFlagName.CEAEnabled = "TEAMSFX_CEA_ENABLED";
|
|
43
|
-
FeatureFlagName.MultiTenant = "TEAMSFX_MULTI_TENANT";
|
|
44
38
|
class FeatureFlags {
|
|
45
39
|
}
|
|
46
40
|
exports.FeatureFlags = FeatureFlags;
|
|
47
41
|
FeatureFlags.CLIDotNet = { name: FeatureFlagName.CLIDotNet, defaultValue: "false" };
|
|
48
|
-
FeatureFlags.CopilotExtension = {
|
|
49
|
-
name: FeatureFlagName.CopilotExtension,
|
|
50
|
-
defaultValue: "false",
|
|
51
|
-
};
|
|
52
|
-
FeatureFlags.CopilotPlugin = {
|
|
53
|
-
name: FeatureFlagName.CopilotPlugin,
|
|
54
|
-
defaultValue: "false",
|
|
55
|
-
}; // old feature flag. Keep it for backwards compatibility.
|
|
56
42
|
FeatureFlags.TestTool = { name: FeatureFlagName.TestTool, defaultValue: "true" };
|
|
57
43
|
FeatureFlags.METestTool = { name: FeatureFlagName.METestTool, defaultValue: "true" };
|
|
58
|
-
FeatureFlags.OfficeAddin = { name: FeatureFlagName.OfficeAddin, defaultValue: "false" };
|
|
59
44
|
FeatureFlags.OfficeMetaOS = {
|
|
60
45
|
name: FeatureFlagName.OfficeMetaOS,
|
|
61
46
|
defaultValue: "false",
|
|
@@ -75,7 +60,7 @@ FeatureFlags.ChatParticipant = {
|
|
|
75
60
|
};
|
|
76
61
|
FeatureFlags.ChatParticipantUIEntries = {
|
|
77
62
|
name: FeatureFlagName.ChatParticipantUIEntries,
|
|
78
|
-
defaultValue: "
|
|
63
|
+
defaultValue: "false",
|
|
79
64
|
};
|
|
80
65
|
FeatureFlags.SMEOAuth = { name: FeatureFlagName.SMEOAuth, defaultValue: "false" };
|
|
81
66
|
FeatureFlags.ShowDiagnostics = {
|
|
@@ -94,31 +79,14 @@ FeatureFlags.SyncManifest = {
|
|
|
94
79
|
name: FeatureFlagName.SyncManifest,
|
|
95
80
|
defaultValue: "false",
|
|
96
81
|
};
|
|
97
|
-
FeatureFlags.EnvFileFunc = {
|
|
98
|
-
name: FeatureFlagName.EnvFileFunc,
|
|
99
|
-
defaultValue: "true", // Set it to true for dogfooding.
|
|
100
|
-
};
|
|
101
82
|
FeatureFlags.KiotaIntegration = {
|
|
102
83
|
name: FeatureFlagName.KiotaIntegration,
|
|
103
84
|
defaultValue: "false",
|
|
104
85
|
};
|
|
105
|
-
FeatureFlags.ApiPluginAAD = {
|
|
106
|
-
name: FeatureFlagName.ApiPluginAAD,
|
|
107
|
-
defaultValue: "false",
|
|
108
|
-
};
|
|
109
86
|
FeatureFlags.CEAEnabled = {
|
|
110
87
|
name: FeatureFlagName.CEAEnabled,
|
|
111
88
|
defaultValue: "false",
|
|
112
89
|
};
|
|
113
|
-
FeatureFlags.MultiTenant = {
|
|
114
|
-
name: FeatureFlagName.MultiTenant,
|
|
115
|
-
defaultValue: "false",
|
|
116
|
-
};
|
|
117
|
-
function isCopilotExtensionEnabled() {
|
|
118
|
-
return (exports.featureFlagManager.getBooleanValue(FeatureFlags.CopilotExtension) ||
|
|
119
|
-
exports.featureFlagManager.getBooleanValue(FeatureFlags.CopilotPlugin));
|
|
120
|
-
}
|
|
121
|
-
exports.isCopilotExtensionEnabled = isCopilotExtensionEnabled;
|
|
122
90
|
class FeatureFlagManager {
|
|
123
91
|
getBooleanValue(featureFlag) {
|
|
124
92
|
return isFeatureFlagEnabled(featureFlag.name, featureFlag.defaultValue === "true" || featureFlag.defaultValue === "1");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kFAAkF;AAClF,SAAgB,oBAAoB,CAAC,eAAuB,EAAE,YAAY,GAAG,KAAK;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,YAAY,CAAC,CAAC,2EAA2E;KACjG;SAAM;QACL,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,6EAA6E;KACpI;AACH,CAAC;AAPD,oDAOC;AACD,MAAa,eAAe;;AAA5B,
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ declare class ProjectTypeChecker {
|
|
|
35
35
|
checkProjectType(projectPath: string): Promise<ProjectTypeResult>;
|
|
36
36
|
}
|
|
37
37
|
export declare function getCapabilities(manifest: any): string[];
|
|
38
|
+
export declare function IsDeclarativeAgentManifest(manifest: any): boolean;
|
|
38
39
|
export declare const projectTypeChecker: ProjectTypeChecker;
|
|
39
40
|
export {};
|
|
40
41
|
//# sourceMappingURL=projectTypeChecker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectTypeChecker.d.ts","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"AAUA,oBAAY,iBAAiB;IAC3B,mBAAmB,yBAAyB;IAC5C,WAAW,iBAAiB;CAC7B;AACD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,OAAO,oCAAoC,CAAC;AAEzD,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;CACjE;AAED,cAAM,kBAAkB;IAChB,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC7E,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAI;IAiCZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBjF,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAsDhF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAanF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO;IASpE,gBAAgB,CAAC,WAAW,EAAE,MAAM;CA6C3C;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAyCvD;AACD,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"projectTypeChecker.d.ts","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"AAUA,oBAAY,iBAAiB;IAC3B,mBAAmB,yBAAyB;IAC5C,WAAW,iBAAiB;CAC7B;AACD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,OAAO,oCAAoC,CAAC;AAEzD,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;CACjE;AAED,cAAM,kBAAkB;IAChB,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC7E,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAI;IAiCZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBjF,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAsDhF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAanF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO;IASpE,gBAAgB,CAAC,WAAW,EAAE,MAAM;CA6C3C;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAyCvD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAIjE;AACD,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.projectTypeChecker = exports.getCapabilities = exports.TeamsfxVersionState = exports.SPFxKey = exports.TeamsJsModule = exports.TeamsfxConfigType = void 0;
|
|
5
|
+
exports.projectTypeChecker = exports.IsDeclarativeAgentManifest = exports.getCapabilities = exports.TeamsfxVersionState = exports.SPFxKey = exports.TeamsJsModule = exports.TeamsfxConfigType = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
8
8
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
@@ -240,5 +240,10 @@ function getCapabilities(manifest) {
|
|
|
240
240
|
return capabilities;
|
|
241
241
|
}
|
|
242
242
|
exports.getCapabilities = getCapabilities;
|
|
243
|
+
function IsDeclarativeAgentManifest(manifest) {
|
|
244
|
+
var _a;
|
|
245
|
+
return !!(((_a = manifest.copilotAgents) === null || _a === void 0 ? void 0 : _a.declarativeAgents) && manifest.copilotAgents.declarativeAgents.length > 0);
|
|
246
|
+
}
|
|
247
|
+
exports.IsDeclarativeAgentManifest = IsDeclarativeAgentManifest;
|
|
243
248
|
exports.projectTypeChecker = new ProjectTypeChecker();
|
|
244
249
|
//# sourceMappingURL=projectTypeChecker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"projectTypeChecker.js","sourceRoot":"","sources":["../../src/common/projectTypeChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ interface SVMModel {
|
|
|
5
5
|
declare class SecretMasker {
|
|
6
6
|
model: SVMModel;
|
|
7
7
|
predict(features: number[]): number;
|
|
8
|
-
maskSecret(text: string, replace?: string): string;
|
|
8
|
+
maskSecret(text: string, replace?: string, whiteList?: string[]): string;
|
|
9
9
|
}
|
|
10
10
|
export declare const secretMasker: SecretMasker;
|
|
11
11
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masker.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":"AAYA,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,cAAM,YAAY;IAChB,KAAK,EAAE,QAAQ,CAQb;IAEF,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAWnC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"masker.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":"AAYA,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,cAAM,YAAY;IAChB,KAAK,EAAE,QAAQ,CAQb;IAEF,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAWnC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,SAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;CAaxE;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}
|
|
@@ -34,12 +34,12 @@ class SecretMasker {
|
|
|
34
34
|
// If the decision function value is positive, classify as 1 (secret), otherwise 0 (non-secret)
|
|
35
35
|
return decisionValue > 0 ? 1 : 0;
|
|
36
36
|
}
|
|
37
|
-
maskSecret(text, replace = "***") {
|
|
37
|
+
maskSecret(text, replace = "***", whiteList) {
|
|
38
38
|
const tokens = (0, feature_1.extractFeatures)(text);
|
|
39
39
|
for (const token of tokens) {
|
|
40
40
|
if (token.type === "splitter")
|
|
41
41
|
continue;
|
|
42
|
-
if (
|
|
42
|
+
if (whiteList && whiteList.includes(token.token))
|
|
43
43
|
continue;
|
|
44
44
|
const prediction = this.predict(token.vector);
|
|
45
45
|
token.label = prediction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masker.js","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,uCAA4C;AAE5C,MAAM,UAAU,GAAG;IACjB,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,YAAY;IACZ,mBAAmB;CACpB,CAAC;AAOF,MAAM,YAAY;IAAlB;QACE,UAAK,GAAa;YAChB,KAAK,EAAE;gBACL;oBACE,kBAAkB,EAAE,CAAC,iBAAiB,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,GAAG;oBACpF,iBAAiB;iBAClB;aACF;YACD,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;SAChC,CAAC;IA0BJ,CAAC;IAxBC,OAAO,CAAC,QAAkB;QACxB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,sEAAsE;QACtE,IAAI,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B;QAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,aAAa,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,+CAA+C;QAC/C,+FAA+F;QAC/F,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,UAAU,CAAC,IAAY,EAAE,OAAO,GAAG,KAAK;
|
|
1
|
+
{"version":3,"file":"masker.js","sourceRoot":"","sources":["../../../src/common/secretmasker/masker.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,uCAA4C;AAE5C,MAAM,UAAU,GAAG;IACjB,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,YAAY;IACZ,mBAAmB;CACpB,CAAC;AAOF,MAAM,YAAY;IAAlB;QACE,UAAK,GAAa;YAChB,KAAK,EAAE;gBACL;oBACE,kBAAkB,EAAE,CAAC,iBAAiB,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,GAAG;oBACpF,iBAAiB;iBAClB;aACF;YACD,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;SAChC,CAAC;IA0BJ,CAAC;IAxBC,OAAO,CAAC,QAAkB;QACxB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,sEAAsE;QACtE,IAAI,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B;QAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,aAAa,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,+CAA+C;QAC/C,+FAA+F;QAC/F,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,UAAU,CAAC,IAAY,EAAE,OAAO,GAAG,KAAK,EAAE,SAAoB;QAC5D,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,SAAS;YACxC,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;YAC/C,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC;YACzB,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC;aACvB;SACF;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
@@ -17,7 +17,7 @@ function maskSecret(inputText, option) {
|
|
|
17
17
|
return "";
|
|
18
18
|
const replace = (option === null || option === void 0 ? void 0 : option.replace) || SECRET_REPLACE;
|
|
19
19
|
let output = maskSecretFromEnv(inputText);
|
|
20
|
-
output = masker_1.secretMasker.maskSecret(output, replace);
|
|
20
|
+
output = masker_1.secretMasker.maskSecret(output, replace, option === null || option === void 0 ? void 0 : option.whiteList);
|
|
21
21
|
return output;
|
|
22
22
|
}
|
|
23
23
|
exports.maskSecret = maskSecret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../src/common/stringUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAiC;AACjC,+DAAyC;AACzC,6BAA0B;AAC1B,mDAA6B;AAC7B,4CAA+D;AAC/D,mDAAqD;AACrD,kDAAqD;AAErD,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAQ3C,SAAgB,UAAU,CAAC,SAAkB,EAAE,MAA0B;IACvE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,cAAc,CAAC;IAClD,IAAI,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,GAAG,qBAAY,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../src/common/stringUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": "~4.3",
|
|
3
|
-
"localVersion": "4.3.
|
|
3
|
+
"localVersion": "4.3.3-alpha.0b985f7da.0",
|
|
4
4
|
"tagPrefix": "templates@",
|
|
5
5
|
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
|
|
6
6
|
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare class ActionInjector {
|
|
2
|
-
static hasActionWithName(provisionNode: any, action: string, name: string): any;
|
|
2
|
+
static hasActionWithName(provisionNode: any, action: string, name: string, specRelativePath: string): any;
|
|
3
3
|
static getTeamsAppIdEnvName(provisionNode: any): string | undefined;
|
|
4
4
|
static generateAuthAction(actionName: string, authName: string, teamsAppIdEnvName: string, specRelativePath: string, envName: string, flow?: string): any;
|
|
5
5
|
static injectCreateOAuthAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean): Promise<AuthActionInjectResult | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AAQA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AAQA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,CACtB,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,GACvB,GAAG;IAWN,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAUnE,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GACZ,GAAG;WAwBO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WA4EjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IA0E9C,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;CASzF;AAED,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C"}
|
|
@@ -9,8 +9,11 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
|
9
9
|
const yaml_1 = require("yaml");
|
|
10
10
|
const common_1 = require("../../error/common");
|
|
11
11
|
class ActionInjector {
|
|
12
|
-
static hasActionWithName(provisionNode, action, name) {
|
|
13
|
-
const hasAuthAction = provisionNode.items.some((item) =>
|
|
12
|
+
static hasActionWithName(provisionNode, action, name, specRelativePath) {
|
|
13
|
+
const hasAuthAction = provisionNode.items.some((item) => item.get("uses") === action &&
|
|
14
|
+
!!item.get("with") &&
|
|
15
|
+
item.get("with").get("name") === name &&
|
|
16
|
+
item.get("with").get("apiSpecPath") === specRelativePath);
|
|
14
17
|
return hasAuthAction;
|
|
15
18
|
}
|
|
16
19
|
static getTeamsAppIdEnvName(provisionNode) {
|
|
@@ -51,7 +54,7 @@ class ActionInjector {
|
|
|
51
54
|
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
52
55
|
const provisionNode = document.get("provision");
|
|
53
56
|
if (provisionNode) {
|
|
54
|
-
const hasOAuthAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName);
|
|
57
|
+
const hasOAuthAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName, specRelativePath);
|
|
55
58
|
if (!hasOAuthAction || forceToAddNew) {
|
|
56
59
|
provisionNode.items = provisionNode.items.filter((item) => {
|
|
57
60
|
const uses = item.get("uses");
|
|
@@ -59,7 +62,10 @@ class ActionInjector {
|
|
|
59
62
|
return uses;
|
|
60
63
|
}
|
|
61
64
|
else {
|
|
62
|
-
return uses
|
|
65
|
+
return (uses != actionName ||
|
|
66
|
+
!item.get("with") ||
|
|
67
|
+
item.get("with").get("apiSpecPath") !== specRelativePath ||
|
|
68
|
+
item.get("with").get("name") !== authName);
|
|
63
69
|
}
|
|
64
70
|
});
|
|
65
71
|
const existingConfigurationIdEnvNames = provisionNode.items
|
|
@@ -71,7 +77,7 @@ class ActionInjector {
|
|
|
71
77
|
.filter((item) => {
|
|
72
78
|
return !!item;
|
|
73
79
|
});
|
|
74
|
-
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}
|
|
80
|
+
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
|
|
75
81
|
const registrationIdEnvName = this.findNextAvailableEnvName(defaultEnvName, existingConfigurationIdEnvNames);
|
|
76
82
|
const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
|
|
77
83
|
if (teamsAppIdEnvName) {
|
|
@@ -102,7 +108,7 @@ class ActionInjector {
|
|
|
102
108
|
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
103
109
|
const provisionNode = document.get("provision");
|
|
104
110
|
if (provisionNode) {
|
|
105
|
-
const hasApiKeyAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName);
|
|
111
|
+
const hasApiKeyAction = ActionInjector.hasActionWithName(provisionNode, actionName, authName, specRelativePath);
|
|
106
112
|
if (!hasApiKeyAction || forceToAddNew) {
|
|
107
113
|
provisionNode.items = provisionNode.items.filter((item) => {
|
|
108
114
|
const uses = item.get("uses");
|
|
@@ -110,7 +116,10 @@ class ActionInjector {
|
|
|
110
116
|
return uses;
|
|
111
117
|
}
|
|
112
118
|
else {
|
|
113
|
-
return uses
|
|
119
|
+
return (uses != actionName ||
|
|
120
|
+
!item.get("with") ||
|
|
121
|
+
item.get("with").get("apiSpecPath") !== specRelativePath ||
|
|
122
|
+
item.get("with").get("name") !== authName);
|
|
114
123
|
}
|
|
115
124
|
});
|
|
116
125
|
const existingRegistrationIdEnvNames = provisionNode.items
|
|
@@ -123,7 +132,7 @@ class ActionInjector {
|
|
|
123
132
|
return !!item;
|
|
124
133
|
});
|
|
125
134
|
const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
|
|
126
|
-
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}
|
|
135
|
+
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
|
|
127
136
|
const registrationIdEnvName = this.findNextAvailableEnvName(defaultEnvName, existingRegistrationIdEnvNames);
|
|
128
137
|
if (teamsAppIdEnvName) {
|
|
129
138
|
const index = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":"AAGA,OAAY,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAK5C,aAAK,OAAO,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":"AAGA,OAAY,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAK5C,aAAK,OAAO,GAAG,MAAM,CAAC;AAatB,qBAAa,SAAS;IACpB,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;;IASpD,OAAO,CAAC,WAAW;IAWnB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,iBAAiB,IAAI,MAAM,EAAE;IAI7B,OAAO,CAAC,sBAAsB;IAI9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;CAOlE"}
|
|
@@ -8,7 +8,17 @@ const ajv_1 = tslib_1.__importDefault(require("ajv"));
|
|
|
8
8
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
9
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
10
10
|
const folder_1 = require("../../folder");
|
|
11
|
-
const supportedVersions = [
|
|
11
|
+
const supportedVersions = [
|
|
12
|
+
"1.0.0",
|
|
13
|
+
"1.1.0",
|
|
14
|
+
"v1.2",
|
|
15
|
+
"v1.3",
|
|
16
|
+
"v1.4",
|
|
17
|
+
"v1.5",
|
|
18
|
+
"v1.6",
|
|
19
|
+
"v1.7",
|
|
20
|
+
"v1.8",
|
|
21
|
+
];
|
|
12
22
|
class Validator {
|
|
13
23
|
constructor() {
|
|
14
24
|
this.impl = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF,MAAa,SAAS;IAGpB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC;IAEO,WAAW,CAAC,OAAe;QACjC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,GAAE,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,kBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB;QACf,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,GAA4B,EAAE,OAAgB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;CACF;AAxCD,8BAwCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/coordinator/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,qBAAqB,EAErB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAiC3C,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,4BAA4B,CAAC;AAKzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM/D,OAAO,EAAE,aAAa,EAAqB,MAAM,iCAAiC,CAAC;AAqBnF,cAAM,WAAW;IAUT,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAkI1C,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAmC/E,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAY7B,iBAAiB,CACrB,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CACR,MAAM,CACJ;QACE,cAAc,EAAE,OAAO,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;QACvB,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,8BAA8B,CAAC,EAAE,MAAM,CAAC;KACzC,EACD,OAAO,CACR,CACF;IAwDK,sBAAsB,CAC1B,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/coordinator/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,qBAAqB,EAErB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAiC3C,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,4BAA4B,CAAC;AAKzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM/D,OAAO,EAAE,aAAa,EAAqB,MAAM,iCAAiC,CAAC;AAqBnF,cAAM,WAAW;IAUT,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAkI1C,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAmC/E,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAY7B,iBAAiB,CACrB,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CACR,MAAM,CACJ;QACE,cAAc,EAAE,OAAO,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;QACvB,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,8BAA8B,CAAC,EAAE,MAAM,CAAC;KACzC,EACD,OAAO,CACR,CACF;IAwDK,sBAAsB,CAC1B,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAkChC,SAAS,CACb,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAoR9C,oBAAoB,CAClB,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,EAChD,YAAY,EAAE,MAAM,GACnB,CAAC,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;IA+BrC,MAAM,CACV,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAmExC,OAAO,CACX,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IA0DxC,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CA2BvC;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
|
|
@@ -62,7 +62,7 @@ class Coordinator {
|
|
|
62
62
|
inputs[constants_2.QuestionNames.ApiPluginType] === constants_2.ApiPluginStartOptions.apiSpec().id &&
|
|
63
63
|
!inputs[constants_2.QuestionNames.ApiPluginManifestPath] &&
|
|
64
64
|
(inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.apiPlugin().id ||
|
|
65
|
-
inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.
|
|
65
|
+
inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.declarativeAgent().id)) {
|
|
66
66
|
const lastCommand = inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.apiPlugin().id
|
|
67
67
|
? constants_3.KiotaLastCommands.createPluginWithManifest
|
|
68
68
|
: constants_3.KiotaLastCommands.createDeclarativeCopilotWithManifest;
|
|
@@ -260,6 +260,7 @@ class Coordinator {
|
|
|
260
260
|
return (0, teamsfx_api_1.ok)(res);
|
|
261
261
|
}
|
|
262
262
|
async preCheckYmlAndEnvForVS(ctx, inputs) {
|
|
263
|
+
var _a, _b, _c;
|
|
263
264
|
const templatePath = inputs["workflowFilePath"] || pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
|
|
264
265
|
const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
|
|
265
266
|
if (maybeProjectModel.isErr()) {
|
|
@@ -275,6 +276,15 @@ class Coordinator {
|
|
|
275
276
|
if (unresolvedPlaceholders.length > 0) {
|
|
276
277
|
return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError(unresolvedPlaceholders.join(",")));
|
|
277
278
|
}
|
|
279
|
+
for (const action of (_b = (_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs) !== null && _b !== void 0 ? _b : []) {
|
|
280
|
+
if (action.uses === "teamsApp/create") {
|
|
281
|
+
const teamsAppIdKeyName = ((_c = action.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.teamsAppId) || "TEAMS_APP_ID";
|
|
282
|
+
if (!process.env[teamsAppIdKeyName]) {
|
|
283
|
+
return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError(unresolvedPlaceholders.join(",")));
|
|
284
|
+
}
|
|
285
|
+
break;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
278
288
|
return (0, teamsfx_api_1.ok)(undefined);
|
|
279
289
|
}
|
|
280
290
|
async provision(ctx, inputs) {
|
|
@@ -564,8 +574,10 @@ class Coordinator {
|
|
|
564
574
|
let hasError = false;
|
|
565
575
|
try {
|
|
566
576
|
const steps = projectModel.deploy.driverDefs.length;
|
|
567
|
-
|
|
568
|
-
|
|
577
|
+
if (inputs.platform !== teamsfx_api_1.Platform.CLI) {
|
|
578
|
+
ctx.progressBar = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar((0, localizeUtils_1.getLocalizedString)("core.progress.deploy"), steps);
|
|
579
|
+
await ((_b = ctx.progressBar) === null || _b === void 0 ? void 0 : _b.start());
|
|
580
|
+
}
|
|
569
581
|
const maybeDescription = summaryReporter.getLifecycleDescriptions();
|
|
570
582
|
if (maybeDescription.isErr()) {
|
|
571
583
|
return (0, teamsfx_api_1.err)(maybeDescription.error);
|
|
@@ -591,7 +603,9 @@ class Coordinator {
|
|
|
591
603
|
finally {
|
|
592
604
|
const summary = summaryReporter.getLifecycleSummary();
|
|
593
605
|
ctx.logProvider.info(`Execution summary:${os_1.EOL}${os_1.EOL}${summary}${os_1.EOL}`);
|
|
594
|
-
|
|
606
|
+
if (inputs.platform !== teamsfx_api_1.Platform.CLI) {
|
|
607
|
+
await ((_d = ctx.progressBar) === null || _d === void 0 ? void 0 : _d.end(!hasError));
|
|
608
|
+
}
|
|
595
609
|
}
|
|
596
610
|
}
|
|
597
611
|
else {
|