@microsoft/teamsfx-core 2.0.7-alpha.1935862db.0 → 2.0.7-alpha.22bb75c79.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/deps-checker/constant/helpLink.d.ts +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +1 -1
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/featureFlags.js +1 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +2 -1
- package/build/common/m365/packageService.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.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 +9 -2
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +10 -8
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +1 -2
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +29 -32
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -3
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -1
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +3 -2
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +2 -2
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +18 -18
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +10 -10
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +6 -6
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +8 -8
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +9 -10
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +9 -9
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +1 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +11 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +1 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +33 -0
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +2 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +2 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +1 -0
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/error/common.d.ts +4 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +35 -1
- package/build/error/common.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +3 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/question/create.d.ts +6 -0
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +38 -1
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +2 -0
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +7 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +2 -1
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -0
- package/build/question/questionNames.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +6 -2
- package/resource/yaml-schema/v1.3/yaml.schema.json +6 -43
- package/resource/yaml-schema/v1.4/yaml.schema.json +1588 -0
- package/resource/yaml-schema/yaml.schema.json +1588 -0
- 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
|
@@ -4,28 +4,28 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateApiKeyDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const typedi_1 = require("typedi");
|
|
8
|
-
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
9
|
-
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
10
7
|
const hooks_1 = require("@feathersjs/hooks");
|
|
11
|
-
const constants_1 = require("./utility/constants");
|
|
12
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
9
|
+
const typedi_1 = require("typedi");
|
|
10
|
+
const featureFlags_1 = require("../../../common/featureFlags");
|
|
11
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
+
const spec_parser_1 = require("../../../common/spec-parser");
|
|
15
13
|
const tools_1 = require("../../../common/tools");
|
|
14
|
+
const error_1 = require("../../../error");
|
|
15
|
+
const question_1 = require("../../../question");
|
|
16
|
+
const questionMW_1 = require("../../middleware/questionMW");
|
|
17
|
+
const common_1 = require("../../utils/common");
|
|
18
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
19
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
20
|
const appStudioClient_1 = require("../teamsApp/clients/appStudioClient");
|
|
17
21
|
const ApiSecretRegistration_1 = require("../teamsApp/interfaces/ApiSecretRegistration");
|
|
18
|
-
const
|
|
19
|
-
const apiKeyNameTooLong_1 = require("./error/apiKeyNameTooLong");
|
|
22
|
+
const telemetry_1 = require("../teamsApp/utils/telemetry");
|
|
20
23
|
const apiKeyClientSecretInvalid_1 = require("./error/apiKeyClientSecretInvalid");
|
|
21
24
|
const apiKeyDomainInvalid_1 = require("./error/apiKeyDomainInvalid");
|
|
22
|
-
const questionMW_1 = require("../../middleware/questionMW");
|
|
23
|
-
const question_1 = require("../../../question");
|
|
24
|
-
const spec_parser_1 = require("../../../common/spec-parser");
|
|
25
|
-
const common_1 = require("../../utils/common");
|
|
26
25
|
const apiKeyFailedToGetDomain_1 = require("./error/apiKeyFailedToGetDomain");
|
|
27
|
-
const
|
|
28
|
-
const
|
|
26
|
+
const apiKeyNameTooLong_1 = require("./error/apiKeyNameTooLong");
|
|
27
|
+
const createApiKeyOutputs_1 = require("./interface/createApiKeyOutputs");
|
|
28
|
+
const constants_1 = require("./utility/constants");
|
|
29
29
|
const actionName = "apiKey/register"; // DO NOT MODIFY the name
|
|
30
30
|
const helpLink = "https://aka.ms/teamsfx-actions/apiKey-register";
|
|
31
31
|
let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
@@ -63,7 +63,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
63
63
|
else {
|
|
64
64
|
const clientSecret = this.loadClientSecret();
|
|
65
65
|
if (clientSecret) {
|
|
66
|
-
args.
|
|
66
|
+
args.primaryClientSecret = clientSecret;
|
|
67
67
|
}
|
|
68
68
|
this.validateArgs(args);
|
|
69
69
|
const domains = await this.getDomain(args, context);
|
|
@@ -91,7 +91,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
91
91
|
const message = JSON.stringify(error);
|
|
92
92
|
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failedExecuteDriver, actionName, message));
|
|
93
93
|
return {
|
|
94
|
-
result: teamsfx_api_1.err(
|
|
94
|
+
result: teamsfx_api_1.err(error_1.assembleError(error, actionName)),
|
|
95
95
|
summaries: summaries,
|
|
96
96
|
};
|
|
97
97
|
}
|
|
@@ -108,23 +108,11 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
108
108
|
const clientSecret = process.env[question_1.QuestionNames.ApiSpecApiKey];
|
|
109
109
|
return clientSecret;
|
|
110
110
|
}
|
|
111
|
-
// Allowed secrets: secret or secret1, secret2
|
|
112
|
-
// Need to validate secrets outside of the function
|
|
113
|
-
parseSecret(apiKeyClientSecret) {
|
|
114
|
-
const secrets = apiKeyClientSecret.trim().split(",");
|
|
115
|
-
return secrets.map((secret) => secret.trim());
|
|
116
|
-
}
|
|
117
111
|
validateSecret(apiKeySecret) {
|
|
118
112
|
if (typeof apiKeySecret !== "string") {
|
|
119
113
|
return false;
|
|
120
114
|
}
|
|
121
|
-
|
|
122
|
-
const regResult = regExp.exec(apiKeySecret);
|
|
123
|
-
if (!regResult) {
|
|
124
|
-
return false;
|
|
125
|
-
}
|
|
126
|
-
const secrets = this.parseSecret(apiKeySecret);
|
|
127
|
-
if (secrets.length > constants_1.maxSecretPerApiKey) {
|
|
115
|
+
if (apiKeySecret.length > constants_1.maxSecretLength || apiKeySecret.length < constants_1.minSecretLength) {
|
|
128
116
|
return false;
|
|
129
117
|
}
|
|
130
118
|
return true;
|
|
@@ -169,7 +157,10 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
169
157
|
if (typeof args.appId !== "string" || !args.appId) {
|
|
170
158
|
invalidParameters.push("appId");
|
|
171
159
|
}
|
|
172
|
-
if (args.
|
|
160
|
+
if (args.primaryClientSecret && !this.validateSecret(args.primaryClientSecret)) {
|
|
161
|
+
throw new apiKeyClientSecretInvalid_1.ApiKeyClientSecretInvalidError(actionName);
|
|
162
|
+
}
|
|
163
|
+
if (args.secondaryClientSecret && !this.validateSecret(args.secondaryClientSecret)) {
|
|
173
164
|
throw new apiKeyClientSecretInvalid_1.ApiKeyClientSecretInvalidError(actionName);
|
|
174
165
|
}
|
|
175
166
|
if (typeof args.apiSpecPath !== "string" || !args.apiSpecPath) {
|
|
@@ -186,14 +177,20 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
186
177
|
}
|
|
187
178
|
const currentUser = currentUserRes.value;
|
|
188
179
|
const userId = currentUser["oid"];
|
|
189
|
-
const secrets =
|
|
180
|
+
const secrets = [];
|
|
181
|
+
if (args.primaryClientSecret) {
|
|
182
|
+
secrets.push(args.primaryClientSecret);
|
|
183
|
+
}
|
|
184
|
+
if (args.secondaryClientSecret) {
|
|
185
|
+
secrets.push(args.secondaryClientSecret);
|
|
186
|
+
}
|
|
190
187
|
let isPrimary = true;
|
|
191
188
|
const clientSecrets = secrets.map((secret) => {
|
|
192
189
|
const clientSecret = {
|
|
193
190
|
value: secret,
|
|
194
191
|
description: args.name,
|
|
195
192
|
priority: isPrimary ? 0 : 1,
|
|
196
|
-
isValueRedacted:
|
|
193
|
+
isValueRedacted: false,
|
|
197
194
|
};
|
|
198
195
|
isPrimary = false;
|
|
199
196
|
return clientSecret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiKeyClientSecretInvalid.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiKeyClientSecretInvalid.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,UAAU,EAAE,MAAM;CAQ/B"}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.ApiKeyClientSecretInvalidError = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
-
const constants_1 = require("../utility/constants");
|
|
9
8
|
const errorCode = "ApiKeyClientSecretInvalid";
|
|
10
9
|
const messageKey = "driver.apiKey.error.clientSecretInvalid";
|
|
11
10
|
class ApiKeyClientSecretInvalidError extends teamsfx_api_1.UserError {
|
|
@@ -13,8 +12,8 @@ class ApiKeyClientSecretInvalidError extends teamsfx_api_1.UserError {
|
|
|
13
12
|
super({
|
|
14
13
|
source: actionName,
|
|
15
14
|
name: errorCode,
|
|
16
|
-
message: localizeUtils_1.getDefaultString(messageKey
|
|
17
|
-
displayMessage: localizeUtils_1.getLocalizedString(messageKey
|
|
15
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
16
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
18
17
|
});
|
|
19
18
|
}
|
|
20
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiKeyClientSecretInvalid.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;
|
|
1
|
+
{"version":3,"file":"apiKeyClientSecretInvalid.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,2BAA2B,CAAC;AAC9C,MAAM,UAAU,GAAG,yCAAyC,CAAC;AAE7D,MAAa,8BAA+B,SAAQ,uBAAS;IAC3D,YAAY,UAAkB;QAC5B,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,CAAC;YACrC,cAAc,EAAE,kCAAkB,CAAC,UAAU,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;CACF;AATD,wEASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApiKeyArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/createApiKeyArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,
|
|
1
|
+
{"version":3,"file":"createApiKeyArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/createApiKeyArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB"}
|
|
@@ -5,6 +5,7 @@ export declare const logMessageKeys: {
|
|
|
5
5
|
successCreateApiKey: string;
|
|
6
6
|
failedExecuteDriver: string;
|
|
7
7
|
};
|
|
8
|
-
export declare const maxSecretPerApiKey = 2;
|
|
9
8
|
export declare const maxDomainPerApiKey = 1;
|
|
9
|
+
export declare const maxSecretLength = 128;
|
|
10
|
+
export declare const minSecretLength = 10;
|
|
10
11
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;CAM1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;CAM1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,eAAO,MAAM,eAAe,KAAK,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.
|
|
5
|
+
exports.minSecretLength = exports.maxSecretLength = exports.maxDomainPerApiKey = exports.logMessageKeys = void 0;
|
|
6
6
|
exports.logMessageKeys = {
|
|
7
7
|
startExecuteDriver: "driver.apiKey.log.startExecuteDriver",
|
|
8
8
|
skipCreateApiKey: "driver.apiKey.log.skipCreateApiKey",
|
|
@@ -10,6 +10,7 @@ exports.logMessageKeys = {
|
|
|
10
10
|
successCreateApiKey: "driver.apiKey.log.successCreateApiKey",
|
|
11
11
|
failedExecuteDriver: "driver.apiKey.log.failedExecuteDriver",
|
|
12
12
|
};
|
|
13
|
-
exports.maxSecretPerApiKey = 2;
|
|
14
13
|
exports.maxDomainPerApiKey = 1;
|
|
14
|
+
exports.maxSecretLength = 128;
|
|
15
|
+
exports.minSecretLength = 10;
|
|
15
16
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,oCAAoC;IACtD,cAAc,EAAE,kCAAkC;IAClD,mBAAmB,EAAE,uCAAuC;IAC5D,mBAAmB,EAAE,uCAAuC;CAC7D,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,oCAAoC;IACtD,cAAc,EAAE,kCAAkC;IAClD,mBAAmB,EAAE,uCAAuC;IAC5D,mBAAmB,EAAE,uCAAuC;CAC7D,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,eAAe,GAAG,GAAG,CAAC;AACtB,QAAA,eAAe,GAAG,EAAE,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "../interface/commonArgs";
|
|
3
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
3
4
|
import { CreateBotAadAppArgs } from "./interface/createBotAadAppArgs";
|
|
4
|
-
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
5
5
|
export declare class CreateBotAadAppDriver implements StepDriver {
|
|
6
6
|
readonly description?: string | undefined;
|
|
7
7
|
readonly progressTitle: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAgBjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAatE,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IACF,QAAQ,CAAC,aAAa,SAAyD;IAGlE,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAad,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAuFK,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;CAcrD"}
|
|
@@ -4,22 +4,22 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateBotAadAppDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const
|
|
7
|
+
const lib_1 = require("@feathersjs/hooks/lib");
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
const perf_hooks_1 = require("perf_hooks");
|
|
10
9
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
|
-
const constants_1 = require("./utility/constants");
|
|
10
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
11
|
+
const typedi_1 = require("typedi");
|
|
15
12
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
13
|
+
const common_1 = require("../../../error/common");
|
|
14
|
+
const common_2 = require("../../utils/common");
|
|
15
|
+
const aadAppNameTooLongError_1 = require("../aad/error/aadAppNameTooLongError");
|
|
16
|
+
const signInAudience_1 = require("../aad/interface/signInAudience");
|
|
17
|
+
const aadAppClient_1 = require("../aad/utility/aadAppClient");
|
|
18
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
19
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
20
|
const utils_1 = require("../util/utils");
|
|
17
21
|
const unexpectedEmptyBotPasswordError_1 = require("./error/unexpectedEmptyBotPasswordError");
|
|
18
|
-
const
|
|
19
|
-
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
20
|
-
const aadAppClient_1 = require("../aad/utility/aadAppClient");
|
|
21
|
-
const signInAudience_1 = require("../aad/interface/signInAudience");
|
|
22
|
-
const aadAppNameTooLongError_1 = require("../aad/error/aadAppNameTooLongError");
|
|
22
|
+
const constants_1 = require("./utility/constants");
|
|
23
23
|
const actionName = "botAadApp/create"; // DO NOT MODIFY the name
|
|
24
24
|
const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
|
|
25
25
|
const successRegisterBotAad = `${actionName}/success`;
|
|
@@ -33,14 +33,14 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
33
33
|
this.progressTitle = localizeUtils_1.getLocalizedString(constants_1.progressBarKeys.creatingBotAadApp);
|
|
34
34
|
}
|
|
35
35
|
async run(args, context) {
|
|
36
|
-
return
|
|
36
|
+
return common_2.wrapRun(async () => {
|
|
37
37
|
const result = await this.handler(args, context);
|
|
38
38
|
return result.output;
|
|
39
39
|
}, actionName);
|
|
40
40
|
}
|
|
41
41
|
async execute(args, ctx, outputEnvVarNames) {
|
|
42
42
|
let summaries = [];
|
|
43
|
-
const outputResult = await
|
|
43
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
44
44
|
const result = await this.handler(args, ctx, outputEnvVarNames);
|
|
45
45
|
summaries = result.summaries;
|
|
46
46
|
return result.output;
|
|
@@ -101,18 +101,18 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
101
101
|
const message = JSON.stringify((_h = error.response) === null || _h === void 0 ? void 0 : _h.data);
|
|
102
102
|
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
103
103
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
104
|
-
throw new
|
|
104
|
+
throw new common_1.HttpClientError(error, actionName, message, helpLink);
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
107
|
-
throw new
|
|
107
|
+
throw new common_1.HttpServerError(error, actionName, message);
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
if (error.name === "AadCreateAppError") {
|
|
111
|
-
throw
|
|
111
|
+
throw common_1.assembleError(error, actionName);
|
|
112
112
|
}
|
|
113
113
|
const message = JSON.stringify(error);
|
|
114
114
|
(_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
115
|
-
throw
|
|
115
|
+
throw common_1.assembleError(error, actionName);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
validateArgs(args) {
|
|
@@ -121,7 +121,7 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
121
121
|
invalidParameters.push("name");
|
|
122
122
|
}
|
|
123
123
|
if (invalidParameters.length > 0) {
|
|
124
|
-
throw new
|
|
124
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
125
125
|
}
|
|
126
126
|
if (args.name.length > 120) {
|
|
127
127
|
throw new aadAppNameTooLongError_1.AadAppNameTooLongError(actionName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAYjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EACL,iCAAiC,EAElC,MAAM,+CAA+C,CAAC;AAOvD,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA2E;IAGpF,GAAG,CACd,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,iCAAiC,EACvC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAwErB,OAAO,CAAC,YAAY;CAoDrB"}
|
|
@@ -7,16 +7,16 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const typedi_1 = require("typedi");
|
|
8
8
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
9
9
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
10
|
+
const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
|
|
10
11
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
11
|
-
const common_1 = require("
|
|
12
|
+
const common_1 = require("../../../error/common");
|
|
13
|
+
const IBotRegistration_1 = require("../../resource/botService/appStudio/interfaces/IBotRegistration");
|
|
14
|
+
const botFrameworkRegistration_1 = require("../../resource/botService/botRegistration/botFrameworkRegistration");
|
|
15
|
+
const common_2 = require("../../utils/common");
|
|
12
16
|
const constants_1 = require("../aad/utility/constants");
|
|
13
17
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
|
-
const botFrameworkRegistration_1 = require("../../resource/botService/botRegistration/botFrameworkRegistration");
|
|
15
|
-
const IBotRegistration_1 = require("../../resource/botService/appStudio/interfaces/IBotRegistration");
|
|
16
|
-
const common_2 = require("../../../error/common");
|
|
17
|
-
const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
|
|
18
|
-
const invalidBotIdError_1 = require("./error/invalidBotIdError");
|
|
19
18
|
const telemetry_1 = require("../teamsApp/utils/telemetry");
|
|
19
|
+
const invalidBotIdError_1 = require("./error/invalidBotIdError");
|
|
20
20
|
const actionName = "botFramework/create";
|
|
21
21
|
const helpLink = "https://aka.ms/teamsfx-actions/botFramework-create";
|
|
22
22
|
const botUrl = "https://dev.botframework.com/bots?id=";
|
|
@@ -26,14 +26,14 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
26
26
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot");
|
|
27
27
|
}
|
|
28
28
|
async run(args, context) {
|
|
29
|
-
return
|
|
29
|
+
return common_2.wrapRun(async () => {
|
|
30
30
|
const result = await this.handler(args, context);
|
|
31
31
|
return result.output;
|
|
32
32
|
}, actionName);
|
|
33
33
|
}
|
|
34
34
|
async execute(args, ctx) {
|
|
35
35
|
let summaries = [];
|
|
36
|
-
const outputResult = await
|
|
36
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
37
37
|
const result = await this.handler(args, ctx);
|
|
38
38
|
summaries = result.summaries;
|
|
39
39
|
return result.output;
|
|
@@ -94,7 +94,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
94
94
|
}
|
|
95
95
|
const message = JSON.stringify(error);
|
|
96
96
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
97
|
-
throw
|
|
97
|
+
throw common_1.assembleError(error, actionName);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
validateArgs(args) {
|
|
@@ -138,7 +138,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
|
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
140
|
if (invalidParameters.length > 0) {
|
|
141
|
-
throw new
|
|
141
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE
|
|
1
|
+
{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAMjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAK9D,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAA+E;IAC1F,QAAQ,CAAC,aAAa,SAAqD;IAG9D,GAAG,CACd,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa3E,OAAO;IA2CrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,eAAe;CAKxB"}
|
|
@@ -12,10 +12,10 @@ const typedi_1 = require("typedi");
|
|
|
12
12
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
13
13
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
14
14
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
15
|
-
const common_1 = require("
|
|
15
|
+
const common_1 = require("../../../error/common");
|
|
16
|
+
const common_2 = require("../../utils/common");
|
|
16
17
|
const constants_1 = require("../aad/utility/constants");
|
|
17
18
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
18
|
-
const common_2 = require("../../../error/common");
|
|
19
19
|
const actionName = "file/createOrUpdateEnvironmentFile";
|
|
20
20
|
const helpLink = "https://aka.ms/teamsfx-actions/file-createOrUpdateEnvironmentFile";
|
|
21
21
|
let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDriver {
|
|
@@ -24,14 +24,14 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
24
24
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.file.progressBar.env");
|
|
25
25
|
}
|
|
26
26
|
async run(args, context) {
|
|
27
|
-
return
|
|
27
|
+
return common_2.wrapRun(async () => {
|
|
28
28
|
const result = await this.handler(args, context);
|
|
29
29
|
return result.output;
|
|
30
30
|
}, actionName);
|
|
31
31
|
}
|
|
32
32
|
async execute(args, ctx) {
|
|
33
33
|
let summaries = [];
|
|
34
|
-
const outputResult = await
|
|
34
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
35
35
|
const result = await this.handler(args, ctx);
|
|
36
36
|
summaries = result.summaries;
|
|
37
37
|
return result.output;
|
|
@@ -66,7 +66,7 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
66
66
|
}
|
|
67
67
|
const message = JSON.stringify(error);
|
|
68
68
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
69
|
-
throw
|
|
69
|
+
throw common_1.assembleError(error, actionName);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
validateArgs(args) {
|
|
@@ -85,7 +85,7 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
if (invalidParameters.length > 0) {
|
|
88
|
-
throw new
|
|
88
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
getAbsolutePath(relativeOrAbsolutePath, projectPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAiC;AACjC,qDAA+B;AAC/B,+CAAyB;AACzB,mDAA6B;AAC7B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,+CAA6C;AAC7C,wDAA0D;AAG1D,mFAAgF;
|
|
1
|
+
{"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateJsonFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateJsonFile.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOrUpdateJsonFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateJsonFile.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAQjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKhE,qBACa,4BAA6B,YAAW,UAAU;IAC7D,WAAW,SAAwE;IACnF,QAAQ,CAAC,aAAa,SAA6D;IAGtE,GAAG,CACd,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa5E,OAAO;IAqCrB,OAAO,CAAC,YAAY;IA8BpB,OAAO,CAAC,sBAAsB;CAgB/B"}
|
|
@@ -8,12 +8,12 @@ const fs = tslib_1.__importStar(require("fs-extra"));
|
|
|
8
8
|
const typedi_1 = require("typedi");
|
|
9
9
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
10
10
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
|
+
const commentJson = tslib_1.__importStar(require("comment-json"));
|
|
11
12
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
-
const common_1 = require("
|
|
13
|
+
const common_1 = require("../../../error/common");
|
|
14
|
+
const common_2 = require("../../utils/common");
|
|
13
15
|
const constants_1 = require("../aad/utility/constants");
|
|
14
16
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
15
|
-
const common_2 = require("../../../error/common");
|
|
16
|
-
const commentJson = tslib_1.__importStar(require("comment-json"));
|
|
17
17
|
const actionName = "file/createOrUpdateJsonFile";
|
|
18
18
|
const helpLink = "https://aka.ms/teamsfx-actions/file-createOrUpdateJsonFile";
|
|
19
19
|
let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
|
|
@@ -22,14 +22,14 @@ let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
|
|
|
22
22
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.file.progressBar.appsettings");
|
|
23
23
|
}
|
|
24
24
|
async run(args, context) {
|
|
25
|
-
return
|
|
25
|
+
return common_2.wrapRun(async () => {
|
|
26
26
|
const result = await this.handler(args, context);
|
|
27
27
|
return result.output;
|
|
28
28
|
}, actionName);
|
|
29
29
|
}
|
|
30
30
|
async execute(args, ctx) {
|
|
31
31
|
let summaries = [];
|
|
32
|
-
const outputResult = await
|
|
32
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
33
33
|
const result = await this.handler(args, ctx);
|
|
34
34
|
summaries = result.summaries;
|
|
35
35
|
return result.output;
|
|
@@ -43,7 +43,7 @@ let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
|
|
|
43
43
|
var _a, _b, _c, _d;
|
|
44
44
|
try {
|
|
45
45
|
this.validateArgs(args);
|
|
46
|
-
const jsonFilePath =
|
|
46
|
+
const jsonFilePath = common_2.getAbsolutePath(args.target, context.projectPath);
|
|
47
47
|
if (!(await fs.pathExists(jsonFilePath))) {
|
|
48
48
|
await fs.ensureFile(jsonFilePath);
|
|
49
49
|
await fs.writeFile(jsonFilePath, "{}", "utf-8");
|
|
@@ -63,7 +63,7 @@ let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
|
|
|
63
63
|
}
|
|
64
64
|
const message = JSON.stringify(error);
|
|
65
65
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
66
|
-
throw
|
|
66
|
+
throw common_1.assembleError(error, actionName);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
validateArgs(args) {
|
|
@@ -92,7 +92,7 @@ let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
if (invalidParameters.length > 0) {
|
|
95
|
-
throw new
|
|
95
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
addOrUpdateJsonContent(jsonContent, ymlJsonContent) {
|