@microsoft/teamsfx-core 2.0.13-rc-hotfix.0 → 2.0.13-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/featureFlags.js +1 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/secretmasker/masker.d.ts +1 -1
- package/build/common/secretmasker/masker.d.ts.map +1 -1
- package/build/common/secretmasker/masker.js +2 -2
- package/build/common/secretmasker/masker.js.map +1 -1
- package/build/common/stringUtils.js +1 -1
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/actionInjector.d.ts +1 -1
- package/build/component/configManager/actionInjector.d.ts.map +1 -1
- package/build/component/configManager/actionInjector.js +6 -15
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +3 -7
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +7 -12
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts +0 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +6 -11
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts +1 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/createOauthOutputs.js +1 -0
- package/build/component/driver/oauth/interface/createOauthOutputs.js.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +3 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +51 -22
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/utility.d.ts +2 -0
- package/build/component/driver/oauth/utility/utility.d.ts.map +1 -1
- package/build/component/driver/oauth/utility/utility.js +11 -1
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -0
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +15 -23
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthConfigurationId.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/OauthConfigurationId.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +2 -2
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +0 -2
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
- package/build/component/generator/apiSpec/generator.js +6 -6
- package/build/component/generator/apiSpec/generator.js.map +1 -1
- package/build/component/generator/apiSpec/helper.d.ts +0 -1
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/apiSpec/helper.js +7 -15
- package/build/component/generator/apiSpec/helper.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +0 -4
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +1 -2
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts +0 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +0 -7
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts +0 -7
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +28 -121
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +2 -5
- package/build/core/collaborator.js.map +1 -1
- package/build/error/depCheck.d.ts +4 -1
- package/build/error/depCheck.d.ts.map +1 -1
- package/build/error/depCheck.js +16 -1
- package/build/error/depCheck.js.map +1 -1
- package/build/question/index.d.ts +0 -1
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +0 -3
- package/build/question/index.js.map +1 -1
- package/build/question/other.d.ts +0 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +1 -7
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +5 -1
- package/resource/yaml-schema/v1.7/yaml.schema.json +12 -0
- package/resource/yaml-schema/yaml.schema.json +16 -4
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/updateOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"updateOauthArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/interface/updateOauthArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAQtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAQ9D,qBACa,iBAAkB,YAAW,UAAU;IAClD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAAmD;IAG5D,OAAO,CAClB,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAQtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAQ9D,qBACa,iBAAkB,YAAW,UAAU;IAClD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAAmD;IAG5D,OAAO,CAClB,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA4H3B,OAAO,CAAC,YAAY;IAyCpB,OAAO,CAAC,wBAAwB;IAkGhC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,0BAA0B;IAsClC,OAAO,CAAC,aAAa;CAQtB"}
|
|
@@ -30,7 +30,10 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
30
30
|
const outputs = new Map();
|
|
31
31
|
try {
|
|
32
32
|
(_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info((0, localizeUtils_1.getLocalizedString)(constants_2.logMessageKeys.startExecuteDriver, actionName));
|
|
33
|
-
this.validateArgs(args);
|
|
33
|
+
const invalidParameters = this.validateArgs(args);
|
|
34
|
+
if (invalidParameters.length > 0) {
|
|
35
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
36
|
+
}
|
|
34
37
|
const authInfo = await (0, utility_1.getandValidateOauthInfoFromSpec)(args, context, actionName);
|
|
35
38
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
36
39
|
scopes: constants_1.AppStudioScopes,
|
|
@@ -40,6 +43,20 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
40
43
|
}
|
|
41
44
|
const appStudioToken = appStudioTokenRes.value;
|
|
42
45
|
const getOauthRes = await teamsDevPortalClient_1.teamsDevPortalClient.getOauthRegistrationById(appStudioToken, args.configurationId);
|
|
46
|
+
const isCustomIdentityProvider = !getOauthRes.identityProvider || getOauthRes.identityProvider === "Custom";
|
|
47
|
+
if (isCustomIdentityProvider) {
|
|
48
|
+
if (args.isPKCEEnabled && typeof args.isPKCEEnabled !== "boolean") {
|
|
49
|
+
invalidParameters.push("isPKCEEnabled");
|
|
50
|
+
}
|
|
51
|
+
if (!args.isPKCEEnabled) {
|
|
52
|
+
if (args.clientSecret && !(0, utility_1.validateSecret)(args.clientSecret)) {
|
|
53
|
+
invalidParameters.push("clientSecret");
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (invalidParameters.length > 0) {
|
|
57
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
43
60
|
if (getOauthRes.isPKCEEnabled && !args.isPKCEEnabled) {
|
|
44
61
|
throw new oauthDisablePKCEError_1.OauthDisablePKCEError(actionName);
|
|
45
62
|
}
|
|
@@ -56,7 +73,7 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
56
73
|
}
|
|
57
74
|
// If there is difference, ask user to confirm the update
|
|
58
75
|
// Skip confirm if only targetUrlsShouldStartWith is different when the url contains devtunnel
|
|
59
|
-
if (!this.shouldSkipConfirm(diffMsgs, getOauthRes.targetUrlsShouldStartWith, authInfo.domain)) {
|
|
76
|
+
if (!this.shouldSkipConfirm(diffMsgs, getOauthRes.targetUrlsShouldStartWith, authInfo.domain, isCustomIdentityProvider)) {
|
|
60
77
|
const userConfirm = await context.ui.confirm({
|
|
61
78
|
name: "confirm-update-oauth",
|
|
62
79
|
title: (0, localizeUtils_1.getLocalizedString)("driver.oauth.confirm.update", diffMsgs.join(",\n")),
|
|
@@ -66,7 +83,7 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
66
83
|
throw userConfirm.error;
|
|
67
84
|
}
|
|
68
85
|
}
|
|
69
|
-
const oauth = this.mapArgsToOauthRegistration(args, authInfo);
|
|
86
|
+
const oauth = this.mapArgsToOauthRegistration(args, authInfo, isCustomIdentityProvider);
|
|
70
87
|
await teamsDevPortalClient_1.teamsDevPortalClient.updateOauthRegistration(appStudioToken, oauth, args.configurationId);
|
|
71
88
|
void context.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("driver.oauth.info.update", diffMsgs.join(",\n")), false);
|
|
72
89
|
const summary = (0, localizeUtils_1.getLocalizedString)(constants_2.logMessageKeys.successUpdateOauth);
|
|
@@ -120,12 +137,7 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
120
137
|
args.targetAudience !== OauthRegistration_1.OauthRegistrationTargetAudience.HomeTenant) {
|
|
121
138
|
invalidParameters.push("targetAudience");
|
|
122
139
|
}
|
|
123
|
-
|
|
124
|
-
invalidParameters.push("isPKCEEnabled");
|
|
125
|
-
}
|
|
126
|
-
if (invalidParameters.length > 0) {
|
|
127
|
-
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
128
|
-
}
|
|
140
|
+
return invalidParameters;
|
|
129
141
|
}
|
|
130
142
|
compareOauthRegistration(current, input, authInfo) {
|
|
131
143
|
var _a, _b;
|
|
@@ -151,12 +163,15 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
151
163
|
!domain.every((value) => current.targetUrlsShouldStartWith.includes(value))) {
|
|
152
164
|
diffMsgs.push(`targetUrlsShouldStartWith: ${current.targetUrlsShouldStartWith.join(",")} => ${domain.join(",")}`);
|
|
153
165
|
}
|
|
166
|
+
if (input.clientId && current.clientId !== input.clientId) {
|
|
167
|
+
diffMsgs.push(`clientId: ${current.clientId} => ${input.clientId}`);
|
|
168
|
+
}
|
|
154
169
|
// TODO: Need to separate the logic for different flows
|
|
155
170
|
// Compare authorizationEndpoint
|
|
156
171
|
if (!isMicrosoftEntra &&
|
|
157
172
|
authInfo.authorizationEndpoint &&
|
|
158
173
|
current.authorizationEndpoint !== authInfo.authorizationEndpoint) {
|
|
159
|
-
diffMsgs.push(`authorizationEndpoint: ${current.authorizationEndpoint} => ${authInfo.authorizationEndpoint}`);
|
|
174
|
+
diffMsgs.push(`authorizationEndpoint: ${(_a = current.authorizationEndpoint) !== null && _a !== void 0 ? _a : ""} => ${authInfo.authorizationEndpoint}`);
|
|
160
175
|
}
|
|
161
176
|
// Compare tokenExchangeEndpoint
|
|
162
177
|
if (!isMicrosoftEntra &&
|
|
@@ -166,7 +181,7 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
166
181
|
}
|
|
167
182
|
// Compare tokenRefreshEndpoint
|
|
168
183
|
if (!isMicrosoftEntra && current.tokenRefreshEndpoint !== authInfo.tokenRefreshEndpoint) {
|
|
169
|
-
diffMsgs.push(`tokenRefreshEndpoint: ${
|
|
184
|
+
diffMsgs.push(`tokenRefreshEndpoint: ${current.tokenRefreshEndpoint} => ${(_b = authInfo.tokenRefreshEndpoint) !== null && _b !== void 0 ? _b : "Undefined"}`);
|
|
170
185
|
}
|
|
171
186
|
// Compare scopes
|
|
172
187
|
if (!isMicrosoftEntra && !this.compareScopes(current.scopes, authInfo.scopes)) {
|
|
@@ -177,15 +192,20 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
177
192
|
}
|
|
178
193
|
return diffMsgs;
|
|
179
194
|
}
|
|
180
|
-
// Should skip confirm box if only targetUrlsShouldStartWith is different and the url contains devtunnel
|
|
181
|
-
shouldSkipConfirm(diffMsgs, getDomain, domain) {
|
|
182
|
-
|
|
183
|
-
diffMsgs[0].includes("targetUrlsShouldStartWith") &&
|
|
184
|
-
getDomain.length === domain.length &&
|
|
195
|
+
// Should skip confirm box if only targetUrlsShouldStartWith/client id is different and the url contains devtunnel
|
|
196
|
+
shouldSkipConfirm(diffMsgs, getDomain, domain, isCustomIdentityProvider) {
|
|
197
|
+
const targetUrlChangesWithDevTunnel = getDomain.length === domain.length &&
|
|
185
198
|
getDomain.every((value) => value.includes("devtunnel")) &&
|
|
186
|
-
domain.every((value) => value.includes("devtunnel"))
|
|
199
|
+
domain.every((value) => value.includes("devtunnel")) &&
|
|
200
|
+
diffMsgs[0].includes("targetUrlsShouldStartWith");
|
|
201
|
+
if (isCustomIdentityProvider) {
|
|
202
|
+
return diffMsgs.length === 1 && targetUrlChangesWithDevTunnel;
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
return (diffMsgs.length === 2 && targetUrlChangesWithDevTunnel && diffMsgs[1].includes("clientId"));
|
|
206
|
+
}
|
|
187
207
|
}
|
|
188
|
-
mapArgsToOauthRegistration(args, authInfo) {
|
|
208
|
+
mapArgsToOauthRegistration(args, authInfo, isCustomIdentityProvider) {
|
|
189
209
|
var _a;
|
|
190
210
|
const targetAudience = args.targetAudience
|
|
191
211
|
? args.targetAudience
|
|
@@ -193,18 +213,27 @@ let UpdateOauthDriver = class UpdateOauthDriver {
|
|
|
193
213
|
const applicableToApps = args.applicableToApps
|
|
194
214
|
? args.applicableToApps
|
|
195
215
|
: undefined;
|
|
196
|
-
|
|
216
|
+
const result = {
|
|
197
217
|
description: args.name,
|
|
198
218
|
targetUrlsShouldStartWith: authInfo.domain,
|
|
199
219
|
applicableToApps: applicableToApps,
|
|
200
220
|
m365AppId: applicableToApps === OauthRegistration_1.OauthRegistrationAppType.SpecificApp ? args.appId : "",
|
|
201
221
|
targetAudience: targetAudience,
|
|
202
222
|
isPKCEEnabled: !!args.isPKCEEnabled,
|
|
203
|
-
authorizationEndpoint: authInfo.authorizationEndpoint,
|
|
204
|
-
tokenExchangeEndpoint: authInfo.tokenExchangeEndpoint,
|
|
205
|
-
tokenRefreshEndpoint: authInfo.tokenRefreshEndpoint,
|
|
206
223
|
scopes: (_a = authInfo.scopes) !== null && _a !== void 0 ? _a : [],
|
|
207
224
|
};
|
|
225
|
+
if (isCustomIdentityProvider) {
|
|
226
|
+
result.authorizationEndpoint = authInfo.authorizationEndpoint;
|
|
227
|
+
result.tokenExchangeEndpoint = authInfo.tokenExchangeEndpoint;
|
|
228
|
+
result.tokenRefreshEndpoint = authInfo.tokenRefreshEndpoint;
|
|
229
|
+
if (args.clientSecret && !result.isPKCEEnabled) {
|
|
230
|
+
result.clientSecret = args.clientSecret;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
if (args.clientId) {
|
|
234
|
+
result.clientId = args.clientId;
|
|
235
|
+
}
|
|
236
|
+
return result;
|
|
208
237
|
}
|
|
209
238
|
compareScopes(current, input) {
|
|
210
239
|
return (!!input &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6CAA0C;AAC1C,wDAAyE;AACzE,mCAAiC;AACjC,+EAA4E;AAC5E,yDAA4D;AAC5D,iEAAmE;AACnE,kDAA+E;AAG/E,mFAAgF;AAChF,gFAIkD;AAClD,+DAAiE;AAEjE,mDAAqD;AACrD,+CAA+
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/oauth/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ export interface OauthInfo {
|
|
|
7
7
|
tokenExchangeEndpoint?: string;
|
|
8
8
|
tokenRefreshEndpoint?: string;
|
|
9
9
|
scopes?: string[];
|
|
10
|
+
clientId?: string;
|
|
10
11
|
}
|
|
11
12
|
export declare function getandValidateOauthInfoFromSpec(args: CreateOauthArgs | UpdateOauthArgs, context: DriverContext, actionName: string): Promise<OauthInfo>;
|
|
13
|
+
export declare function validateSecret(clientSecret: string): boolean;
|
|
12
14
|
//# sourceMappingURL=utility.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQ/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AASD,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,eAAe,GAAG,eAAe,EACvC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,SAAS,CAAC,CAmEpB"}
|
|
1
|
+
{"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQ/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AASD,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,eAAe,GAAG,eAAe,EACvC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,SAAS,CAAC,CAmEpB;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAU5D"}
|
|
@@ -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.getandValidateOauthInfoFromSpec = void 0;
|
|
5
|
+
exports.validateSecret = exports.getandValidateOauthInfoFromSpec = void 0;
|
|
6
6
|
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
7
7
|
const common_1 = require("../../../utils/common");
|
|
8
8
|
const lodash_1 = require("lodash");
|
|
@@ -77,6 +77,16 @@ async function getandValidateOauthInfoFromSpec(args, context, actionName) {
|
|
|
77
77
|
};
|
|
78
78
|
}
|
|
79
79
|
exports.getandValidateOauthInfoFromSpec = getandValidateOauthInfoFromSpec;
|
|
80
|
+
function validateSecret(clientSecret) {
|
|
81
|
+
if (typeof clientSecret !== "string") {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
if (clientSecret.length > constants_1.maxSecretLength || clientSecret.length < constants_1.minSecretLength) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
exports.validateSecret = validateSecret;
|
|
80
90
|
function validateDomain(domain, actionName) {
|
|
81
91
|
if (domain.length > constants_1.maxDomainPerOauth) {
|
|
82
92
|
throw new oauthDomainInvalid_1.OauthDomainInvalidError(actionName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kEAAsE;AACtE,kDAAwD;AAKxD,mCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,5 +32,6 @@ export declare function getStderrHandler(logProvider: LogProvider, systemEncodin
|
|
|
32
32
|
export declare function bufferToString(data: Buffer, systemEncoding: string): string;
|
|
33
33
|
export declare function convertScriptErrorToFxError(error: child_process.ExecException, run: string): ScriptTimeoutError | ScriptExecutionError;
|
|
34
34
|
export declare function parseSetOutputCommand(stdout: string): DotenvOutput;
|
|
35
|
+
export declare function capitalizeFirstLetter(raw: string): string;
|
|
35
36
|
export {};
|
|
36
37
|
//# sourceMappingURL=scriptDriver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CA0ElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAUlE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -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.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = exports.defaultShell = void 0;
|
|
5
|
+
exports.capitalizeFirstLetter = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = exports.defaultShell = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author huajiezhang <huajiezhang@microsoft.com>
|
|
@@ -12,13 +12,14 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
12
12
|
const child_process_1 = tslib_1.__importDefault(require("child_process"));
|
|
13
13
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
14
14
|
const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
|
|
15
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
16
|
+
const path = tslib_1.__importStar(require("path"));
|
|
15
17
|
const typedi_1 = require("typedi");
|
|
16
|
-
const stringUtils_1 = require("../../../common/stringUtils");
|
|
17
18
|
const script_1 = require("../../../error/script");
|
|
18
19
|
const commonConstant_1 = require("../../constant/commonConstant");
|
|
19
20
|
const charsetUtils_1 = require("../../utils/charsetUtils");
|
|
20
|
-
const pathUtils_1 = require("../../utils/pathUtils");
|
|
21
21
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
22
|
+
const stringUtils_1 = require("../../../common/stringUtils");
|
|
22
23
|
const ACTION_NAME = "script";
|
|
23
24
|
/**
|
|
24
25
|
* Get the default shell for the current platform:
|
|
@@ -77,25 +78,6 @@ ScriptDriver = tslib_1.__decorate([
|
|
|
77
78
|
exports.ScriptDriver = ScriptDriver;
|
|
78
79
|
exports.scriptDriver = new ScriptDriver();
|
|
79
80
|
async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
|
|
80
|
-
const workingDir = pathUtils_1.pathUtils.resolveFilePath(projectPath, workingDirectory);
|
|
81
|
-
if (ui === null || ui === void 0 ? void 0 : ui.runCommand) {
|
|
82
|
-
const res = await ui.runCommand({
|
|
83
|
-
cmd: command,
|
|
84
|
-
workingDirectory: workingDir,
|
|
85
|
-
timeout: timeout,
|
|
86
|
-
shell: shell,
|
|
87
|
-
});
|
|
88
|
-
if (res.isErr()) {
|
|
89
|
-
return (0, teamsfx_api_1.err)(res.error);
|
|
90
|
-
}
|
|
91
|
-
const outputString = res.value;
|
|
92
|
-
const outputObject = parseSetOutputCommand(command);
|
|
93
|
-
if (Object.keys(outputObject).length > 0)
|
|
94
|
-
logProvider.verbose(`script output env variables: ${(0, stringUtils_1.maskSecret)(JSON.stringify(outputObject), {
|
|
95
|
-
replace: "***",
|
|
96
|
-
})}`);
|
|
97
|
-
return (0, teamsfx_api_1.ok)([outputString, outputObject]);
|
|
98
|
-
}
|
|
99
81
|
let systemEncoding = await (0, charsetUtils_1.getSystemEncoding)(command);
|
|
100
82
|
if (command.startsWith("dotnet ")) {
|
|
101
83
|
systemEncoding = "utf-8";
|
|
@@ -105,9 +87,15 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
105
87
|
var _a, _b;
|
|
106
88
|
const finalShell = shell || dshell;
|
|
107
89
|
const finalCmd = command;
|
|
90
|
+
const platform = os_1.default.platform();
|
|
91
|
+
let workingDir = workingDirectory || ".";
|
|
92
|
+
workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
|
|
93
|
+
if (platform === "win32") {
|
|
94
|
+
workingDir = capitalizeFirstLetter(path.resolve(workingDir !== null && workingDir !== void 0 ? workingDir : ""));
|
|
95
|
+
}
|
|
108
96
|
let appendFile = undefined;
|
|
109
97
|
if (redirectTo) {
|
|
110
|
-
appendFile =
|
|
98
|
+
appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
|
|
111
99
|
}
|
|
112
100
|
logProvider.verbose(`Start to run command: "${(0, stringUtils_1.maskSecret)(finalCmd, {
|
|
113
101
|
replace: "***",
|
|
@@ -196,4 +184,8 @@ function parseSetOutputCommand(stdout) {
|
|
|
196
184
|
return output;
|
|
197
185
|
}
|
|
198
186
|
exports.parseSetOutputCommand = parseSetOutputCommand;
|
|
187
|
+
function capitalizeFirstLetter(raw) {
|
|
188
|
+
return raw.charAt(0).toUpperCase() + raw.slice(1);
|
|
189
|
+
}
|
|
190
|
+
exports.capitalizeFirstLetter = capitalizeFirstLetter;
|
|
199
191
|
//# sourceMappingURL=scriptDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,6CAA0C;AAC1C,wDAA+E;AAC/E,0EAA0C;AAC1C,gEAA0B;AAC1B,oEAA+B;AAC/B,mCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthConfigurationId.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/OauthConfigurationId.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,2BAA2B,EAAE,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"OauthConfigurationId.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/OauthConfigurationId.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,2BAA2B,EAAE,2BAA2B,CAAC;IACzD,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,2BAA2B;IAC1C,aAAa,EAAE,MAAM,CAAC;CACvB"}
|
|
@@ -6,8 +6,8 @@ export interface OauthRegistration {
|
|
|
6
6
|
description?: string;
|
|
7
7
|
clientId: string;
|
|
8
8
|
clientSecret: string;
|
|
9
|
-
authorizationEndpoint
|
|
10
|
-
tokenExchangeEndpoint
|
|
9
|
+
authorizationEndpoint?: string;
|
|
10
|
+
tokenExchangeEndpoint?: string;
|
|
11
11
|
tokenRefreshEndpoint?: string;
|
|
12
12
|
scopes: string[];
|
|
13
13
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/OauthRegistration.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IAErB,qBAAqB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"OauthRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/OauthRegistration.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IAErB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C;;OAEG;IACH,cAAc,CAAC,EAAE,+BAA+B,CAAC;IACjD,iBAAiB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAE5C;;OAEG;IACH,yBAAyB,EAAE,MAAM,EAAE,CAAC;IAGpC,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,oBAAY,wBAAwB;IAClC,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB;AAED,oBAAY,+BAA+B;IACzC,UAAU,eAAe;IACzB,SAAS,cAAc;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,+BAA+B,CAAC;CAC7C;AAED,oBAAY,+BAA+B;IACzC,IAAI,SAAS;IACb,SAAS,cAAc;CACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teamsappMgr.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/teamsappMgr.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,cAAc,EACd,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAczE,cAAM,WAAW;IACT,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAejF,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAcvF,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"teamsappMgr.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/teamsappMgr.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,cAAc,EACd,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAczE,cAAM,WAAW;IACT,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAejF,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAcvF,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAyD1F,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IA4C7F;;OAEG;IACG,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAmDnF;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA2D3E,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAuCnF;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teamsappMgr.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/teamsappMgr.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"teamsappMgr.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/teamsappMgr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/generator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAGN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/apiSpec/generator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,OAAO,EAKP,OAAO,EACP,eAAe,EACf,MAAM,EAIN,MAAM,EAGN,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAuCzD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAUD,qBAAa,aAAc,SAAQ,wBAAwB;IACzD,aAAa,SAAoB;IAQ1B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAW1D,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAqB1B,gBAAgB,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAqJ9B,IAAI,CACf,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAiK7C"}
|
|
@@ -97,8 +97,9 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
|
|
|
97
97
|
["is-declarative-copilot" /* telemetryProperties.isDeclarativeCopilot */]: isDeclarativeCopilot.toString(),
|
|
98
98
|
});
|
|
99
99
|
// For Kiota integration, we need to get auth info here
|
|
100
|
-
|
|
101
|
-
inputs[constants_1.QuestionNames.ApiPluginManifestPath]
|
|
100
|
+
const isKiotaIntegration = featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
|
|
101
|
+
inputs[constants_1.QuestionNames.ApiPluginManifestPath];
|
|
102
|
+
if (isKiotaIntegration) {
|
|
102
103
|
const operationsResult = await (0, helper_1.listOperations)(context, inputs[constants_1.QuestionNames.ApiSpecLocation], inputs);
|
|
103
104
|
if (operationsResult.isErr()) {
|
|
104
105
|
const msg = operationsResult.error.map((e) => e.content).join("\n");
|
|
@@ -148,7 +149,9 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
|
|
|
148
149
|
const envName = (0, helper_1.getEnvName)(authData.authName, authData.authType);
|
|
149
150
|
context.templateVariables = generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true", {
|
|
150
151
|
authName: authData.authName,
|
|
151
|
-
openapiSpecPath:
|
|
152
|
+
openapiSpecPath: isKiotaIntegration
|
|
153
|
+
? normalizePath(path_1.default.join(teamsfx_api_1.AppPackageFolderName, path_1.default.basename(inputs[constants_1.QuestionNames.ApiSpecLocation])))
|
|
154
|
+
: normalizePath(path_1.default.join(teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultApiSpecFolderName, openapiSpecFileName)),
|
|
152
155
|
registrationIdEnvName: envName,
|
|
153
156
|
authType: authData.authType,
|
|
154
157
|
}, llmServiceData);
|
|
@@ -242,9 +245,6 @@ class SpecGenerator extends templateGenerator_1.DefaultTemplateGenerator {
|
|
|
242
245
|
throw new teamsfx_api_1.SystemError(this.componentName, failedToUpdateCustomApiTemplateErrorName, error.message, error.message);
|
|
243
246
|
}
|
|
244
247
|
}
|
|
245
|
-
if (isKiotaIntegration) {
|
|
246
|
-
await (0, helper_1.copyKiotaFolder)(inputs[constants_1.QuestionNames.ApiPluginManifestPath], destinationPath);
|
|
247
|
-
}
|
|
248
248
|
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
|
|
249
249
|
if (manifestRes.isErr()) {
|
|
250
250
|
return (0, teamsfx_api_1.err)(manifestRes.error);
|