@microsoft/teamsfx-core 2.0.7-alpha.df858bc9e.0 → 2.0.7-alpha.ff81ae4d8.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/jsonUtils.js.map +1 -1
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.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 +4 -2
- package/build/error/teamsApp.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/package.json +3 -3
- package/resource/package.nls.json +3 -1
- 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,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":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAAiF;AACjF,0DAA0B;AAC1B,2CAAyC;AACzC,mCAAiC;AACjC,iEAAmE;AACnE,kDAK+B;AAC/B,+CAA6C;AAC7C,gFAA6E;AAC7E,oEAAiE;AACjE,8DAA2D;AAC3D,8GAA2G;AAG3G,mFAAgF;AAChF,yCAAgE;AAChE,6FAA0F;AAG1F,mDAAsE;AAEtE,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,yBAAyB;AAChE,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAEnE,MAAM,qBAAqB,GAAG,GAAG,UAAU,UAAU,CAAC;AACtD,MAAM,YAAY,GAAG;IACnB,qBAAqB,EAAE,wBAAwB;IAC/C,kBAAkB,EAAE,uBAAuB;CAC5C,CAAC;AAGF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACW,gBAAW,GAAwB,kCAAkB,CAC5D,qCAAqC,CACtC,CAAC;QACO,kBAAa,GAAG,kCAAkB,CAAC,2BAAe,CAAC,iBAAiB,CAAC,CAAC;IA2IjF,CAAC;IAxIQ,KAAK,CAAC,GAAG,CACd,IAAyB,EACzB,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;IACjB,CAAC;IAGM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,GAAkB,EAClB,iBAAuC;QAEvC,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAChE,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;QACf,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,OAAsB,EACtB,iBAAuC;;QAKvC,IAAI;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;YAE7F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,iBAAiB,EAAE;gBACtB,MAAM,IAAI,iFAAuC,CAAC,UAAU,CAAC,CAAC;aAC/D;YACD,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YACtF,MAAM,cAAc,GAA0B,wBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAClF,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAElF,qFAAqF;YACrF,IAAI,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE;gBACvD,MAAM,IAAI,iEAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;aACjE;YAED,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;gBACzB,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBACnF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,YAAY,CAC5C,IAAI,CAAC,IAAI,EACT,+BAAc,CAAC,mBAAmB,CACnC,CAAC;gBACF,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,KAAM,CAAC;gBACrC,cAAc,CAAC,WAAW,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAG,CAAC,CAAC;gBACjF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,sBAAsB,CAAC,CAAC,CAAC;aACtF;iBAAM;gBACL,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC;aACnF;YACD,MAAM,oBAAoB,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAE3D,MAAM,OAAO,GAAG,qBAAa,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;YAEjE,MAAM,sBAAsB,GAAG,kCAAkB,CAC/C,0BAAc,CAAC,mBAAmB,EAClC,cAAc,CAAC,KAAK,CACrB,CAAC;YACF,MAAM,oBAAoB,GAAG,kCAAkB,CAC7C,0BAAc,CAAC,iBAAiB,EAChC,cAAc,CAAC,KAAK,CACrB,CAAC;YACF,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YAClF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,EAAE,UAAU,CAAC,CACpE,CAAC;YACF,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,qBAAqB,EAAE;gBAClE,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;gBAClE,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,oBAAoB,CAAC,QAAQ,EAAE;aACnE,CAAC,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC;SACH;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;gBACrD,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;gBACF,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,GAAG,GAAG,EAAE;oBACjE,MAAM,IAAI,wBAAe,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;iBACjE;qBAAM;oBACL,MAAM,IAAI,wBAAe,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;iBACvD;aACF;YAED,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACtC,MAAM,sBAAa,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;aACxC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,sBAAa,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;SACjD;IACH,CAAC;IAEM,YAAY,CAAC,IAAyB;QAC3C,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE;YAC1B,MAAM,IAAI,+CAAsB,CAAC,UAAU,CAAC,CAAC;SAC9C;IACH,CAAC;CACF,CAAA;AAxIC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;gDASxD;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;6DAInC,GAAG;;oDAYxB;AAjCU,qBAAqB;IADjC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,qBAAqB,CA+IjC;AA/IY,sDAAqB"}
|
|
@@ -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":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAiC;AACjC,qDAA+B;AAC/B,+CAAyB;AACzB,mDAA6B;AAC7B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,kDAA+E;AAC/E,+CAA6C;AAC7C,wDAA0D;AAG1D,mFAAgF;AAGhF,MAAM,UAAU,GAAG,oCAAoC,CAAC;AACxD,MAAM,QAAQ,GAAG,mEAAmE,CAAC;AAGrF,IAAa,mCAAmC,GAAhD,MAAa,mCAAmC;IAAhD;QACE,gBAAW,GAAG,kCAAkB,CAAC,uDAAuD,CAAC,CAAC;QACjF,kBAAa,GAAG,kCAAkB,CAAC,6BAA6B,CAAC,CAAC;IAgG7E,CAAC;IA7FQ,KAAK,CAAC,GAAG,CACd,IAAqB,EACrB,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;IACjB,CAAC;IAGM,KAAK,CAAC,OAAO,CAAC,IAAqB,EAAE,GAAkB;QAC5D,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7C,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,EAAE,UAAU,CAAC,CAAC;QACf,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAqB,EACrB,OAAsB;;QAKtB,IAAI;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YACvE,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,iCAAM,IAAI,GAAK,IAAI,CAAC,IAAI,EAAG,CAAC,GAAG,CAC/D,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CACpC,CAAC;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC3E,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,OAAO;gBACL,MAAM,EAAE,IAAI,GAAG,EAAkB;gBACjC,SAAS,EAAE;oBACT,kCAAkB,CAChB,mDAAmD,EACnD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB;iBACF;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,sBAAa,CAAC,KAAc,EAAE,UAAU,CAAC,CAAC;SACjD;IACH,CAAC;IAEO,YAAY,CAAC,IAAqB;QACxC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/E,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;aAAM;YACL,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACtE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAChC;aACF;SACF;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;IAEO,eAAe,CAAC,sBAA8B,EAAE,WAAmB;QACzE,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC;YAC5C,CAAC,CAAC,sBAAsB;YACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AA7FC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;8DASxD;AAGD;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;kEAYxD;AA3BU,mCAAmC;IAD/C,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,mCAAmC,CAkG/C;AAlGY,kFAAmC"}
|
|
@@ -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) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateJsonFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateJsonFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,+CAA8D;AAC9D,wDAA0D;AAG1D,mFAAgF;
|
|
1
|
+
{"version":3,"file":"createOrUpdateJsonFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateJsonFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.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;AAGtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAUD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA8D;IAGvE,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAsDrB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;CAKlC"}
|
|
@@ -11,11 +11,10 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
11
11
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
12
|
const packageService_1 = require("../../../common/m365/packageService");
|
|
13
13
|
const serviceConstant_1 = require("../../../common/m365/serviceConstant");
|
|
14
|
-
const common_1 = require("
|
|
14
|
+
const common_1 = require("../../../error/common");
|
|
15
|
+
const common_2 = require("../../utils/common");
|
|
15
16
|
const constants_1 = require("../aad/utility/constants");
|
|
16
17
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
17
|
-
const common_2 = require("../../../error/common");
|
|
18
|
-
const common_3 = require("../../../error/common");
|
|
19
18
|
const actionName = "teamsApp/extendToM365";
|
|
20
19
|
const helpLink = "https://aka.ms/teamsfx-actions/teamsapp-extendToM365";
|
|
21
20
|
const outputKeys = {
|
|
@@ -28,14 +27,14 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
|
|
|
28
27
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.m365.acquire.progress.message");
|
|
29
28
|
}
|
|
30
29
|
async run(args, context) {
|
|
31
|
-
return
|
|
30
|
+
return common_2.wrapRun(async () => {
|
|
32
31
|
const result = await this.handler(args, context);
|
|
33
32
|
return result.output;
|
|
34
33
|
}, actionName);
|
|
35
34
|
}
|
|
36
35
|
async execute(args, ctx, outputEnvVarNames) {
|
|
37
36
|
let summaries = [];
|
|
38
|
-
const outputResult = await
|
|
37
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
39
38
|
const result = await this.handler(args, ctx, outputEnvVarNames);
|
|
40
39
|
summaries = result.summaries;
|
|
41
40
|
return result.output;
|
|
@@ -50,9 +49,9 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
|
|
|
50
49
|
try {
|
|
51
50
|
this.validateArgs(args);
|
|
52
51
|
this.validateOutputEnvVarNames(outputEnvVarNames);
|
|
53
|
-
const appPackagePath =
|
|
52
|
+
const appPackagePath = common_2.getAbsolutePath(args.appPackagePath, context.projectPath);
|
|
54
53
|
if (!(await fs.pathExists(appPackagePath))) {
|
|
55
|
-
throw new
|
|
54
|
+
throw new common_1.FileNotFoundError(actionName, appPackagePath, helpLink);
|
|
56
55
|
}
|
|
57
56
|
// get sideloading service settings
|
|
58
57
|
const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.serviceEndpoint;
|
|
@@ -81,7 +80,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
|
|
|
81
80
|
}
|
|
82
81
|
const message = JSON.stringify(error);
|
|
83
82
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
84
|
-
throw
|
|
83
|
+
throw common_1.assembleError(error, actionName);
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
86
|
validateArgs(args) {
|
|
@@ -90,12 +89,12 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
|
|
|
90
89
|
invalidParameters.push("appPackagePath");
|
|
91
90
|
}
|
|
92
91
|
if (invalidParameters.length > 0) {
|
|
93
|
-
throw new
|
|
92
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
validateOutputEnvVarNames(outputEnvVarNames) {
|
|
97
96
|
if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) || !outputEnvVarNames.get(outputKeys.appId)) {
|
|
98
|
-
throw new
|
|
97
|
+
throw new common_1.InvalidActionInputError(actionName, ["writeToEnvironmentFile"], helpLink);
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,wEAAqE;AACrE,0EAAqF;AACrF,+CAA8D;AAC9D,wDAA0D;AAG1D,mFAAgF;
|
|
1
|
+
{"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAS/F,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAW/E,qBACa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAO9D,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAqBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAY1B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAmBjD,OAAO,CAAC,WAAW;CAiBpB;AAED,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;gBAEtC,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB;IAQjD,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA8BpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAsC/B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA4BjD,OAAO,CAAC,WAAW;CAoBpB"}
|
|
@@ -4,19 +4,19 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.TeamsCollaboration = exports.AadCollaboration = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
+
const lib_1 = require("@feathersjs/hooks/lib");
|
|
7
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
8
10
|
const typedi_1 = require("typedi");
|
|
9
|
-
const
|
|
11
|
+
const error_1 = require("../../core/error");
|
|
12
|
+
const globalVars_1 = require("../../core/globalVars");
|
|
13
|
+
const common_1 = require("../../error/common");
|
|
10
14
|
const aadAppClient_1 = require("../driver/aad/utility/aadAppClient");
|
|
11
15
|
const constants_1 = require("../driver/aad/utility/constants");
|
|
12
16
|
const addStartAndEndTelemetry_1 = require("../driver/middleware/addStartAndEndTelemetry");
|
|
13
|
-
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
14
|
-
const common_1 = require("../../error/common");
|
|
15
|
-
const telemetry_1 = require("../driver/teamsApp/utils/telemetry");
|
|
16
|
-
const constants_2 = require("../driver/teamsApp/constants");
|
|
17
17
|
const appStudioClient_1 = require("../driver/teamsApp/clients/appStudioClient");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
18
|
+
const constants_2 = require("../driver/teamsApp/constants");
|
|
19
|
+
const telemetry_1 = require("../driver/teamsApp/utils/telemetry");
|
|
20
20
|
const EventName = {
|
|
21
21
|
grantPermission: "grant-permission",
|
|
22
22
|
listCollaborator: "list-collaborator",
|
|
@@ -89,7 +89,7 @@ let AadCollaboration = class AadCollaboration {
|
|
|
89
89
|
}
|
|
90
90
|
const message = JSON.stringify(error);
|
|
91
91
|
(_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.error(message);
|
|
92
|
-
return
|
|
92
|
+
return common_1.assembleError(error, componentNameAad);
|
|
93
93
|
}
|
|
94
94
|
};
|
|
95
95
|
tslib_1.__decorate([
|
|
@@ -219,7 +219,7 @@ let TeamsCollaboration = class TeamsCollaboration {
|
|
|
219
219
|
}
|
|
220
220
|
const message = JSON.stringify(error);
|
|
221
221
|
(_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.error(message);
|
|
222
|
-
return
|
|
222
|
+
return common_1.assembleError(error, componentNameTeams);
|
|
223
223
|
}
|
|
224
224
|
};
|
|
225
225
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAQgC;AAChC,mCAAiC;
|
|
1
|
+
{"version":3,"file":"collaboration.js","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,4 +12,5 @@ export declare function UpdateSPFxTemplateError(e: Error): UserError;
|
|
|
12
12
|
export declare function ImportSPFxSolutionError(e: Error): UserError;
|
|
13
13
|
export declare function PathAlreadyExistsError(path: string): UserError;
|
|
14
14
|
export declare function SolutionVersionMissingError(path: string): UserError;
|
|
15
|
+
export declare function CannotFindPropertyfromJsonError(field: string): UserError;
|
|
15
16
|
//# sourceMappingURL=error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,WAAW,CAmBb;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOnE"}
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,WAAW,CAmBb;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOnE;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAQxE"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
|
|
5
|
+
exports.CannotFindPropertyfromJsonError = exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const constants_1 = require("./utils/constants");
|
|
8
8
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
@@ -116,4 +116,14 @@ function SolutionVersionMissingError(path) {
|
|
|
116
116
|
});
|
|
117
117
|
}
|
|
118
118
|
exports.SolutionVersionMissingError = SolutionVersionMissingError;
|
|
119
|
+
function CannotFindPropertyfromJsonError(field) {
|
|
120
|
+
const message = `Cannot find property "${field}" from json.`;
|
|
121
|
+
return new teamsfx_api_1.UserError({
|
|
122
|
+
source: constants_1.Constants.PLUGIN_NAME,
|
|
123
|
+
name: "CannotFindPropertyfromJson",
|
|
124
|
+
message,
|
|
125
|
+
displayMessage: message, // This message won't be shown to users. No need to localize.
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
exports.CannotFindPropertyfromJsonError = CannotFindPropertyfromJsonError;
|
|
119
129
|
//# sourceMappingURL=error.js.map
|