@microsoft/teamsfx-core 2.0.8-alpha.54a90c74e.0 → 2.0.8-alpha.a277dba4e.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/templates-config.json +1 -1
- package/build/component/driver/aad/create.d.ts +1 -0
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -2
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/clientSecretNotAllowedError.d.ts +5 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.d.ts.map +1 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js +23 -0
- package/build/component/driver/aad/error/clientSecretNotAllowedError.js.map +1 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.d.ts +5 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.d.ts.map +1 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js +23 -0
- package/build/component/driver/aad/error/credentialInvalidLifetimeError.js.map +1 -0
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +26 -10
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +6 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +8 -2
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +2 -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/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": "~4.1",
|
|
3
|
-
"localVersion": "4.2.1-alpha.
|
|
3
|
+
"localVersion": "4.2.1-alpha.a277dba4e.0",
|
|
4
4
|
"tagPrefix": "templates@",
|
|
5
5
|
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
|
|
6
6
|
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
|
|
@@ -5,6 +5,7 @@ export declare class CreateAadAppDriver implements StepDriver {
|
|
|
5
5
|
description: string;
|
|
6
6
|
readonly progressTitle: string;
|
|
7
7
|
execute(args: CreateAadAppArgs, context: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
|
|
8
|
+
private executeInternal;
|
|
8
9
|
private validateArgs;
|
|
9
10
|
private setAadEndpointInfo;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAchE,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAChE,QAAQ,CAAC,aAAa,SAAqE;IAE9E,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAMb,eAAe;IA+I7B,OAAO,CAAC,YAAY;YA+BN,kBAAkB;CAWjC"}
|
|
@@ -20,6 +20,8 @@ const createAadAppOutput_1 = require("./interface/createAadAppOutput");
|
|
|
20
20
|
const signInAudience_1 = require("./interface/signInAudience");
|
|
21
21
|
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
22
22
|
const constants_1 = require("./utility/constants");
|
|
23
|
+
const wrapUtil_1 = require("../util/wrapUtil");
|
|
24
|
+
const constants_2 = require("./utility/constants");
|
|
23
25
|
const actionName = "aadApp/create"; // DO NOT MODIFY the name
|
|
24
26
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-create";
|
|
25
27
|
const driverConstants = {
|
|
@@ -31,6 +33,10 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
31
33
|
this.progressTitle = localizeUtils_1.getLocalizedString("driver.aadApp.progressBar.createAadAppTitle");
|
|
32
34
|
}
|
|
33
35
|
async execute(args, context, outputEnvVarNames) {
|
|
36
|
+
const wrapDriverContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
|
|
37
|
+
return await this.executeInternal(args, wrapDriverContext, outputEnvVarNames);
|
|
38
|
+
}
|
|
39
|
+
async executeInternal(args, context, outputEnvVarNames) {
|
|
34
40
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
35
41
|
const summaries = [];
|
|
36
42
|
let outputs = new Map();
|
|
@@ -44,6 +50,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
44
50
|
const aadAppState = utils_1.loadStateFromEnv(outputEnvVarNames);
|
|
45
51
|
if (!aadAppState.clientId) {
|
|
46
52
|
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.startCreateAadApp, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientId)));
|
|
53
|
+
context.addTelemetryProperties({ [constants_2.telemetryKeys.newAadApp]: "true" });
|
|
47
54
|
// Create new Microsoft Entra app if no client id exists
|
|
48
55
|
const signInAudience = args.signInAudience
|
|
49
56
|
? args.signInAudience
|
|
@@ -59,6 +66,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
59
66
|
}
|
|
60
67
|
else {
|
|
61
68
|
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.skipCreateAadApp, outputEnvVarNames.get(createAadAppOutput_1.OutputKeys.clientId)));
|
|
69
|
+
context.addTelemetryProperties({ [constants_2.telemetryKeys.newAadApp]: "false" });
|
|
62
70
|
}
|
|
63
71
|
if (args.generateClientSecret) {
|
|
64
72
|
if (!aadAppState.clientSecret) {
|
|
@@ -155,9 +163,10 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
155
163
|
tslib_1.__decorate([
|
|
156
164
|
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
|
|
157
165
|
tslib_1.__metadata("design:type", Function),
|
|
158
|
-
tslib_1.__metadata("design:paramtypes", [Object,
|
|
166
|
+
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext,
|
|
167
|
+
Map]),
|
|
159
168
|
tslib_1.__metadata("design:returntype", Promise)
|
|
160
|
-
], CreateAadAppDriver.prototype, "
|
|
169
|
+
], CreateAadAppDriver.prototype, "executeInternal", null);
|
|
161
170
|
CreateAadAppDriver = tslib_1.__decorate([
|
|
162
171
|
typedi_1.Service(actionName) // DO NOT MODIFY the service name
|
|
163
172
|
], CreateAadAppDriver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAA4F;AAC5F,0DAA0B;AAC1B,mCAAiC;AACjC,iEAAmE;AACnE,iDAAoD;AACpD,kDAK+B;AAC/B,8GAA2G;AAG3G,mFAAgF;AAChF,yCAAgE;AAChE,2EAAwE;AACxE,6DAA8D;AAE9D,uEAAgF;AAChF,+DAA4D;AAC5D,yDAAsD;AACtD,mDAAwF;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientSecretNotAllowedError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/error/clientSecretNotAllowedError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAOnD,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAS/B"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.ClientSecretNotAllowedError = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
+
const constants_1 = require("../utility/constants");
|
|
9
|
+
const errorCode = "ClientSecretNotAllowed";
|
|
10
|
+
const messageKey = "driver.aadApp.error.credentialTypeNotAllowedAsPerAppPolicy";
|
|
11
|
+
class ClientSecretNotAllowedError extends teamsfx_api_1.UserError {
|
|
12
|
+
constructor(actionName) {
|
|
13
|
+
super({
|
|
14
|
+
source: actionName,
|
|
15
|
+
name: errorCode,
|
|
16
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
17
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
18
|
+
helpLink: constants_1.constants.defaultHelpLink,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.ClientSecretNotAllowedError = ClientSecretNotAllowedError;
|
|
23
|
+
//# sourceMappingURL=clientSecretNotAllowedError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientSecretNotAllowedError.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/error/clientSecretNotAllowedError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AACxF,oDAAiD;AAEjD,MAAM,SAAS,GAAG,wBAAwB,CAAC;AAC3C,MAAM,UAAU,GAAG,4DAA4D,CAAC;AAEhF,MAAa,2BAA4B,SAAQ,uBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,CAAC;YACrC,cAAc,EAAE,kCAAkB,CAAC,UAAU,CAAC;YAC9C,QAAQ,EAAE,qBAAS,CAAC,eAAe;SACpC,CAAC,CAAC;IACL,CAAC;CACF;AAVD,kEAUC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentialInvalidLifetimeError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/error/credentialInvalidLifetimeError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAOnD,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,UAAU,EAAE,MAAM;CAS/B"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.CredentialInvalidLifetimeError = void 0;
|
|
6
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
+
const constants_1 = require("../utility/constants");
|
|
9
|
+
const errorCode = "CredentialInvalidLifetime";
|
|
10
|
+
const messageKey = "driver.aadApp.error.credentialInvalidLifetimeAsPerAppPolicy";
|
|
11
|
+
class CredentialInvalidLifetimeError extends teamsfx_api_1.UserError {
|
|
12
|
+
constructor(actionName) {
|
|
13
|
+
super({
|
|
14
|
+
source: actionName,
|
|
15
|
+
name: errorCode,
|
|
16
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
17
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
18
|
+
helpLink: constants_1.constants.defaultHelpLink,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.CredentialInvalidLifetimeError = CredentialInvalidLifetimeError;
|
|
23
|
+
//# sourceMappingURL=credentialInvalidLifetimeError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentialInvalidLifetimeError.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/error/credentialInvalidLifetimeError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AACxF,oDAAiD;AAEjD,MAAM,SAAS,GAAG,2BAA2B,CAAC;AAC9C,MAAM,UAAU,GAAG,6DAA6D,CAAC;AAEjF,MAAa,8BAA+B,SAAQ,uBAAS;IAC3D,YAAY,UAAkB;QAC5B,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,CAAC;YACrC,cAAc,EAAE,kCAAkB,CAAC,UAAU,CAAC;YAC9C,QAAQ,EAAE,qBAAS,CAAC,eAAe;SACpC,CAAC,CAAC;IACL,CAAC;CACF;AAVD,wEAUC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAOlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAOlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAS7D,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAiB,kBAAkB;QACjC,aAAa,CAAC,EAAE,iBAAiB,CAAC;KACnC;CACF;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;gBAE1D,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAwC9D,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAA4C,EAC5D,0BAA0B,CAAC,EAAE,MAAM,GAClC,OAAO,CAAC,cAAc,CAAC;IAab,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAC/B,QAAQ,EAAE,MAAM,EAChB,sBAAsB,SAAM,EAAE,yCAAyC;IACvE,uBAAuB,SAAY,GAClC,OAAO,CAAC,MAAM,CAAC;IA2CL,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BlD,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IA0B5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -14,6 +14,8 @@ const aadManifestError_1 = require("../error/aadManifestError");
|
|
|
14
14
|
const signInAudience_1 = require("../interface/signInAudience");
|
|
15
15
|
const aadManifestHelper_1 = require("./aadManifestHelper");
|
|
16
16
|
const constants_1 = require("./constants");
|
|
17
|
+
const credentialInvalidLifetimeError_1 = require("../error/credentialInvalidLifetimeError");
|
|
18
|
+
const clientSecretNotAllowedError_1 = require("../error/clientSecretNotAllowedError");
|
|
17
19
|
class AadAppClient {
|
|
18
20
|
constructor(m365TokenProvider, logProvider) {
|
|
19
21
|
this.retryNumber = 5;
|
|
@@ -64,6 +66,7 @@ class AadAppClient {
|
|
|
64
66
|
}
|
|
65
67
|
async generateClientSecret(objectId, clientSecretExpireDays = 180, // Recommended lifetime from Azure Portal
|
|
66
68
|
clientSecretDescription = "default") {
|
|
69
|
+
var _a, _b, _c, _d;
|
|
67
70
|
const startDate = new Date();
|
|
68
71
|
const endDate = new Date(startDate.getTime());
|
|
69
72
|
endDate.setDate(endDate.getDate() + clientSecretExpireDays);
|
|
@@ -74,16 +77,29 @@ class AadAppClient {
|
|
|
74
77
|
startDateTime: startDate.toISOString(),
|
|
75
78
|
},
|
|
76
79
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
axios_retry_1.default.
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
80
|
+
try {
|
|
81
|
+
const response = await this.axios.post(`applications/${objectId}/addPassword`, requestBody, {
|
|
82
|
+
"axios-retry": {
|
|
83
|
+
retries: this.retryNumber,
|
|
84
|
+
retryDelay: axios_retry_1.default.exponentialDelay,
|
|
85
|
+
retryCondition: (error) => axios_retry_1.default.isNetworkError(error) ||
|
|
86
|
+
axios_retry_1.default.isRetryableError(error) ||
|
|
87
|
+
this.is404Error(error), // also retry 404 error since Microsoft Entra need sometime to sync created Microsoft Entra app data
|
|
88
|
+
},
|
|
89
|
+
});
|
|
90
|
+
return response.data.secretText;
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
if (axios_1.default.isAxiosError(err) && err.response) {
|
|
94
|
+
if (((_b = (_a = err.response.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.code) === constants_1.aadErrorCode.credentialInvalidLifetimeAsPerAppPolicy) {
|
|
95
|
+
throw new credentialInvalidLifetimeError_1.CredentialInvalidLifetimeError(AadAppClient.name);
|
|
96
|
+
}
|
|
97
|
+
if (((_d = (_c = err.response.data) === null || _c === void 0 ? void 0 : _c.error) === null || _d === void 0 ? void 0 : _d.code) === constants_1.aadErrorCode.credentialTypeNotAllowedAsPerAppPolicy) {
|
|
98
|
+
throw new clientSecretNotAllowedError_1.ClientSecretNotAllowedError(AadAppClient.name);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
throw err;
|
|
102
|
+
}
|
|
87
103
|
}
|
|
88
104
|
async updateAadApp(manifest) {
|
|
89
105
|
var _a, _b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAE9C,0DAA8E;AAC9E,sEAA4D;AAC5D,oEAAsE;AAEtE,oDAAuD;AACvD,4DAA6D;AAC7D,gEAGmC;AAInC,gEAA6D;AAC7D,2DAAwD;AACxD,2CAAsD;
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,15 @@ export declare const permissionsKeys: {
|
|
|
24
24
|
export declare const aadErrorCode: {
|
|
25
25
|
permissionErrorCode: string;
|
|
26
26
|
hostNameNotOnVerifiedDomain: string;
|
|
27
|
+
credentialInvalidLifetimeAsPerAppPolicy: string;
|
|
28
|
+
credentialTypeNotAllowedAsPerAppPolicy: string;
|
|
27
29
|
};
|
|
28
30
|
export declare const constants: {
|
|
29
31
|
aadAppPasswordDisplayName: string;
|
|
30
32
|
oauthAuthorityPrefix: string;
|
|
33
|
+
defaultHelpLink: string;
|
|
34
|
+
};
|
|
35
|
+
export declare const telemetryKeys: {
|
|
36
|
+
newAadApp: string;
|
|
31
37
|
};
|
|
32
38
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC;AAEF,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC;AAEF,eAAO,MAAM,SAAS;;;;CAIrB,CAAC;AAEF,eAAO,MAAM,aAAa;;CAEzB,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.constants = exports.aadErrorCode = exports.permissionsKeys = exports.descriptionMessageKeys = exports.logMessageKeys = void 0;
|
|
5
|
+
exports.telemetryKeys = exports.constants = exports.aadErrorCode = exports.permissionsKeys = exports.descriptionMessageKeys = exports.logMessageKeys = void 0;
|
|
6
6
|
exports.logMessageKeys = {
|
|
7
7
|
startExecuteDriver: "driver.aadApp.log.startExecuteDriver",
|
|
8
8
|
successExecuteDriver: "driver.aadApp.log.successExecuteDriver",
|
|
@@ -28,10 +28,16 @@ exports.permissionsKeys = {
|
|
|
28
28
|
};
|
|
29
29
|
exports.aadErrorCode = {
|
|
30
30
|
permissionErrorCode: "CannotDeleteOrUpdateEnabledEntitlement",
|
|
31
|
-
hostNameNotOnVerifiedDomain: "HostNameNotOnVerifiedDomain",
|
|
31
|
+
hostNameNotOnVerifiedDomain: "HostNameNotOnVerifiedDomain",
|
|
32
|
+
credentialInvalidLifetimeAsPerAppPolicy: "CredentialInvalidLifetimeAsPerAppPolicy",
|
|
33
|
+
credentialTypeNotAllowedAsPerAppPolicy: "CredentialTypeNotAllowedAsPerAppPolicy",
|
|
32
34
|
};
|
|
33
35
|
exports.constants = {
|
|
34
36
|
aadAppPasswordDisplayName: "default",
|
|
35
37
|
oauthAuthorityPrefix: "https://login.microsoftonline.com",
|
|
38
|
+
defaultHelpLink: "https://aka.ms/teamsfx-actions/aadapp-create",
|
|
39
|
+
};
|
|
40
|
+
exports.telemetryKeys = {
|
|
41
|
+
newAadApp: "new-aad-app",
|
|
36
42
|
};
|
|
37
43
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,qBAAqB;IAC3B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,eAAe;IAC7B,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,mBAAmB,EAAE,wCAAwC;IAC7D,2BAA2B,EAAE,6BAA6B,EAAE,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,qBAAqB;IAC3B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,eAAe;IAC7B,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,mBAAmB,EAAE,wCAAwC;IAC7D,2BAA2B,EAAE,6BAA6B;IAC1D,uCAAuC,EAAE,yCAAyC;IAClF,sCAAsC,EAAE,wCAAwC;CACjF,CAAC;AAEW,QAAA,SAAS,GAAG;IACvB,yBAAyB,EAAE,SAAS;IACpC,oBAAoB,EAAE,mCAAmC;IACzD,eAAe,EAAE,8CAA8C;CAChE,CAAC;AAEW,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,aAAa;CACzB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "2.0.8-alpha.
|
|
3
|
+
"version": "2.0.8-alpha.a277dba4e.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -89,8 +89,8 @@
|
|
|
89
89
|
"@feathersjs/hooks": "^0.6.5",
|
|
90
90
|
"@microsoft/dev-tunnels-contracts": "1.1.9",
|
|
91
91
|
"@microsoft/dev-tunnels-management": "1.1.9",
|
|
92
|
-
"@microsoft/m365-spec-parser": "^0.1.1-alpha.
|
|
93
|
-
"@microsoft/teamsfx-api": "0.22.8-alpha.
|
|
92
|
+
"@microsoft/m365-spec-parser": "^0.1.1-alpha.a277dba4e.0",
|
|
93
|
+
"@microsoft/teamsfx-api": "0.22.8-alpha.a277dba4e.0",
|
|
94
94
|
"adm-zip": "^0.5.10",
|
|
95
95
|
"ajv": "^8.5.0",
|
|
96
96
|
"axios": "^1.6.7",
|
|
@@ -206,7 +206,7 @@
|
|
|
206
206
|
"resource/**/*",
|
|
207
207
|
"templates/**/*"
|
|
208
208
|
],
|
|
209
|
-
"gitHead": "
|
|
209
|
+
"gitHead": "fc43da6bdf04948555fc8c425324b475cc05bb95",
|
|
210
210
|
"publishConfig": {
|
|
211
211
|
"access": "public"
|
|
212
212
|
},
|
|
@@ -597,6 +597,8 @@
|
|
|
597
597
|
"driver.aadApp.error.generateSecretFailed": "Cannot generate client secret.",
|
|
598
598
|
"driver.aadApp.error.invalidFieldInManifest": "Field %s is missing or invalid in Microsoft Entra app manifest.",
|
|
599
599
|
"driver.aadApp.error.appNameTooLong": "The name for this Microsoft Entra app is too long. The maximum length is 120.",
|
|
600
|
+
"driver.aadApp.error.credentialInvalidLifetimeAsPerAppPolicy": "The client secret lifetime is too long for your tenant. Use a shorter value with the clientSecretExpireDays parameter.",
|
|
601
|
+
"driver.aadApp.error.credentialTypeNotAllowedAsPerAppPolicy": "Your tenant doesn't allow creating a client secret for Microsoft Entra app. Create and configure the app manually.",
|
|
600
602
|
"driver.aadApp.progressBar.createAadAppTitle": "Creating Microsoft Entra application...",
|
|
601
603
|
"driver.aadApp.progressBar.updateAadAppTitle": "Updating Microsoft Entra application...",
|
|
602
604
|
"driver.aadApp.log.startExecuteDriver": "Executing action %s",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|