@microsoft/teamsfx-core 2.0.8-alpha.2f5decfcc.0 → 2.0.8-alpha.4cb5c08a8.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.js +46 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +7 -2
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +25 -7
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples.d.ts +1 -2
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +37 -83
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +3 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +3 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +20 -34
- package/build/component/coordinator/index.js.map +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 +22 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +6 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +25 -1
- package/build/component/driver/aad/error/aadManifestError.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/interface/IAADDefinition.d.ts +1 -0
- package/build/component/driver/aad/interface/IAADDefinition.d.ts.map +1 -1
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts +3 -0
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts.map +1 -1
- package/build/component/driver/aad/permissions/index.d.ts.map +1 -1
- package/build/component/driver/aad/permissions/index.js +9 -0
- package/build/component/driver/aad/permissions/index.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +3 -2
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +35 -17
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +7 -0
- package/build/component/driver/aad/utility/aadManifestHelper.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/build/component/driver/apiKey/create.d.ts +0 -3
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +23 -51
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -0
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.d.ts +9 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.d.ts.map +1 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.js +5 -0
- package/build/component/driver/apiKey/interface/updateApiKeyArgs.js.map +1 -0
- package/build/component/driver/apiKey/update.d.ts +13 -0
- package/build/component/driver/apiKey/update.d.ts.map +1 -0
- package/build/component/driver/apiKey/update.js +182 -0
- package/build/component/driver/apiKey/update.js.map +1 -0
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -0
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +2 -0
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.d.ts +7 -0
- package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -0
- package/build/component/driver/apiKey/utility/utility.js +56 -0
- package/build/component/driver/apiKey/utility/utility.js.map +1 -0
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +2 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +12 -0
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +1 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -0
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +2 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +36 -21
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts +20 -0
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.d.ts.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +22 -8
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +5 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +20 -4
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +4 -2
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +7 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +54 -43
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts +4 -1
- package/build/component/generator/officeXMLAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/generator.js +20 -14
- package/build/component/generator/officeXMLAddin/generator.js.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts +21 -33
- package/build/component/generator/officeXMLAddin/projectConfig.d.ts.map +1 -1
- package/build/component/generator/officeXMLAddin/projectConfig.js +73 -86
- package/build/component/generator/officeXMLAddin/projectConfig.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.d.ts +8 -6
- package/build/component/utils/metadataGraphPermssion.d.ts.map +1 -1
- package/build/component/utils/metadataGraphPermssion.js +10 -2
- package/build/component/utils/metadataGraphPermssion.js.map +1 -1
- package/build/component/utils/metadataRscPermission.d.ts +16 -0
- package/build/component/utils/metadataRscPermission.d.ts.map +1 -0
- package/build/component/utils/metadataRscPermission.js +69 -0
- package/build/component/utils/metadataRscPermission.js.map +1 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +2 -0
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +4 -1
- package/build/core/FxCore.js.map +1 -1
- package/build/question/create.d.ts +13 -7
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +220 -184
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +3 -5
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +17 -9
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/questionNames.d.ts +0 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +0 -1
- package/build/question/questionNames.js.map +1 -1
- package/package.json +5 -4
- package/resource/package.nls.json +15 -1
- package/resource/yaml-schema/v1.5/yaml.schema.json +1663 -0
- package/resource/yaml-schema/yaml.schema.json +77 -2
- 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
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts +0 -26
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +0 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +0 -165
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IAADDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/interface/IAADDefinition.ts"],"names":[],"mappings":"AAGA,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,UAAU,sBAAsB;IAC9B,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB,EAAE,MAAM,EAAE,CAAC;CAClC;AAED,UAAU,GAAG;IACX,2BAA2B,EAAE,MAAM,CAAC;IACpC,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;IACjD,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;CACvD;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,EAAE,GAAG,EAAE,CAAC;CAC7B;AAED,UAAU,cAAc;IACtB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,sBAAsB;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,UAAU,kBAAkB;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,sBAAsB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAClD,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"IAADDefinition.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/interface/IAADDefinition.ts"],"names":[],"mappings":"AAGA,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,UAAU,sBAAsB;IAC9B,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB,EAAE,MAAM,EAAE,CAAC;CAClC;AAED,UAAU,GAAG;IACX,2BAA2B,EAAE,MAAM,CAAC;IACpC,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;IACjD,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;CACvD;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,EAAE,GAAG,EAAE,CAAC;CAC7B;AAED,UAAU,cAAc;IACtB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,sBAAsB;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;AAED,UAAU,kBAAkB;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,sBAAsB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAClD,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC"}
|
|
@@ -3,5 +3,8 @@ export interface CreateAadAppArgs {
|
|
|
3
3
|
name: string;
|
|
4
4
|
generateClientSecret: boolean;
|
|
5
5
|
signInAudience?: SignInAudience;
|
|
6
|
+
clientSecretExpireDays?: number;
|
|
7
|
+
clientSecretDescription?: string;
|
|
8
|
+
serviceManagementReference?: string;
|
|
6
9
|
}
|
|
7
10
|
//# sourceMappingURL=createAadAppArgs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAadAppArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/interface/createAadAppArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"createAadAppArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/interface/createAadAppArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/permissions/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,yCAAyC,CAAC;AACjE,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAG9C,wBAAgB,gBAAgB,IAAI,GAAG,CA8BtC;AAED,wBAAgB,6BAA6B,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/permissions/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,yCAAyC,CAAC;AACjE,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAG9C,wBAAgB,gBAAgB,IAAI,GAAG,CA8BtC;AAED,wBAAgB,6BAA6B,IAAI,GAAG,CAqCnD"}
|
|
@@ -50,6 +50,8 @@ function getDetailedGraphPermissionMap() {
|
|
|
50
50
|
const map = {};
|
|
51
51
|
map.scopeIds = {};
|
|
52
52
|
map.scopes = {};
|
|
53
|
+
map.roleIds = {};
|
|
54
|
+
map.roles = {};
|
|
53
55
|
graphPermission.oauth2PermissionScopes.forEach((scope) => {
|
|
54
56
|
map.scopeIds[scope.id] = {
|
|
55
57
|
// value is the scope name
|
|
@@ -59,6 +61,13 @@ function getDetailedGraphPermissionMap() {
|
|
|
59
61
|
};
|
|
60
62
|
map.scopes[scope.value] = scope.id;
|
|
61
63
|
});
|
|
64
|
+
graphPermission.appRoles.forEach((role) => {
|
|
65
|
+
map.roleIds[role.id] = {
|
|
66
|
+
// value is the role name
|
|
67
|
+
value: role.value,
|
|
68
|
+
};
|
|
69
|
+
map.roles[role.value] = role.id;
|
|
70
|
+
});
|
|
62
71
|
loadedGraphPermissionMap = map;
|
|
63
72
|
return map;
|
|
64
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/permissions/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,+EAAyD;AAC5C,QAAA,UAAU,GAAG,sCAAsC,CAAC;AACpD,QAAA,YAAY,GAAG,iBAAiB,CAAC;AAC9C,IAAI,SAAS,GAAQ,IAAI,CAAC;AAC1B,IAAI,wBAAwB,GAAQ,IAAI,CAAC;AACzC,SAAgB,gBAAgB;IAC9B,IAAI,SAAS,EAAE;QACb,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,cAAc,GAAG,kBAAqC,CAAC;IAC7D,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC;QACpC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;QAC5B,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAC3B,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC;QAC9B,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC;QAC7B,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC;QAChC,GAAG,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;QAErD,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClD,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,SAAS,GAAG,GAAG,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AA9BD,4CA8BC;AAED,SAAgB,6BAA6B;IAC3C,IAAI,wBAAwB,EAAE;QAC5B,OAAO,wBAAwB,CAAC;KACjC;IACD,MAAM,cAAc,GAAG,kBAAqC,CAAC;IAC7D,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAC/C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,KAAK,kBAAU,CAChD,CAAC;IACF,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC;IAClB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/permissions/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,10 @@ export declare class AadAppClient {
|
|
|
16
16
|
private readonly axios;
|
|
17
17
|
private readonly baseUrl;
|
|
18
18
|
constructor(m365TokenProvider: M365TokenProvider, logProvider?: LogProvider);
|
|
19
|
-
createAadApp(displayName: string, signInAudience?: SignInAudience): Promise<AADApplication>;
|
|
19
|
+
createAadApp(displayName: string, signInAudience?: SignInAudience, serviceManagementReference?: string): Promise<AADApplication>;
|
|
20
20
|
deleteAadApp(id: string): Promise<void>;
|
|
21
|
-
generateClientSecret(objectId: string
|
|
21
|
+
generateClientSecret(objectId: string, clientSecretExpireDays?: number, // Recommended lifetime from Azure Portal
|
|
22
|
+
clientSecretDescription?: string): Promise<string>;
|
|
22
23
|
updateAadApp(manifest: AADManifest): Promise<void>;
|
|
23
24
|
getOwners(objectId: string): Promise<AadOwner[] | undefined>;
|
|
24
25
|
addOwner(objectId: string, userObjectId: string): Promise<void>;
|
|
@@ -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;
|
|
@@ -50,38 +52,54 @@ class AadAppClient {
|
|
|
50
52
|
retryCondition: (error) => axios_retry_1.default.isNetworkError(error) || axios_retry_1.default.isRetryableError(error), // retry when there's network error or 5xx error
|
|
51
53
|
});
|
|
52
54
|
}
|
|
53
|
-
async createAadApp(displayName, signInAudience = signInAudience_1.SignInAudience.AzureADMyOrg) {
|
|
55
|
+
async createAadApp(displayName, signInAudience = signInAudience_1.SignInAudience.AzureADMyOrg, serviceManagementReference) {
|
|
54
56
|
const requestBody = {
|
|
55
57
|
displayName: displayName,
|
|
56
58
|
signInAudience: signInAudience,
|
|
57
|
-
|
|
59
|
+
serviceManagementReference: serviceManagementReference,
|
|
60
|
+
}; // Create a Microsoft Entra app and optionally set service tree id
|
|
58
61
|
const response = await this.axios.post("applications", requestBody);
|
|
59
62
|
return response.data;
|
|
60
63
|
}
|
|
61
64
|
async deleteAadApp(id) {
|
|
62
65
|
await this.axios.delete(`applications/${id}`);
|
|
63
66
|
}
|
|
64
|
-
async generateClientSecret(objectId
|
|
67
|
+
async generateClientSecret(objectId, clientSecretExpireDays = 180, // Recommended lifetime from Azure Portal
|
|
68
|
+
clientSecretDescription = "default") {
|
|
69
|
+
var _a, _b, _c, _d;
|
|
65
70
|
const startDate = new Date();
|
|
66
71
|
const endDate = new Date(startDate.getTime());
|
|
67
|
-
endDate.setDate(endDate.getDate() +
|
|
72
|
+
endDate.setDate(endDate.getDate() + clientSecretExpireDays);
|
|
68
73
|
const requestBody = {
|
|
69
74
|
passwordCredential: {
|
|
70
|
-
displayName:
|
|
75
|
+
displayName: clientSecretDescription,
|
|
71
76
|
endDateTime: endDate.toISOString(),
|
|
72
77
|
startDateTime: startDate.toISOString(),
|
|
73
78
|
},
|
|
74
79
|
};
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
axios_retry_1.default.
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
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
|
+
}
|
|
85
103
|
}
|
|
86
104
|
async updateAadApp(manifest) {
|
|
87
105
|
var _a, _b;
|
|
@@ -160,7 +178,7 @@ class AadAppClient {
|
|
|
160
178
|
tslib_1.__decorate([
|
|
161
179
|
lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
|
|
162
180
|
tslib_1.__metadata("design:type", Function),
|
|
163
|
-
tslib_1.__metadata("design:paramtypes", [String,
|
|
181
|
+
tslib_1.__metadata("design:paramtypes", [String, String, String]),
|
|
164
182
|
tslib_1.__metadata("design:returntype", Promise)
|
|
165
183
|
], AadAppClient.prototype, "createAadApp", null);
|
|
166
184
|
tslib_1.__decorate([
|
|
@@ -172,7 +190,7 @@ tslib_1.__decorate([
|
|
|
172
190
|
tslib_1.__decorate([
|
|
173
191
|
lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
|
|
174
192
|
tslib_1.__metadata("design:type", Function),
|
|
175
|
-
tslib_1.__metadata("design:paramtypes", [String]),
|
|
193
|
+
tslib_1.__metadata("design:paramtypes", [String, Object, Object]),
|
|
176
194
|
tslib_1.__metadata("design:returntype", Promise)
|
|
177
195
|
], AadAppClient.prototype, "generateClientSecret", null);
|
|
178
196
|
tslib_1.__decorate([
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAgBvD,qBAAa,iBAAiB;WACd,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc;WAwE5D,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,WAAW;WA+EvD,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM;WA8C/C,uCAAuC,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;CAmDnF"}
|
|
@@ -189,6 +189,9 @@ class AadManifestHelper {
|
|
|
189
189
|
static processRequiredResourceAccessInManifest(manifest) {
|
|
190
190
|
var _a;
|
|
191
191
|
const map = permissions_1.getPermissionMap();
|
|
192
|
+
if (manifest.requiredResourceAccess && !Array.isArray(manifest.requiredResourceAccess)) {
|
|
193
|
+
throw new aadManifestError_1.RequiredResourceAccessShouldBeArrayUserError(componentName);
|
|
194
|
+
}
|
|
192
195
|
(_a = manifest.requiredResourceAccess) === null || _a === void 0 ? void 0 : _a.forEach((requiredResourceAccessItem) => {
|
|
193
196
|
var _a, _b;
|
|
194
197
|
const resourceIdOrName = requiredResourceAccessItem.resourceAppId;
|
|
@@ -203,6 +206,10 @@ class AadManifestHelper {
|
|
|
203
206
|
}
|
|
204
207
|
requiredResourceAccessItem.resourceAppId = resourceId;
|
|
205
208
|
}
|
|
209
|
+
if (requiredResourceAccessItem.resourceAccess &&
|
|
210
|
+
!Array.isArray(requiredResourceAccessItem.resourceAccess)) {
|
|
211
|
+
throw new aadManifestError_1.ResourceAccessShouldBeArrayUserError(componentName);
|
|
212
|
+
}
|
|
206
213
|
(_b = requiredResourceAccessItem.resourceAccess) === null || _b === void 0 ? void 0 : _b.forEach((resourceAccessItem) => {
|
|
207
214
|
var _a, _b;
|
|
208
215
|
const resourceAccessIdOrName = resourceAccessItem.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,0EAA0C;AAC1C,gDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.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"}
|
|
@@ -5,11 +5,8 @@ export declare class CreateApiKeyDriver implements StepDriver {
|
|
|
5
5
|
description: string;
|
|
6
6
|
readonly progressTitle: string;
|
|
7
7
|
execute(args: CreateApiKeyArgs, context: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
|
|
8
|
-
private loadStateFromEnv;
|
|
9
8
|
private loadClientSecret;
|
|
10
9
|
private validateSecret;
|
|
11
|
-
private getDomain;
|
|
12
|
-
private validateDomain;
|
|
13
10
|
private validateArgs;
|
|
14
11
|
private mapArgsToApiSecretRegistration;
|
|
15
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AActE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AActE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQhE,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA0D;IACrE,QAAQ,CAAC,aAAa,SAA2D;IAGpE,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8F3B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,YAAY;YA+CN,8BAA8B;CAwD7C"}
|
|
@@ -7,24 +7,20 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const hooks_1 = require("@feathersjs/hooks");
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const typedi_1 = require("typedi");
|
|
10
|
-
const featureFlags_1 = require("../../../common/featureFlags");
|
|
11
10
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
-
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
13
11
|
const tools_1 = require("../../../common/tools");
|
|
14
12
|
const error_1 = require("../../../error");
|
|
15
13
|
const question_1 = require("../../../question");
|
|
16
14
|
const questionMW_1 = require("../../middleware/questionMW");
|
|
17
|
-
const common_1 = require("../../utils/common");
|
|
18
15
|
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
19
16
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
20
17
|
const appStudioClient_1 = require("../teamsApp/clients/appStudioClient");
|
|
21
18
|
const ApiSecretRegistration_1 = require("../teamsApp/interfaces/ApiSecretRegistration");
|
|
22
19
|
const apiKeyClientSecretInvalid_1 = require("./error/apiKeyClientSecretInvalid");
|
|
23
|
-
const apiKeyDomainInvalid_1 = require("./error/apiKeyDomainInvalid");
|
|
24
|
-
const apiKeyFailedToGetDomain_1 = require("./error/apiKeyFailedToGetDomain");
|
|
25
20
|
const apiKeyNameTooLong_1 = require("./error/apiKeyNameTooLong");
|
|
26
21
|
const createApiKeyOutputs_1 = require("./interface/createApiKeyOutputs");
|
|
27
22
|
const constants_1 = require("./utility/constants");
|
|
23
|
+
const utility_1 = require("./utility/utility");
|
|
28
24
|
const actionName = "apiKey/register"; // DO NOT MODIFY the name
|
|
29
25
|
const helpLink = "https://aka.ms/teamsfx-actions/apiKey-register";
|
|
30
26
|
let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
@@ -41,7 +37,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
41
37
|
if (!outputEnvVarNames) {
|
|
42
38
|
throw new outputEnvironmentVariableUndefinedError_1.OutputEnvironmentVariableUndefinedError(actionName);
|
|
43
39
|
}
|
|
44
|
-
const state =
|
|
40
|
+
const state = utility_1.loadStateFromEnv(outputEnvVarNames);
|
|
45
41
|
const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
|
|
46
42
|
scopes: tools_1.AppStudioScopes,
|
|
47
43
|
});
|
|
@@ -64,8 +60,8 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
64
60
|
args.primaryClientSecret = clientSecret;
|
|
65
61
|
}
|
|
66
62
|
this.validateArgs(args);
|
|
67
|
-
const domains = await
|
|
68
|
-
|
|
63
|
+
const domains = await utility_1.getDomain(args, context);
|
|
64
|
+
utility_1.validateDomain(domains, actionName);
|
|
69
65
|
const apiKey = await this.mapArgsToApiSecretRegistration(context.m365TokenProvider, args, domains);
|
|
70
66
|
const apiRegistrationRes = await appStudioClient_1.AppStudioClient.createApiKeyRegistration(appStudioToken, apiKey);
|
|
71
67
|
outputs.set(outputEnvVarNames.get(createApiKeyOutputs_1.OutputKeys.registrationId), apiRegistrationRes.id);
|
|
@@ -94,14 +90,6 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
94
90
|
};
|
|
95
91
|
}
|
|
96
92
|
}
|
|
97
|
-
// Needs to validate the parameters outside of the function
|
|
98
|
-
loadStateFromEnv(outputEnvVarNames) {
|
|
99
|
-
const result = {};
|
|
100
|
-
for (const [propertyName, envVarName] of outputEnvVarNames) {
|
|
101
|
-
result[propertyName] = process.env[envVarName];
|
|
102
|
-
}
|
|
103
|
-
return result;
|
|
104
|
-
}
|
|
105
93
|
loadClientSecret() {
|
|
106
94
|
const clientSecret = process.env[question_1.QuestionNames.ApiSpecApiKey];
|
|
107
95
|
return clientSecret;
|
|
@@ -115,39 +103,6 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
115
103
|
}
|
|
116
104
|
return true;
|
|
117
105
|
}
|
|
118
|
-
// TODO: need to add logic to read domain from env if need to support non-lifecycle commands
|
|
119
|
-
async getDomain(args, context) {
|
|
120
|
-
const absolutePath = common_1.getAbsolutePath(args.apiSpecPath, context.projectPath);
|
|
121
|
-
const parser = new m365_spec_parser_1.SpecParser(absolutePath, {
|
|
122
|
-
allowBearerTokenAuth: featureFlags_1.isApiKeyEnabled(),
|
|
123
|
-
allowMultipleParameters: featureFlags_1.isMultipleParametersEnabled(),
|
|
124
|
-
});
|
|
125
|
-
const listResult = await parser.list();
|
|
126
|
-
const operations = listResult.validAPIs;
|
|
127
|
-
const domains = operations
|
|
128
|
-
.filter((value) => {
|
|
129
|
-
const auth = value.auth;
|
|
130
|
-
return (auth &&
|
|
131
|
-
auth.authScheme.type === "http" &&
|
|
132
|
-
auth.authScheme.scheme === "bearer" &&
|
|
133
|
-
auth.name === args.name);
|
|
134
|
-
})
|
|
135
|
-
.map((value) => {
|
|
136
|
-
return value.server;
|
|
137
|
-
})
|
|
138
|
-
.filter((value, index, self) => {
|
|
139
|
-
return self.indexOf(value) === index;
|
|
140
|
-
});
|
|
141
|
-
return domains;
|
|
142
|
-
}
|
|
143
|
-
validateDomain(domain) {
|
|
144
|
-
if (domain.length > constants_1.maxDomainPerApiKey) {
|
|
145
|
-
throw new apiKeyDomainInvalid_1.ApiKeyDomainInvalidError(actionName);
|
|
146
|
-
}
|
|
147
|
-
if (domain.length === 0) {
|
|
148
|
-
throw new apiKeyFailedToGetDomain_1.ApiKeyFailedToGetDomainError(actionName);
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
106
|
validateArgs(args) {
|
|
152
107
|
const invalidParameters = [];
|
|
153
108
|
if (typeof args.name !== "string" || !args.name) {
|
|
@@ -168,6 +123,16 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
168
123
|
if (typeof args.apiSpecPath !== "string" || !args.apiSpecPath) {
|
|
169
124
|
invalidParameters.push("apiSpecPath");
|
|
170
125
|
}
|
|
126
|
+
if (args.applicableToApps &&
|
|
127
|
+
args.applicableToApps !== ApiSecretRegistration_1.ApiSecretRegistrationAppType.AnyApp &&
|
|
128
|
+
args.applicableToApps !== ApiSecretRegistration_1.ApiSecretRegistrationAppType.SpecificApp) {
|
|
129
|
+
invalidParameters.push("applicableToApps");
|
|
130
|
+
}
|
|
131
|
+
if (args.targetAudience &&
|
|
132
|
+
args.targetAudience !== ApiSecretRegistration_1.ApiSecretRegistrationTargetAudience.AnyTenant &&
|
|
133
|
+
args.targetAudience !== ApiSecretRegistration_1.ApiSecretRegistrationTargetAudience.HomeTenant) {
|
|
134
|
+
invalidParameters.push("targetAudience");
|
|
135
|
+
}
|
|
171
136
|
if (invalidParameters.length > 0) {
|
|
172
137
|
throw new error_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
173
138
|
}
|
|
@@ -197,11 +162,18 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
197
162
|
isPrimary = false;
|
|
198
163
|
return clientSecret;
|
|
199
164
|
});
|
|
165
|
+
const targetAudience = args.targetAudience
|
|
166
|
+
? args.targetAudience
|
|
167
|
+
: ApiSecretRegistration_1.ApiSecretRegistrationTargetAudience.AnyTenant;
|
|
168
|
+
const applicableToApps = args.applicableToApps
|
|
169
|
+
? args.applicableToApps
|
|
170
|
+
: ApiSecretRegistration_1.ApiSecretRegistrationAppType.AnyApp;
|
|
200
171
|
const apiKey = {
|
|
201
172
|
description: args.name,
|
|
202
173
|
targetUrlsShouldStartWith: domain,
|
|
203
|
-
applicableToApps:
|
|
204
|
-
|
|
174
|
+
applicableToApps: applicableToApps,
|
|
175
|
+
specificAppId: applicableToApps === ApiSecretRegistration_1.ApiSecretRegistrationAppType.SpecificApp ? args.appId : "",
|
|
176
|
+
targetAudience: targetAudience,
|
|
205
177
|
clientSecrets: clientSecrets,
|
|
206
178
|
manageableByUsers: [
|
|
207
179
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6CAA0C;AAC1C,wDAA4F;AAC5F,mCAAiC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApiKeyArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/createApiKeyArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"createApiKeyArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/createApiKeyArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateApiKeyArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/updateApiKeyArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateApiKeyArgs.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/interface/updateApiKeyArgs.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
2
|
+
import { UpdateApiKeyArgs } from "./interface/updateApiKeyArgs";
|
|
3
|
+
import { DriverContext } from "../interface/commonArgs";
|
|
4
|
+
export declare class UpdateApiKeyDriver implements StepDriver {
|
|
5
|
+
description: string;
|
|
6
|
+
readonly progressTitle: string;
|
|
7
|
+
execute(args: UpdateApiKeyArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
8
|
+
private validateArgs;
|
|
9
|
+
private compareApiKeyRegistration;
|
|
10
|
+
private mapArgsToApiSecretRegistration;
|
|
11
|
+
private shouldSkipConfirm;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=update.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/update.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAkBxD,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA0D;IACrE,QAAQ,CAAC,aAAa,SAA2D;IAGpE,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IA2F9F,OAAO,CAAC,YAAY;IA2CpB,OAAO,CAAC,yBAAyB;IAwCjC,OAAO,CAAC,8BAA8B;IAwBtC,OAAO,CAAC,iBAAiB;CAS1B"}
|