@microsoft/teamsfx-core 2.0.4-alpha.b24fa00bf.0 → 2.0.4-alpha.b52d172b5.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/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +1 -5
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +20 -12
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/samples.d.ts +3 -0
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +5 -2
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +6 -2
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +9 -1
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +4 -1
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +3 -3
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +26 -13
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +1 -0
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +13 -12
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +4 -3
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +106 -39
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +1 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +5 -0
- package/build/common/tools.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +3 -2
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constants.d.ts +1 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +1 -0
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +1 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +7 -7
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +0 -2
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +6 -6
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts +5 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts.map +1 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +21 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -0
- package/build/component/driver/aad/update.d.ts +0 -2
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +2 -6
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +7 -3
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +10 -2
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +9 -9
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +26 -4
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +2 -2
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +15 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +2 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +14 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/feature/collaboration.js +4 -4
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +17 -0
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +3 -0
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +32 -6
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +4 -4
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +9 -5
- package/build/core/FxCore.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +10 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +4 -4
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +19 -4
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +3 -3
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +45 -20
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +15 -2
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +4 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +7 -2
- package/build/error/script.js.map +1 -1
- package/build/error/types.d.ts +6 -0
- package/build/error/types.d.ts.map +1 -0
- package/build/error/types.js +12 -0
- package/build/error/types.js.map +1 -0
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +6 -0
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +9 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +20 -7
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +95 -96
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +1 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +2 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +1 -1
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +7 -10
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +1 -1
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +2 -2
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +2 -2
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/options/PreviewTeamsAppOptions.js +1 -1
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.js +5 -3
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -1
- package/build/question/options/ValidateTeamsAppOptions.js +2 -2
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +6 -3
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +0 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +0 -1
- package/build/question/questionNames.js.map +1 -1
- package/package.json +5 -3
- package/resource/package.nls.cs.json +83 -23
- package/resource/package.nls.de.json +81 -21
- package/resource/package.nls.es.json +83 -23
- package/resource/package.nls.fr.json +82 -22
- package/resource/package.nls.it.json +82 -22
- package/resource/package.nls.ja.json +83 -23
- package/resource/package.nls.json +11 -5
- package/resource/package.nls.ko.json +82 -22
- package/resource/package.nls.pl.json +83 -23
- package/resource/package.nls.pt-BR.json +84 -24
- package/resource/package.nls.ru.json +84 -24
- package/resource/package.nls.tr.json +82 -22
- package/resource/package.nls.zh-Hans.json +82 -22
- package/resource/package.nls.zh-Hant.json +82 -22
- package/resource/package.nls.zh-cn.json +82 -22
- package/resource/package.nls.zh-tw.json +82 -22
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -18,6 +18,8 @@ const componentError_1 = require("../../../../error/componentError");
|
|
|
18
18
|
const azureSdkErrorHandler_1 = require("../../../../utils/azureSdkErrorHandler");
|
|
19
19
|
const localizeUtils_1 = require("../../../../../common/localizeUtils");
|
|
20
20
|
const error_1 = require("../../../../../error");
|
|
21
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
22
|
+
const globalVars_1 = require("../../../../../core/globalVars");
|
|
21
23
|
class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
22
24
|
constructor() {
|
|
23
25
|
super(...arguments);
|
|
@@ -72,7 +74,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
72
74
|
this.logger.verbose(`Check deploy status failed with error: ${JSON.stringify(e, Object.getOwnPropertyNames(e), 2)}`);
|
|
73
75
|
if (axios_1.default.isAxiosError(e)) {
|
|
74
76
|
logger.error(`Check deploy status failed with response status code: ${(_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : "NA"}, message: ${JSON.stringify((_c = e.response) === null || _c === void 0 ? void 0 : _c.data)}`);
|
|
75
|
-
throw new error_1.CheckDeploymentStatusError(location,
|
|
77
|
+
throw new error_1.CheckDeploymentStatusError(location, e, this.helpLink, `status code: ${(_e = (_d = e.response) === null || _d === void 0 ? void 0 : _d.status) !== null && _e !== void 0 ? _e : "NA"}, message: ${JSON.stringify((_f = e.response) === null || _f === void 0 ? void 0 : _f.data)}`);
|
|
76
78
|
}
|
|
77
79
|
throw new error_1.CheckDeploymentStatusError(location, e, this.helpLink);
|
|
78
80
|
}
|
|
@@ -164,6 +166,12 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
164
166
|
}
|
|
165
167
|
}
|
|
166
168
|
}
|
|
167
|
-
exports.AzureDeployImpl = AzureDeployImpl;
|
|
168
169
|
AzureDeployImpl.AXIOS_INSTANCE = axios_1.default.create();
|
|
170
|
+
tslib_1.__decorate([
|
|
171
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureZipDeployImpl" })]),
|
|
172
|
+
tslib_1.__metadata("design:type", Function),
|
|
173
|
+
tslib_1.__metadata("design:paramtypes", [String, Object, Object]),
|
|
174
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
175
|
+
], AzureDeployImpl.prototype, "checkDeployStatus", null);
|
|
176
|
+
exports.AzureDeployImpl = AzureDeployImpl;
|
|
169
177
|
//# sourceMappingURL=azureDeployImpl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AASlC,qDAA4D;AAE5D,qDAAkD;AAClD,yCAAmC;AACnC,0EAAoD;AACpD,wEAAmF;AACnF,0DAAyC;AACzC,uDAA0D;AAC1D,wEAAqE;AACrE,qFAGkD;AAGlD,qDAA+B;AAC/B,qEAAqE;AACrE,iFAA4E;AAC5E,uEAA2F;AAC3F,gDAI8B;
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export declare class ScriptDriver implements StepDriver {
|
|
|
21
21
|
}
|
|
22
22
|
export declare const scriptDriver: ScriptDriver;
|
|
23
23
|
export declare function executeCommand(command: string, projectPath: string, logProvider: LogProvider, ui: DriverContext["ui"], workingDirectory?: string, env?: NodeJS.ProcessEnv, shell?: string, timeout?: number, redirectTo?: string): Promise<Result<[string, DotenvOutput], FxError>>;
|
|
24
|
-
export declare function getStderrHandler(logProvider: LogProvider, systemEncoding: string, stderrStrings: string[], dataHandler: (data: string) =>
|
|
24
|
+
export declare function getStderrHandler(logProvider: LogProvider, systemEncoding: string, stderrStrings: string[], dataHandler: (data: string) => void): (data: Buffer) => void;
|
|
25
25
|
export declare function bufferToString(data: Buffer, systemEncoding: string): string;
|
|
26
26
|
export declare function convertScriptErrorToFxError(error: child_process.ExecException, run: string): ScriptTimeoutError | ScriptExecutionError;
|
|
27
27
|
export declare function parseSetOutputCommand(stdout: string): DotenvOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAI1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAkElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAI1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAkElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -100,16 +100,16 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
100
100
|
resolve(teamsfx_api_1.ok([outputString, outputObject]));
|
|
101
101
|
}
|
|
102
102
|
});
|
|
103
|
-
const dataHandler =
|
|
103
|
+
const dataHandler = (data) => {
|
|
104
|
+
allOutputStrings.push(data);
|
|
104
105
|
if (appendFile) {
|
|
105
|
-
|
|
106
|
+
fs_extra_1.default.appendFileSync(appendFile, data);
|
|
106
107
|
}
|
|
107
|
-
allOutputStrings.push(data);
|
|
108
108
|
};
|
|
109
|
-
(_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data",
|
|
109
|
+
(_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
|
|
110
110
|
const str = bufferToString(data, systemEncoding);
|
|
111
111
|
logProvider.info(` [script action stdout] ${maskSecretValues(str)}`);
|
|
112
|
-
|
|
112
|
+
dataHandler(str);
|
|
113
113
|
});
|
|
114
114
|
const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
|
|
115
115
|
(_b = cp.stderr) === null || _b === void 0 ? void 0 : _b.on("data", handler);
|
|
@@ -117,10 +117,10 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
117
117
|
}
|
|
118
118
|
exports.executeCommand = executeCommand;
|
|
119
119
|
function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
|
|
120
|
-
return
|
|
120
|
+
return (data) => {
|
|
121
121
|
const str = bufferToString(data, systemEncoding);
|
|
122
122
|
logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
|
|
123
|
-
|
|
123
|
+
dataHandler(str);
|
|
124
124
|
stderrStrings.push(str);
|
|
125
125
|
};
|
|
126
126
|
}
|
|
@@ -134,10 +134,10 @@ function bufferToString(data, systemEncoding) {
|
|
|
134
134
|
exports.bufferToString = bufferToString;
|
|
135
135
|
function convertScriptErrorToFxError(error, run) {
|
|
136
136
|
if (error.killed) {
|
|
137
|
-
return new script_1.ScriptTimeoutError(run);
|
|
137
|
+
return new script_1.ScriptTimeoutError(run, error);
|
|
138
138
|
}
|
|
139
139
|
else {
|
|
140
|
-
return new script_1.ScriptExecutionError(run, error.message);
|
|
140
|
+
return new script_1.ScriptExecutionError(run, error.message, error);
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare class CreateAppPackageDriver implements StepDriver {
|
|
|
9
9
|
readonly progressTitle: string;
|
|
10
10
|
execute(args: CreateAppPackageArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
11
11
|
build(args: CreateAppPackageArgs, context: WrapDriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
12
|
+
private static expandOpenAPIEnvVars;
|
|
12
13
|
private validateArgs;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=createAppPackage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAY,MAAM,EAAW,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAY,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAapF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAKzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBA4K3B,oBAAoB;IAmBzC,OAAO,CAAC,YAAY;CAuBrB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
|
+
var CreateAppPackageDriver_1;
|
|
4
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
6
|
exports.CreateAppPackageDriver = exports.actionName = void 0;
|
|
6
7
|
const tslib_1 = require("tslib");
|
|
@@ -18,8 +19,10 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
|
|
|
18
19
|
const wrapUtil_1 = require("../util/wrapUtil");
|
|
19
20
|
const constants_1 = require("./constants");
|
|
20
21
|
const ManifestUtils_1 = require("./utils/ManifestUtils");
|
|
22
|
+
const common_2 = require("../../utils/common");
|
|
23
|
+
const telemetry_1 = require("./utils/telemetry");
|
|
21
24
|
exports.actionName = "teamsApp/zipAppPackage";
|
|
22
|
-
let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
25
|
+
let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDriver {
|
|
23
26
|
constructor() {
|
|
24
27
|
this.description = localizeUtils_1.getLocalizedString("driver.teamsApp.description.createAppPackageDriver");
|
|
25
28
|
this.progressTitle = localizeUtils_1.getLocalizedString("plugins.appstudio.createPackage.progressBar.message");
|
|
@@ -112,8 +115,14 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
112
115
|
if (!(await fs_extra_1.default.pathExists(apiSpecificationFile))) {
|
|
113
116
|
return teamsfx_api_1.err(new common_1.FileNotFoundError(exports.actionName, apiSpecificationFile, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
|
|
114
117
|
}
|
|
115
|
-
const
|
|
116
|
-
|
|
118
|
+
const expandedEnvVarResult = await CreateAppPackageDriver_1.expandOpenAPIEnvVars(apiSpecificationFile, context);
|
|
119
|
+
if (expandedEnvVarResult.isErr()) {
|
|
120
|
+
return teamsfx_api_1.err(expandedEnvVarResult.error);
|
|
121
|
+
}
|
|
122
|
+
const openAPIContent = expandedEnvVarResult.value;
|
|
123
|
+
const attr = await fs_extra_1.default.stat(apiSpecificationFile);
|
|
124
|
+
zip.addFile(manifest.composeExtensions[0].apiSpecificationFile, Buffer.from(openAPIContent), "", attr.mode);
|
|
125
|
+
// zip.addLocalFile(apiSpecificationFile, dir === "." ? "" : dir);
|
|
117
126
|
if (manifest.composeExtensions[0].commands.length > 0) {
|
|
118
127
|
for (const command of manifest.composeExtensions[0].commands) {
|
|
119
128
|
if (command.apiResponseRenderingTemplateFile) {
|
|
@@ -142,6 +151,19 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
142
151
|
context.logProvider.info(builtSuccess);
|
|
143
152
|
return teamsfx_api_1.ok(new Map());
|
|
144
153
|
}
|
|
154
|
+
static async expandOpenAPIEnvVars(openAPISpecPath, ctx) {
|
|
155
|
+
const content = await fs_extra_1.default.readFile(openAPISpecPath, "utf8");
|
|
156
|
+
const vars = common_2.getEnvironmentVariables(content);
|
|
157
|
+
ctx.addTelemetryProperties({
|
|
158
|
+
[telemetry_1.TelemetryPropertyKey.customizedOpenAPIKeys]: vars.join(";"),
|
|
159
|
+
});
|
|
160
|
+
const result = common_2.expandEnvironmentVariable(content);
|
|
161
|
+
const notExpandedVars = common_2.getEnvironmentVariables(result);
|
|
162
|
+
if (notExpandedVars.length > 0) {
|
|
163
|
+
return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", notExpandedVars.join(","), openAPISpecPath));
|
|
164
|
+
}
|
|
165
|
+
return teamsfx_api_1.ok(result);
|
|
166
|
+
}
|
|
145
167
|
validateArgs(args) {
|
|
146
168
|
const invalidParams = [];
|
|
147
169
|
if (!args || !args.manifestPath) {
|
|
@@ -170,7 +192,7 @@ tslib_1.__decorate([
|
|
|
170
192
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
171
193
|
tslib_1.__metadata("design:returntype", Promise)
|
|
172
194
|
], CreateAppPackageDriver.prototype, "build", null);
|
|
173
|
-
CreateAppPackageDriver = tslib_1.__decorate([
|
|
195
|
+
CreateAppPackageDriver = CreateAppPackageDriver_1 = tslib_1.__decorate([
|
|
174
196
|
typedi_1.Service(exports.actionName)
|
|
175
197
|
], CreateAppPackageDriver);
|
|
176
198
|
exports.CreateAppPackageDriver = CreateAppPackageDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import { MessagingExtensionMessageHandler } from "./messagingExtensionMessageHan
|
|
|
3
3
|
export interface MessagingExtension {
|
|
4
4
|
objectId?: string;
|
|
5
5
|
botId?: string;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
messagingExtensionServiceType?: string;
|
|
7
|
+
apiSpecificationFilePath?: string;
|
|
8
8
|
canUpdateConfiguration: boolean;
|
|
9
9
|
commands: MessagingExtensionCommand[];
|
|
10
10
|
messageHandlers: MessagingExtensionMessageHandler[];
|
package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messagingExtension.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,
|
|
1
|
+
{"version":3,"file":"messagingExtension.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,EAAE,yBAAyB,EAAE,CAAC;IACtC,eAAe,EAAE,gCAAgC,EAAE,CAAC;CACrD"}
|
package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts
CHANGED
|
@@ -10,6 +10,6 @@ export interface MessagingExtensionCommand {
|
|
|
10
10
|
context: string[];
|
|
11
11
|
parameters: MessagingExtensionCommandParameter[];
|
|
12
12
|
taskInfo?: MessagingExtensionCommandTaskInfo;
|
|
13
|
-
|
|
13
|
+
apiResponseRenderingTemplateFilePath?: string;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=messagingExtensionCommand.d.ts.map
|
package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messagingExtensionCommand.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,kCAAkC,EAAE,CAAC;IACjD,QAAQ,CAAC,EAAE,iCAAiC,CAAC;IAC7C
|
|
1
|
+
{"version":3,"file":"messagingExtensionCommand.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,kCAAkC,EAAE,CAAC;IACjD,QAAQ,CAAC,EAAE,iCAAiC,CAAC;IAC7C,oCAAoC,CAAC,EAAE,MAAM,CAAC;CAC/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAKjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAKjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;AAgC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIxD,qBAAa,aAAa;IAClB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAKhF,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAiB1F,iBAAiB,CACrB,WAAW,EAAE,gBAAgB,EAC7B,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAOtC,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAK9C,eAAe,CACnB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAyItC,sBAAsB,CACpB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO;IAkBH,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAiB5D;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAUtD,aAAa,CACjB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAC3B,uBAAuB,UAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IA6C7C,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC;CAezF;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
|
|
@@ -22,6 +22,8 @@ const constants_2 = require("../constants");
|
|
|
22
22
|
const errors_1 = require("../errors");
|
|
23
23
|
const results_1 = require("../results");
|
|
24
24
|
const telemetry_1 = require("./telemetry");
|
|
25
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
26
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
25
27
|
class ManifestUtils {
|
|
26
28
|
async readAppManifest(projectPath) {
|
|
27
29
|
const filePath = this.getTeamsAppManifestPath(projectPath);
|
|
@@ -36,8 +38,13 @@ class ManifestUtils {
|
|
|
36
38
|
let content = await fs_extra_1.default.readFile(manifestTemplatePath, { encoding: "utf-8" });
|
|
37
39
|
content = strip_bom_1.default(content);
|
|
38
40
|
const contentV3 = migrate_1.convertManifestTemplateToV3(content);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
try {
|
|
42
|
+
const manifest = JSON.parse(contentV3);
|
|
43
|
+
return teamsfx_api_1.ok(manifest);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
return teamsfx_api_1.err(new common_1.JSONSyntaxError(manifestTemplatePath, e, "ManifestUtils"));
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
async _writeAppManifest(appManifest, manifestTemplatePath) {
|
|
43
50
|
const content = JSON.stringify(appManifest, undefined, 4);
|
|
@@ -278,6 +285,12 @@ class ManifestUtils {
|
|
|
278
285
|
return teamsfx_api_1.ok(manifest);
|
|
279
286
|
}
|
|
280
287
|
}
|
|
288
|
+
tslib_1.__decorate([
|
|
289
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "ManifestUtils" })]),
|
|
290
|
+
tslib_1.__metadata("design:type", Function),
|
|
291
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
|
292
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
293
|
+
], ManifestUtils.prototype, "_readAppManifest", null);
|
|
281
294
|
exports.ManifestUtils = ManifestUtils;
|
|
282
295
|
exports.manifestUtils = new ManifestUtils();
|
|
283
296
|
//# sourceMappingURL=ManifestUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAUgC;AAChC,8DAA6B;AAC7B,gEAA0B;AAC1B,mCAAmC;AACnC,mDAA6B;AAC7B,4BAA0B;AAC1B,kEAAiC;AACjC,+BAA0B;AAC1B,0EAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare enum TelemetryPropertyKey {
|
|
|
11
11
|
tenantId = "tenant-id",
|
|
12
12
|
publishedAppId = "published-app-id",
|
|
13
13
|
customizedKeys = "customized-manifest-keys",
|
|
14
|
+
customizedOpenAPIKeys = "customized-openapi-keys",
|
|
14
15
|
validationErrors = "validation-errors",
|
|
15
16
|
validationWarnings = "validation-warnings",
|
|
16
17
|
OverwriteIfAppAlreadyExists = "overwrite-if-app-already-exists",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAAC;WAEtB,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa;WAIjC,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAY5B,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAS5B,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAwB1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC"}
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,qBAAqB,4BAA4B;IACjD,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAAC;WAEtB,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa;WAIjC,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAY5B,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAS5B,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAwB1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC"}
|
|
@@ -17,6 +17,7 @@ var TelemetryPropertyKey;
|
|
|
17
17
|
TelemetryPropertyKey["tenantId"] = "tenant-id";
|
|
18
18
|
TelemetryPropertyKey["publishedAppId"] = "published-app-id";
|
|
19
19
|
TelemetryPropertyKey["customizedKeys"] = "customized-manifest-keys";
|
|
20
|
+
TelemetryPropertyKey["customizedOpenAPIKeys"] = "customized-openapi-keys";
|
|
20
21
|
TelemetryPropertyKey["validationErrors"] = "validation-errors";
|
|
21
22
|
TelemetryPropertyKey["validationWarnings"] = "validation-warnings";
|
|
22
23
|
TelemetryPropertyKey["OverwriteIfAppAlreadyExists"] = "overwrite-if-app-already-exists";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAyE;AAEzE,4CAAyC;AAEzC,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,9 +84,10 @@ function needBotCode(appDefinition) {
|
|
|
84
84
|
}
|
|
85
85
|
exports.needBotCode = needBotCode;
|
|
86
86
|
function isApiBasedMessageExtension(appDefinition) {
|
|
87
|
+
var _a;
|
|
87
88
|
return (!!appDefinition.messagingExtensions &&
|
|
88
89
|
appDefinition.messagingExtensions.length > 0 &&
|
|
89
|
-
appDefinition.messagingExtensions[0].
|
|
90
|
+
((_a = appDefinition.messagingExtensions[0].messagingExtensionServiceType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "apibased");
|
|
90
91
|
}
|
|
91
92
|
function containsUnsupportedFeature(appDefinition) {
|
|
92
93
|
var _a, _b, _c, _d, _e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAkC;AAClC,gEAAgC;AAKhC,SAAgB,iBAAiB,CAAC,MAAc,EAAE,QAAa;IAC7D,IAAI,IAAI,GAAa,EAAE,CAAC;IACxB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,IAAI,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACxB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBACxB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,IAAI,GAAG,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC5E,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;iBAClE;aACF;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;gBAC7E,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;aAC/B;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,8CAmBC;AAED,SAAgB,cAAc,CAAC,cAAsB,EAAE,IAAS;IAC9D,iBAAiB;IACjB,kBAAQ,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACnC,cAAc,GAAG,kBAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACvD,OAAO,cAAc,CAAC;AACxB,CAAC;AALD,wCAKC;AAED,SAAgB,aAAa,CAAC,aAA4B;IACxD,MAAM,mBAAmB,GAAkB;QACzC,eAAe;QACf,QAAQ;QACR,OAAO;QACP,SAAS;QACT,MAAM;KACP,CAAC;IACF,IAAI,CAAC,CAAC,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACrE,OAAO,CACL,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;YAC5F,CAAC,CACF,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,sCAgBC;AAED,SAAgB,UAAU,CAAC,aAA4B;IACrD,OAAO,CACL,CAAC,CAAC,aAAa,CAAC,gBAAgB;QAChC,aAAa,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;QACzC,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;AACJ,CAAC;AAND,gCAMC;AAED,SAAgB,iBAAiB,CAAC,aAA4B;IAC5D,OAAO,WAAW,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC;AAFD,8CAEC;AAED,SAAgB,WAAW,CAAC,aAA4B;IACtD,OAAO,aAAa,CAAC,aAAa,CAAC,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;AACnE,CAAC;AAFD,kCAEC;AAED,SAAgB,KAAK,CAAC,aAA4B;IAChD,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/D,CAAC;AAFD,sBAEC;AAED,SAAgB,0BAA0B,CAAC,aAA4B;IACrE,OAAO,CACL,CAAC,CAAC,aAAa,CAAC,mBAAmB;QACnC,aAAa,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7C,CAAC;AACJ,CAAC;AAND,gEAMC;AAED,SAAgB,gCAAgC,CAAC,aAA4B;IAC3E,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,0BAA0B,CAAC,aAAa,CAAC,CAAC;AAC3E,CAAC;AAFD,4EAEC;AAED,SAAgB,WAAW,CAAC,aAA4B;IACtD,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,0BAA0B,CAAC,aAAa,CAAC,CAAC;AAC3E,CAAC;AAFD,kCAEC;AAED,SAAS,0BAA0B,CAAC,aAA4B
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAczE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAczE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAqIhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -114,7 +114,20 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
114
114
|
context.logProvider.info(validationSuccess);
|
|
115
115
|
}
|
|
116
116
|
if (args.showMessage) {
|
|
117
|
-
(
|
|
117
|
+
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
118
|
+
const outputMessage = [
|
|
119
|
+
{
|
|
120
|
+
content: "Teams Toolkit has completed checking your app package against validation rules. " +
|
|
121
|
+
summaryStr +
|
|
122
|
+
".",
|
|
123
|
+
color: teamsfx_api_1.Colors.BRIGHT_GREEN,
|
|
124
|
+
},
|
|
125
|
+
];
|
|
126
|
+
context.logProvider.info(outputMessage);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
(_d = context.ui) === null || _d === void 0 ? void 0 : _d.showMessage("info", validationSuccess, false);
|
|
130
|
+
}
|
|
118
131
|
}
|
|
119
132
|
return teamsfx_api_1.ok(new Map());
|
|
120
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkG;AAClG,+CAA8C;AAC9C,mCAAiC;AACjC,2BAAyB;AACzB,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,iDAAyE;AACzE,uCAAmD;AACnD,qCAA0C;AAC1C,yDAAsD;AACtD,iEAAqF;AACrF,yDAAsD;AACtD,+CAAqD;AACrD,2DAA+D;AAC/D,kDAAgE;AAEhE,MAAM,UAAU,GAAG,2BAA2B,CAAC;AAG/C,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QACE,gBAAW,GAAG,kCAAkB,CAAC,4CAA4C,CAAC,CAAC;QACtE,kBAAa,GAAG,kCAAkB,CACzC,wDAAwD,CACzD,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,10 +81,10 @@ let AadCollaboration = class AadCollaboration {
|
|
|
81
81
|
return new error_1.AppIdNotExist(appId);
|
|
82
82
|
}
|
|
83
83
|
else if (error.response.status >= 400 && error.response.status < 500) {
|
|
84
|
-
return new common_1.HttpClientError(componentNameAad, message);
|
|
84
|
+
return new common_1.HttpClientError(error, componentNameAad, message);
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
|
-
return new common_1.HttpServerError(componentNameAad, message);
|
|
87
|
+
return new common_1.HttpServerError(error, componentNameAad, message);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
const message = JSON.stringify(error);
|
|
@@ -210,10 +210,10 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
210
210
|
return new error_1.AppIdNotExist(appId);
|
|
211
211
|
}
|
|
212
212
|
else if (statusCode >= 400 && statusCode < 500) {
|
|
213
|
-
return new common_1.HttpClientError(componentNameTeams, message);
|
|
213
|
+
return new common_1.HttpClientError(error, componentNameTeams, message);
|
|
214
214
|
}
|
|
215
215
|
else {
|
|
216
|
-
return new common_1.HttpServerError(componentNameTeams, message);
|
|
216
|
+
return new common_1.HttpServerError(error, componentNameTeams, message);
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
}
|