@microsoft/teamsfx-core 2.0.8-alpha.c3fe84399.0 → 2.0.8-alpha.ded43fb2d.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 -2
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -2
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +5 -10
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +6 -14
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/update.js +1 -1
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/utility.js +2 -3
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts +12 -0
- package/build/component/driver/oauth/create.d.ts.map +1 -0
- package/build/component/driver/oauth/create.js +179 -0
- package/build/component/driver/oauth/create.js.map +1 -0
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js +21 -0
- package/build/component/driver/oauth/error/oauthAuthInfoInvalid.js.map +1 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.js +22 -0
- package/build/component/driver/oauth/error/oauthDomainInvalid.js.map +1 -0
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js +21 -0
- package/build/component/driver/oauth/error/oauthFailedToGetDomain.js.map +1 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.js +21 -0
- package/build/component/driver/oauth/error/oauthNameTooLong.js.map +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +12 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.js +5 -0
- package/build/component/driver/oauth/interface/createOauthArgs.js.map +1 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts +7 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts.map +1 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.js +10 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.js.map +1 -0
- package/build/component/driver/oauth/utility/constants.d.ts +11 -0
- package/build/component/driver/oauth/utility/constants.d.ts.map +1 -0
- package/build/component/driver/oauth/utility/constants.js +16 -0
- package/build/component/driver/oauth/utility/constants.js.map +1 -0
- package/build/component/driver/oauth/utility/utility.d.ts +11 -0
- package/build/component/driver/oauth/utility/utility.d.ts.map +1 -0
- package/build/component/driver/oauth/utility/utility.js +83 -0
- package/build/component/driver/oauth/utility/utility.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +7 -4
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +2 -3
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +5 -7
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +5 -1
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +0 -3
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +0 -65
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.js +5 -2
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +9 -1
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/utils.d.ts +2 -1
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +43 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +4 -4
- package/build/core/FxCore.js.map +1 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +6 -1
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +2 -5
- package/build/question/create.js.map +1 -1
- package/package.json +6 -4
- package/resource/package.nls.json +12 -5
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -25,6 +25,7 @@ const helperMethods_1 = require("./helperMethods");
|
|
|
25
25
|
const lodash_1 = require("lodash");
|
|
26
26
|
const utils_1 = require("../utils");
|
|
27
27
|
const templateGenerator_1 = require("../templates/templateGenerator");
|
|
28
|
+
const utils_2 = require("../../utils");
|
|
28
29
|
const componentName = "office-addin";
|
|
29
30
|
const telemetryEvent = "generate";
|
|
30
31
|
const templateName = "office-addin";
|
|
@@ -92,7 +93,10 @@ class OfficeAddinGenerator {
|
|
|
92
93
|
const projectLink = templateConfig[capability].framework[framework][language];
|
|
93
94
|
// Copy project template files from project repository
|
|
94
95
|
if (projectLink) {
|
|
95
|
-
await
|
|
96
|
+
const fetchRes = await utils_2.fetchAndUnzip("office-addin-generator", projectLink, addinRoot);
|
|
97
|
+
if (fetchRes.isErr()) {
|
|
98
|
+
return teamsfx_api_1.err(fetchRes.error);
|
|
99
|
+
}
|
|
96
100
|
let cmdLine = ""; // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
|
|
97
101
|
if (inputs[questionNames_1.QuestionNames.ProjectType] === create_1.ProjectTypeOptions.officeAddin().id) {
|
|
98
102
|
cmdLine = `npm run convert-to-single-host --if-present -- ${host} json`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDASgC;AAChC,oEAA8C;AAC9C,iEAA4D;AAC5D,+DAAsD;AACtD,+BAA4B;AAC5B,+BAAiC;AACjC,iEAAmE;AACnE,0CAA+C;AAC/C,qDAMkC;AAClC,mEAAgE;AAChE,0EAAsF;AACtF,4CAAyC;AACzC,mEAA+E;AAC/E,mDAAgD;AAChD,mCAAiC;AACjC,oCAA4C;AAC5C,sEAA0E;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
export declare class HelperMethods {
|
|
2
|
-
static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string): Promise<void>;
|
|
3
|
-
static unzipProjectTemplate(projectFolder: string): Promise<void>;
|
|
4
|
-
static moveUnzippedFiles(projectFolder: string): void;
|
|
5
2
|
static copyAddinFiles(fromFolder: string, toFolder: string): void;
|
|
6
3
|
static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;
|
|
7
4
|
static moveManifestLocation(projectRoot: string, manifestRelativePath: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAiBA,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAiBA,qBAAa,aAAa;IACxB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAwB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}
|
|
@@ -8,77 +8,12 @@ const tslib_1 = require("tslib");
|
|
|
8
8
|
* @author darrmill@microsoft.com, yefuwang@microsoft.com
|
|
9
9
|
*/
|
|
10
10
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
|
-
const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
12
11
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
13
12
|
const path = tslib_1.__importStar(require("path"));
|
|
14
|
-
const unzip = tslib_1.__importStar(require("unzipper"));
|
|
15
13
|
const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
|
|
16
|
-
const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
|
|
17
14
|
const common_1 = require("../../../error/common");
|
|
18
15
|
const zipFile = "project.zip";
|
|
19
16
|
class HelperMethods {
|
|
20
|
-
static async downloadProjectTemplateZipFile(projectFolder, projectRepo) {
|
|
21
|
-
const projectTemplateZipFile = projectRepo;
|
|
22
|
-
let response;
|
|
23
|
-
try {
|
|
24
|
-
response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
|
|
25
|
-
}
|
|
26
|
-
catch (e) {
|
|
27
|
-
throw new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", e);
|
|
28
|
-
}
|
|
29
|
-
return new Promise((resolve, reject) => {
|
|
30
|
-
if (response.body) {
|
|
31
|
-
response.body
|
|
32
|
-
.pipe(fs_1.default.createWriteStream(path.resolve(projectFolder, zipFile)))
|
|
33
|
-
.on("error", (err) => {
|
|
34
|
-
reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", err));
|
|
35
|
-
})
|
|
36
|
-
.on("close", () => {
|
|
37
|
-
HelperMethods.unzipProjectTemplate(projectFolder)
|
|
38
|
-
.then(() => {
|
|
39
|
-
resolve();
|
|
40
|
-
})
|
|
41
|
-
.catch((err) => {
|
|
42
|
-
reject(err);
|
|
43
|
-
});
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", new Error(`Response body of GET "${projectTemplateZipFile}" is null.`)));
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
static async unzipProjectTemplate(projectFolder) {
|
|
52
|
-
return new Promise((resolve, reject) => {
|
|
53
|
-
// TODO: Verify file exists
|
|
54
|
-
const readStream = fs_1.default.createReadStream(path.resolve(`${projectFolder}/${zipFile}`));
|
|
55
|
-
readStream
|
|
56
|
-
.pipe(unzip.Extract({ path: projectFolder }))
|
|
57
|
-
.on("error", function (err) {
|
|
58
|
-
unzipErrorHandler(projectFolder, reject, err);
|
|
59
|
-
})
|
|
60
|
-
.on("close", () => {
|
|
61
|
-
HelperMethods.moveUnzippedFiles(projectFolder);
|
|
62
|
-
resolve();
|
|
63
|
-
});
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
static moveUnzippedFiles(projectFolder) {
|
|
67
|
-
// delete original zip file
|
|
68
|
-
const zipFilePath = path.resolve(`${projectFolder}/${zipFile}`);
|
|
69
|
-
if (fs_1.default.existsSync(zipFilePath)) {
|
|
70
|
-
fs_1.default.unlinkSync(zipFilePath);
|
|
71
|
-
}
|
|
72
|
-
// get path to unzipped folder
|
|
73
|
-
const unzippedFolder = fs_1.default.readdirSync(projectFolder).filter(function (file) {
|
|
74
|
-
return fs_1.default.statSync(`${projectFolder}/${file}`).isDirectory();
|
|
75
|
-
});
|
|
76
|
-
// construct paths to move files out of unzipped folder into project root folder
|
|
77
|
-
const fromFolder = path.resolve(`${projectFolder}/${unzippedFolder[0]}`);
|
|
78
|
-
HelperMethods.copyAddinFiles(fromFolder, projectFolder);
|
|
79
|
-
// delete project zipped folder
|
|
80
|
-
fs_1.default.rmSync(fromFolder, { recursive: true, force: true });
|
|
81
|
-
}
|
|
82
17
|
static copyAddinFiles(fromFolder, toFolder) {
|
|
83
18
|
fs_extra_1.default.copySync(fromFolder, toFolder, {
|
|
84
19
|
filter: (path) => !path.includes("node_modules"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,wDAAkE;
|
|
1
|
+
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AASnF,OAAO,EAAqB,aAAa,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AASnF,OAAO,EAAqB,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAmBtF;;GAEG;AACH,qBAAa,uBAAuB;WASrB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAgGlB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CAGH"}
|
|
@@ -19,9 +19,9 @@ const error_1 = require("../../../error");
|
|
|
19
19
|
const questionNames_1 = require("../../../question/questionNames");
|
|
20
20
|
const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
|
|
21
21
|
const generator_1 = require("../generator");
|
|
22
|
-
const helperMethods_1 = require("../officeAddin/helperMethods");
|
|
23
22
|
const projectConfig_1 = require("./projectConfig");
|
|
24
23
|
const utils_1 = require("../utils");
|
|
24
|
+
const utils_2 = require("../../utils");
|
|
25
25
|
const COMPONENT_NAME = "office-xml-addin";
|
|
26
26
|
const TELEMETRY_EVENT = "generate";
|
|
27
27
|
const TEMPLATE_BASE = "office-xml-addin";
|
|
@@ -55,7 +55,10 @@ class OfficeXMLAddinGenerator {
|
|
|
55
55
|
if (!!projectLink) {
|
|
56
56
|
// [Condition]: Project have remote repo (not manifest-only proj)
|
|
57
57
|
// -> Step: Download the project from GitHub
|
|
58
|
-
await
|
|
58
|
+
const fetchRes = await utils_2.fetchAndUnzip("office-xml-addin-generator", projectLink, destinationPath);
|
|
59
|
+
if (fetchRes.isErr()) {
|
|
60
|
+
return teamsfx_api_1.err(fetchRes.error);
|
|
61
|
+
}
|
|
59
62
|
// -> Step: Convert to single Host
|
|
60
63
|
await OfficeXMLAddinGenerator.childProcessExec(`npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`);
|
|
61
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDAAmF;AACnF,oEAA8C;AAC9C,yDAAkC;AAClC,iEAA4D;AAC5D,+BAA4B;AAC5B,+BAAiC;AACjC,iEAAmE;AACnE,0CAA+C;AAC/C,mEAAgE;AAChE,0EAAsF;AACtF,4CAAyC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAG9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,aAAa,EAAE,UAAU,UAAQ,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"questionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAG9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,aAAa,EAAE,UAAU,UAAQ,GAAG,UAAU,CAqBnF"}
|
|
@@ -16,7 +16,15 @@ function QuestionMW(key, fromAction = false) {
|
|
|
16
16
|
const node = question_1.questionNodes[key]();
|
|
17
17
|
const askQuestionRes = await visitor_1.traverse(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
|
|
18
18
|
if (askQuestionRes.isErr()) {
|
|
19
|
-
|
|
19
|
+
if (fromAction) {
|
|
20
|
+
ctx.result = {
|
|
21
|
+
result: teamsfx_api_1.err(askQuestionRes.error),
|
|
22
|
+
summaries: [],
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
ctx.result = teamsfx_api_1.err(askQuestionRes.error);
|
|
27
|
+
}
|
|
20
28
|
return;
|
|
21
29
|
}
|
|
22
30
|
await next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAAqD;AACrD,sDAA8C;AAC9C,6CAA8D;AAC9D,8CAA4C;AAE5C,SAAgB,UAAU,CAAC,GAAwB,EAAE,UAAU,GAAG,KAAK;IACrE,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;QAC1C,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,GAAG,wBAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"questionMW.js","sourceRoot":"","sources":["../../../src/component/middleware/questionMW.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAAqD;AACrD,sDAA8C;AAC9C,6CAA8D;AAC9D,8CAA4C;AAE5C,SAAgB,UAAU,CAAC,GAAwB,EAAE,UAAU,GAAG,KAAK;IACrE,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAW,CAAC;QAC1C,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC7C;QACD,MAAM,IAAI,GAAG,wBAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,UAAU,EAAE;gBACd,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC;oBACjC,SAAS,EAAE,EAAE;iBACd,CAAC;aACH;iBAAM;gBACL,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aACxC;YACD,OAAO;SACR;QACD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AArBD,gCAqBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, FxError, Inputs, TelemetryReporter } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { Context, FxError, Inputs, Result, TelemetryReporter } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "./driver/interface/commonArgs";
|
|
3
3
|
export declare function createContextV3(): Context;
|
|
4
4
|
export declare function createDriverContext(inputs: Inputs): DriverContext;
|
|
@@ -8,4 +8,5 @@ export declare function sendErrorTelemetryThenReturnError(eventName: string, err
|
|
|
8
8
|
}, measurements?: {
|
|
9
9
|
[p: string]: number;
|
|
10
10
|
}, errorProps?: string[]): FxError;
|
|
11
|
+
export declare function fetchAndUnzip(component: string, zipUrl: string, targetDir: string, skipRootFolder?: boolean): Promise<Result<undefined, FxError>>;
|
|
11
12
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/component/utils.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/component/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,iBAAiB,EAIlB,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI9D,wBAAgB,eAAe,IAAI,OAAO,CAQzC;AACD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAYjE;AAwBD,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI,CAqBhE;AAED,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACtC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAqBT;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,cAAc,UAAO,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAsCrC"}
|
package/build/component/utils.js
CHANGED
|
@@ -2,11 +2,16 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.sendErrorTelemetryThenReturnError = exports.ensureComponentConnections = exports.createDriverContext = exports.createContextV3 = void 0;
|
|
5
|
+
exports.fetchAndUnzip = exports.sendErrorTelemetryThenReturnError = exports.ensureComponentConnections = exports.createDriverContext = exports.createContextV3 = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
6
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
7
9
|
const lodash_1 = require("lodash");
|
|
10
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
11
|
const globalVars_1 = require("../core/globalVars");
|
|
12
|
+
const common_1 = require("../error/common");
|
|
9
13
|
const constants_1 = require("./constants");
|
|
14
|
+
const utils_1 = require("./generator/utils");
|
|
10
15
|
const workflow_1 = require("./workflow");
|
|
11
16
|
function createContextV3() {
|
|
12
17
|
const context = {
|
|
@@ -91,4 +96,41 @@ function sendErrorTelemetryThenReturnError(eventName, error, reporter, propertie
|
|
|
91
96
|
return error;
|
|
92
97
|
}
|
|
93
98
|
exports.sendErrorTelemetryThenReturnError = sendErrorTelemetryThenReturnError;
|
|
99
|
+
async function fetchAndUnzip(component, zipUrl, targetDir, skipRootFolder = true) {
|
|
100
|
+
let zip;
|
|
101
|
+
try {
|
|
102
|
+
zip = await utils_1.fetchZipFromUrl(zipUrl);
|
|
103
|
+
}
|
|
104
|
+
catch (e) {
|
|
105
|
+
return teamsfx_api_1.err(new common_1.AccessGithubError(zipUrl, component, e));
|
|
106
|
+
}
|
|
107
|
+
if (!zip) {
|
|
108
|
+
return teamsfx_api_1.err(new common_1.AccessGithubError(zipUrl, component, new Error(`Failed to fetch zip from url: ${zipUrl}, result is undefined.`)));
|
|
109
|
+
}
|
|
110
|
+
const entries = zip.getEntries();
|
|
111
|
+
let rootFolderName = "";
|
|
112
|
+
for (const entry of entries) {
|
|
113
|
+
const entryName = entry.entryName;
|
|
114
|
+
if (skipRootFolder && !rootFolderName) {
|
|
115
|
+
rootFolderName = entryName;
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
const rawEntryData = entry.getData();
|
|
119
|
+
const entryData = rawEntryData;
|
|
120
|
+
const targetPath = path_1.default.join(targetDir, entryName.replace(rootFolderName, ""));
|
|
121
|
+
try {
|
|
122
|
+
if (entry.isDirectory) {
|
|
123
|
+
await fs_extra_1.default.ensureDir(targetPath);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
await fs_extra_1.default.writeFile(targetPath, entryData);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
return teamsfx_api_1.err(new common_1.WriteFileError(error, component));
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return teamsfx_api_1.ok(undefined);
|
|
134
|
+
}
|
|
135
|
+
exports.fetchAndUnzip = fetchAndUnzip;
|
|
94
136
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/component/utils.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/component/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAIZ,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,qBAAqB,EAErB,oBAAoB,EAGpB,MAAM,EACN,KAAK,EACL,cAAc,EACd,KAAK,EAIN,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"FxCore.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.js
CHANGED
|
@@ -14,7 +14,6 @@ const typedi_1 = require("typedi");
|
|
|
14
14
|
const url_1 = require("url");
|
|
15
15
|
const yaml_1 = require("yaml");
|
|
16
16
|
const constants_1 = require("../common/constants");
|
|
17
|
-
const featureFlags_1 = require("../common/featureFlags");
|
|
18
17
|
const localizeUtils_1 = require("../common/localizeUtils");
|
|
19
18
|
const launchHelper_1 = require("../common/m365/launchHelper");
|
|
20
19
|
const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
|
|
@@ -860,8 +859,8 @@ class FxCore {
|
|
|
860
859
|
const specParser = new m365_spec_parser_1.SpecParser(url, isPlugin
|
|
861
860
|
? helper_1.copilotPluginParserOptions
|
|
862
861
|
: {
|
|
863
|
-
allowBearerTokenAuth:
|
|
864
|
-
allowMultipleParameters:
|
|
862
|
+
allowBearerTokenAuth: true,
|
|
863
|
+
allowMultipleParameters: true,
|
|
865
864
|
});
|
|
866
865
|
const listResult = await specParser.list();
|
|
867
866
|
const apiResultList = listResult.APIs.filter((value) => value.isValid);
|
|
@@ -885,7 +884,8 @@ class FxCore {
|
|
|
885
884
|
const operations = [...existingOperations, ...newOperations];
|
|
886
885
|
const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
|
|
887
886
|
try {
|
|
888
|
-
|
|
887
|
+
// TODO: type b will support auth
|
|
888
|
+
if (!isPlugin) {
|
|
889
889
|
const authNames = new Set();
|
|
890
890
|
const serverUrls = new Set();
|
|
891
891
|
for (const api of operations) {
|