@microsoft/teamsfx-core 2.0.7-alpha.1935862db.0 → 2.0.7-alpha.2c4abc3fa.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/deps-checker/constant/helpLink.d.ts +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +1 -1
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/jsonUtils.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +10 -8
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +1 -2
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +29 -32
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -3
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -1
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +3 -2
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +2 -2
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +18 -18
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +10 -10
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +6 -6
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +8 -8
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +9 -10
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +9 -9
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +1 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +11 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +1 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +33 -0
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +2 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +2 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +1 -0
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/error/common.d.ts +4 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +35 -1
- package/build/error/common.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +3 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +2 -1
- package/build/question/other.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +3 -1
- package/resource/yaml-schema/v1.3/yaml.schema.json +6 -43
- package/resource/yaml-schema/v1.4/yaml.schema.json +1588 -0
- package/resource/yaml-schema/yaml.schema.json +1588 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -2,7 +2,7 @@ export declare const defaultHelpLink = "https://aka.ms/teamsfx-envchecker-help";
|
|
|
2
2
|
export declare const v3DefaultHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
3
3
|
export declare const functionDepsVersionsLink = "https://aka.ms/functions-node-versions";
|
|
4
4
|
export declare const nodeNotFoundHelpLink = "https://aka.ms/teamsfx-node";
|
|
5
|
-
export declare const nodeInstallationLink = "https://nodejs.org
|
|
5
|
+
export declare const nodeInstallationLink = "https://nodejs.org";
|
|
6
6
|
export declare const dotnetDefaultHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
7
7
|
export declare const dotnetExplanationHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
8
8
|
export declare const dotnetFailToInstallHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpLink.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,2CAA2C,CAAC;AACxE,eAAO,MAAM,iBAAiB,mDAAmD,CAAC;AAElF,eAAO,MAAM,wBAAwB,2CAA2C,CAAC;AAGjF,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"helpLink.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,2CAA2C,CAAC;AACxE,eAAO,MAAM,iBAAiB,mDAAmD,CAAC;AAElF,eAAO,MAAM,wBAAwB,2CAA2C,CAAC;AAGjF,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAEzD,eAAO,MAAM,qBAAqB,mDAAmD,CAAC;AACtF,eAAO,MAAM,yBAAyB,mDAAwB,CAAC;AAC/D,eAAO,MAAM,2BAA2B,mDAAwB,CAAC;AAEjE,eAAO,MAAM,qCAAqC,QAAqD,CAAC;AAExG,eAAO,MAAM,wBAAwB,QAAmE,CAAC;AAEzG,eAAO,MAAM,sBAAsB,gCAAgC,CAAC;AACpE,eAAO,MAAM,0BAA0B,gCAAgC,CAAC;AACxE,eAAO,MAAM,oBAAoB,gCAAgC,CAAC"}
|
|
@@ -9,7 +9,7 @@ exports.v3DefaultHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
|
9
9
|
exports.functionDepsVersionsLink = "https://aka.ms/functions-node-versions";
|
|
10
10
|
// TODO: remove this link after clean the useless code.
|
|
11
11
|
exports.nodeNotFoundHelpLink = `https://aka.ms/teamsfx-node`;
|
|
12
|
-
exports.nodeInstallationLink = "https://nodejs.org
|
|
12
|
+
exports.nodeInstallationLink = "https://nodejs.org";
|
|
13
13
|
exports.dotnetDefaultHelpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
14
14
|
exports.dotnetExplanationHelpLink = exports.dotnetDefaultHelpLink;
|
|
15
15
|
exports.dotnetFailToInstallHelpLink = exports.dotnetDefaultHelpLink;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpLink.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAAuD;AAC1C,QAAA,eAAe,GAAG,wCAAwC,CAAC;AAC3D,QAAA,iBAAiB,GAAG,gDAAgD,CAAC;AAErE,QAAA,wBAAwB,GAAG,wCAAwC,CAAC;AAEjF,uDAAuD;AAC1C,QAAA,oBAAoB,GAAG,6BAA6B,CAAC;AACrD,QAAA,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"helpLink.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAAuD;AAC1C,QAAA,eAAe,GAAG,wCAAwC,CAAC;AAC3D,QAAA,iBAAiB,GAAG,gDAAgD,CAAC;AAErE,QAAA,wBAAwB,GAAG,wCAAwC,CAAC;AAEjF,uDAAuD;AAC1C,QAAA,oBAAoB,GAAG,6BAA6B,CAAC;AACrD,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAE5C,QAAA,qBAAqB,GAAG,gDAAgD,CAAC;AACzE,QAAA,yBAAyB,GAAG,6BAAqB,CAAC;AAClD,QAAA,2BAA2B,GAAG,6BAAqB,CAAC;AACjE,uDAAuD;AAC1C,QAAA,qCAAqC,GAAG,GAAG,uBAAe,gCAAgC,CAAC;AAE3F,QAAA,wBAAwB,GAAG,GAAG,uBAAe,8CAA8C,CAAC;AAE5F,QAAA,sBAAsB,GAAG,6BAA6B,CAAC;AACvD,QAAA,0BAA0B,GAAG,6BAA6B,CAAC;AAC3D,QAAA,oBAAoB,GAAG,6BAA6B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonUtils.js","sourceRoot":"","sources":["../../src/common/jsonUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"jsonUtils.js","sourceRoot":"","sources":["../../src/common/jsonUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkE;AAClE,4CAAoF;AACpF,gEAA0B;AAE1B,MAAM,SAAS;IACb,SAAS,CAAC,OAAe;QACvB,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;SAChB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CAAC,IAAI,wBAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;SAC7C;IACH,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,QAAgB;;QACjC,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;SAChB;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE;gBAC5B,MAAM,KAAK,GAAG,IAAI,wBAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC/C,OAAO,iBAAG,CAAC,KAAK,CAAC,CAAC;aACnB;iBAAM,IAAI,MAAA,CAAC,CAAC,OAAO,0CAAE,QAAQ,CAAC,2BAA2B,CAAC,EAAE;gBAC3D,OAAO,iBAAG,CAAC,IAAI,0BAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;aACvD;YACD,OAAO,iBAAG,CAAC,IAAI,sBAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,gBAAgB,CAAC,QAAgB;;QAC/B,IAAI;YACF,MAAM,GAAG,GAAG,kBAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;SAChB;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE;gBAC5B,MAAM,KAAK,GAAG,IAAI,wBAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC/C,OAAO,iBAAG,CAAC,KAAK,CAAC,CAAC;aACnB;iBAAM,IAAI,MAAA,CAAC,CAAC,OAAO,0CAAE,QAAQ,CAAC,2BAA2B,CAAC,EAAE;gBAC3D,OAAO,iBAAG,CAAC,IAAI,0BAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;aACvD;YACD,OAAO,iBAAG,CAAC,IAAI,sBAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;SAC5C;IACH,CAAC;CACF;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
|
|
@@ -8,7 +8,7 @@ const ajv_1 = tslib_1.__importDefault(require("ajv"));
|
|
|
8
8
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
9
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
10
10
|
const folder_1 = require("../../folder");
|
|
11
|
-
const supportedVersions = ["1.0.0", "1.1.0", "v1.2", "v1.3"];
|
|
11
|
+
const supportedVersions = ["1.0.0", "1.1.0", "v1.2", "v1.3", "v1.4"];
|
|
12
12
|
class Validator {
|
|
13
13
|
constructor() {
|
|
14
14
|
this.impl = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAErE,MAAa,SAAS;IAGpB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC;IAEO,WAAW,CAAC,OAAe;QACjC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,0BAAiB,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,kBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB;QACf,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,GAA4B,EAAE,OAAgB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;CACF;AAxCD,8BAwCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
2
1
|
import { DriverContext } from "../interface/commonArgs";
|
|
2
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
3
3
|
import { CreateAadAppArgs } from "./interface/createAadAppArgs";
|
|
4
4
|
export declare class CreateAadAppDriver implements StepDriver {
|
|
5
5
|
description: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"
|
|
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;AAYhE,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAChE,QAAQ,CAAC,aAAa,SAAqE;IAG9E,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IA8H3B,OAAO,CAAC,YAAY;YA+BN,kBAAkB;CAWjC"}
|
|
@@ -4,22 +4,22 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateAadAppDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const
|
|
8
|
-
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
9
|
-
const createAadAppOutput_1 = require("./interface/createAadAppOutput");
|
|
7
|
+
const lib_1 = require("@feathersjs/hooks/lib");
|
|
10
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
|
-
const tools_1 = require("../../../common/tools");
|
|
12
|
-
const missingEnvError_1 = require("./error/missingEnvError");
|
|
13
9
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
14
|
-
const
|
|
15
|
-
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
10
|
+
const typedi_1 = require("typedi");
|
|
16
11
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
17
|
-
const
|
|
12
|
+
const tools_1 = require("../../../common/tools");
|
|
18
13
|
const common_1 = require("../../../error/common");
|
|
19
|
-
const utils_1 = require("../util/utils");
|
|
20
|
-
const signInAudience_1 = require("./interface/signInAudience");
|
|
21
14
|
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
15
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
|
+
const utils_1 = require("../util/utils");
|
|
22
17
|
const aadAppNameTooLongError_1 = require("./error/aadAppNameTooLongError");
|
|
18
|
+
const missingEnvError_1 = require("./error/missingEnvError");
|
|
19
|
+
const createAadAppOutput_1 = require("./interface/createAadAppOutput");
|
|
20
|
+
const signInAudience_1 = require("./interface/signInAudience");
|
|
21
|
+
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
22
|
+
const constants_1 = require("./utility/constants");
|
|
23
23
|
const actionName = "aadApp/create"; // DO NOT MODIFY the name
|
|
24
24
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-create";
|
|
25
25
|
const driverConstants = {
|
|
@@ -110,7 +110,7 @@ let CreateAadAppDriver = class CreateAadAppDriver {
|
|
|
110
110
|
const message = JSON.stringify(error);
|
|
111
111
|
(_l = context.logProvider) === null || _l === void 0 ? void 0 : _l.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
112
112
|
return {
|
|
113
|
-
result: teamsfx_api_1.err(
|
|
113
|
+
result: teamsfx_api_1.err(common_1.assembleError(error, actionName)),
|
|
114
114
|
summaries: summaries,
|
|
115
115
|
};
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
2
1
|
import { DriverContext } from "../interface/commonArgs";
|
|
2
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
3
3
|
import { UpdateAadAppArgs } from "./interface/updateAadAppArgs";
|
|
4
4
|
export declare const actionName = "aadApp/update";
|
|
5
5
|
export declare class UpdateAadAppDriver implements StepDriver {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,eAAO,MAAM,UAAU,kBAAkB,CAAC;AAG1C,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAAqD;IAChE,QAAQ,CAAC,aAAa,SAAqE;IAG9E,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IA4F9F,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,gBAAgB;CAKzB"}
|
|
@@ -2,16 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UpdateAadAppDriver = exports.actionName = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
8
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
5
|
+
// Copyright (c) Microsoft Corporation.
|
|
6
|
+
// Licensed under the MIT license.
|
|
9
7
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
10
|
-
const
|
|
8
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
10
|
+
const typedi_1 = require("typedi");
|
|
11
11
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
-
const constants_1 = require("./utility/constants");
|
|
13
|
-
const buildAadManifest_1 = require("./utility/buildAadManifest");
|
|
14
12
|
const common_1 = require("../../../error/common");
|
|
13
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
|
+
const aadAppClient_1 = require("./utility/aadAppClient");
|
|
15
|
+
const buildAadManifest_1 = require("./utility/buildAadManifest");
|
|
16
|
+
const constants_1 = require("./utility/constants");
|
|
15
17
|
exports.actionName = "aadApp/update"; // DO NOT MODIFY the name
|
|
16
18
|
const helpLink = "https://aka.ms/teamsfx-actions/aadapp-update";
|
|
17
19
|
// logic from src\component\resource\aadApp\aadAppManifestManager.ts
|
|
@@ -80,7 +82,7 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
|
|
|
80
82
|
const message = JSON.stringify(error);
|
|
81
83
|
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
|
|
82
84
|
return {
|
|
83
|
-
result: teamsfx_api_1.err(
|
|
85
|
+
result: teamsfx_api_1.err(common_1.assembleError(error, exports.actionName)),
|
|
84
86
|
summaries: summaries,
|
|
85
87
|
};
|
|
86
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
+
import { DriverContext } from "../interface/commonArgs";
|
|
1
2
|
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
2
3
|
import { CreateApiKeyArgs } from "./interface/createApiKeyArgs";
|
|
3
|
-
import { DriverContext } from "../interface/commonArgs";
|
|
4
4
|
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
8
|
private loadStateFromEnv;
|
|
9
9
|
private loadClientSecret;
|
|
10
|
-
private parseSecret;
|
|
11
10
|
private validateSecret;
|
|
12
11
|
private getDomain;
|
|
13
12
|
private validateDomain;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"
|
|
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;AAetE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAYhE,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;IAgG3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,cAAc;YAaR,SAAS;IAoBvB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,YAAY;YA+BN,8BAA8B;CAgD7C"}
|
|
@@ -4,28 +4,28 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateApiKeyDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const typedi_1 = require("typedi");
|
|
8
|
-
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
9
|
-
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
10
7
|
const hooks_1 = require("@feathersjs/hooks");
|
|
11
|
-
const constants_1 = require("./utility/constants");
|
|
12
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
9
|
+
const typedi_1 = require("typedi");
|
|
10
|
+
const featureFlags_1 = require("../../../common/featureFlags");
|
|
11
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
12
|
+
const spec_parser_1 = require("../../../common/spec-parser");
|
|
15
13
|
const tools_1 = require("../../../common/tools");
|
|
14
|
+
const error_1 = require("../../../error");
|
|
15
|
+
const question_1 = require("../../../question");
|
|
16
|
+
const questionMW_1 = require("../../middleware/questionMW");
|
|
17
|
+
const common_1 = require("../../utils/common");
|
|
18
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
19
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
20
|
const appStudioClient_1 = require("../teamsApp/clients/appStudioClient");
|
|
17
21
|
const ApiSecretRegistration_1 = require("../teamsApp/interfaces/ApiSecretRegistration");
|
|
18
|
-
const
|
|
19
|
-
const apiKeyNameTooLong_1 = require("./error/apiKeyNameTooLong");
|
|
22
|
+
const telemetry_1 = require("../teamsApp/utils/telemetry");
|
|
20
23
|
const apiKeyClientSecretInvalid_1 = require("./error/apiKeyClientSecretInvalid");
|
|
21
24
|
const apiKeyDomainInvalid_1 = require("./error/apiKeyDomainInvalid");
|
|
22
|
-
const questionMW_1 = require("../../middleware/questionMW");
|
|
23
|
-
const question_1 = require("../../../question");
|
|
24
|
-
const spec_parser_1 = require("../../../common/spec-parser");
|
|
25
|
-
const common_1 = require("../../utils/common");
|
|
26
25
|
const apiKeyFailedToGetDomain_1 = require("./error/apiKeyFailedToGetDomain");
|
|
27
|
-
const
|
|
28
|
-
const
|
|
26
|
+
const apiKeyNameTooLong_1 = require("./error/apiKeyNameTooLong");
|
|
27
|
+
const createApiKeyOutputs_1 = require("./interface/createApiKeyOutputs");
|
|
28
|
+
const constants_1 = require("./utility/constants");
|
|
29
29
|
const actionName = "apiKey/register"; // DO NOT MODIFY the name
|
|
30
30
|
const helpLink = "https://aka.ms/teamsfx-actions/apiKey-register";
|
|
31
31
|
let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
@@ -63,7 +63,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
63
63
|
else {
|
|
64
64
|
const clientSecret = this.loadClientSecret();
|
|
65
65
|
if (clientSecret) {
|
|
66
|
-
args.
|
|
66
|
+
args.primaryClientSecret = clientSecret;
|
|
67
67
|
}
|
|
68
68
|
this.validateArgs(args);
|
|
69
69
|
const domains = await this.getDomain(args, context);
|
|
@@ -91,7 +91,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
91
91
|
const message = JSON.stringify(error);
|
|
92
92
|
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failedExecuteDriver, actionName, message));
|
|
93
93
|
return {
|
|
94
|
-
result: teamsfx_api_1.err(
|
|
94
|
+
result: teamsfx_api_1.err(error_1.assembleError(error, actionName)),
|
|
95
95
|
summaries: summaries,
|
|
96
96
|
};
|
|
97
97
|
}
|
|
@@ -108,23 +108,11 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
108
108
|
const clientSecret = process.env[question_1.QuestionNames.ApiSpecApiKey];
|
|
109
109
|
return clientSecret;
|
|
110
110
|
}
|
|
111
|
-
// Allowed secrets: secret or secret1, secret2
|
|
112
|
-
// Need to validate secrets outside of the function
|
|
113
|
-
parseSecret(apiKeyClientSecret) {
|
|
114
|
-
const secrets = apiKeyClientSecret.trim().split(",");
|
|
115
|
-
return secrets.map((secret) => secret.trim());
|
|
116
|
-
}
|
|
117
111
|
validateSecret(apiKeySecret) {
|
|
118
112
|
if (typeof apiKeySecret !== "string") {
|
|
119
113
|
return false;
|
|
120
114
|
}
|
|
121
|
-
|
|
122
|
-
const regResult = regExp.exec(apiKeySecret);
|
|
123
|
-
if (!regResult) {
|
|
124
|
-
return false;
|
|
125
|
-
}
|
|
126
|
-
const secrets = this.parseSecret(apiKeySecret);
|
|
127
|
-
if (secrets.length > constants_1.maxSecretPerApiKey) {
|
|
115
|
+
if (apiKeySecret.length > constants_1.maxSecretLength || apiKeySecret.length < constants_1.minSecretLength) {
|
|
128
116
|
return false;
|
|
129
117
|
}
|
|
130
118
|
return true;
|
|
@@ -169,7 +157,10 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
169
157
|
if (typeof args.appId !== "string" || !args.appId) {
|
|
170
158
|
invalidParameters.push("appId");
|
|
171
159
|
}
|
|
172
|
-
if (args.
|
|
160
|
+
if (args.primaryClientSecret && !this.validateSecret(args.primaryClientSecret)) {
|
|
161
|
+
throw new apiKeyClientSecretInvalid_1.ApiKeyClientSecretInvalidError(actionName);
|
|
162
|
+
}
|
|
163
|
+
if (args.secondaryClientSecret && !this.validateSecret(args.secondaryClientSecret)) {
|
|
173
164
|
throw new apiKeyClientSecretInvalid_1.ApiKeyClientSecretInvalidError(actionName);
|
|
174
165
|
}
|
|
175
166
|
if (typeof args.apiSpecPath !== "string" || !args.apiSpecPath) {
|
|
@@ -186,14 +177,20 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
186
177
|
}
|
|
187
178
|
const currentUser = currentUserRes.value;
|
|
188
179
|
const userId = currentUser["oid"];
|
|
189
|
-
const secrets =
|
|
180
|
+
const secrets = [];
|
|
181
|
+
if (args.primaryClientSecret) {
|
|
182
|
+
secrets.push(args.primaryClientSecret);
|
|
183
|
+
}
|
|
184
|
+
if (args.secondaryClientSecret) {
|
|
185
|
+
secrets.push(args.secondaryClientSecret);
|
|
186
|
+
}
|
|
190
187
|
let isPrimary = true;
|
|
191
188
|
const clientSecrets = secrets.map((secret) => {
|
|
192
189
|
const clientSecret = {
|
|
193
190
|
value: secret,
|
|
194
191
|
description: args.name,
|
|
195
192
|
priority: isPrimary ? 0 : 1,
|
|
196
|
-
isValueRedacted:
|
|
193
|
+
isValueRedacted: false,
|
|
197
194
|
};
|
|
198
195
|
isPrimary = false;
|
|
199
196
|
return clientSecret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,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":"apiKeyClientSecretInvalid.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiKeyClientSecretInvalid.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,UAAU,EAAE,MAAM;CAQ/B"}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.ApiKeyClientSecretInvalidError = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
|
-
const constants_1 = require("../utility/constants");
|
|
9
8
|
const errorCode = "ApiKeyClientSecretInvalid";
|
|
10
9
|
const messageKey = "driver.apiKey.error.clientSecretInvalid";
|
|
11
10
|
class ApiKeyClientSecretInvalidError extends teamsfx_api_1.UserError {
|
|
@@ -13,8 +12,8 @@ class ApiKeyClientSecretInvalidError extends teamsfx_api_1.UserError {
|
|
|
13
12
|
super({
|
|
14
13
|
source: actionName,
|
|
15
14
|
name: errorCode,
|
|
16
|
-
message: localizeUtils_1.getDefaultString(messageKey
|
|
17
|
-
displayMessage: localizeUtils_1.getLocalizedString(messageKey
|
|
15
|
+
message: localizeUtils_1.getDefaultString(messageKey),
|
|
16
|
+
displayMessage: localizeUtils_1.getLocalizedString(messageKey),
|
|
18
17
|
});
|
|
19
18
|
}
|
|
20
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiKeyClientSecretInvalid.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;
|
|
1
|
+
{"version":3,"file":"apiKeyClientSecretInvalid.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/error/apiKeyClientSecretInvalid.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,2BAA2B,CAAC;AAC9C,MAAM,UAAU,GAAG,yCAAyC,CAAC;AAE7D,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;SAC/C,CAAC,CAAC;IACL,CAAC;CACF;AATD,wEASC"}
|
|
@@ -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,
|
|
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;CACrB"}
|
|
@@ -5,6 +5,7 @@ export declare const logMessageKeys: {
|
|
|
5
5
|
successCreateApiKey: string;
|
|
6
6
|
failedExecuteDriver: string;
|
|
7
7
|
};
|
|
8
|
-
export declare const maxSecretPerApiKey = 2;
|
|
9
8
|
export declare const maxDomainPerApiKey = 1;
|
|
9
|
+
export declare const maxSecretLength = 128;
|
|
10
|
+
export declare const minSecretLength = 10;
|
|
10
11
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;CAM1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;CAM1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,eAAO,MAAM,eAAe,KAAK,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.
|
|
5
|
+
exports.minSecretLength = exports.maxSecretLength = exports.maxDomainPerApiKey = exports.logMessageKeys = void 0;
|
|
6
6
|
exports.logMessageKeys = {
|
|
7
7
|
startExecuteDriver: "driver.apiKey.log.startExecuteDriver",
|
|
8
8
|
skipCreateApiKey: "driver.apiKey.log.skipCreateApiKey",
|
|
@@ -10,6 +10,7 @@ exports.logMessageKeys = {
|
|
|
10
10
|
successCreateApiKey: "driver.apiKey.log.successCreateApiKey",
|
|
11
11
|
failedExecuteDriver: "driver.apiKey.log.failedExecuteDriver",
|
|
12
12
|
};
|
|
13
|
-
exports.maxSecretPerApiKey = 2;
|
|
14
13
|
exports.maxDomainPerApiKey = 1;
|
|
14
|
+
exports.maxSecretLength = 128;
|
|
15
|
+
exports.minSecretLength = 10;
|
|
15
16
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,oCAAoC;IACtD,cAAc,EAAE,kCAAkC;IAClD,mBAAmB,EAAE,uCAAuC;IAC5D,mBAAmB,EAAE,uCAAuC;CAC7D,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,oCAAoC;IACtD,cAAc,EAAE,kCAAkC;IAClD,mBAAmB,EAAE,uCAAuC;IAC5D,mBAAmB,EAAE,uCAAuC;CAC7D,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,eAAe,GAAG,GAAG,CAAC;AACtB,QAAA,eAAe,GAAG,EAAE,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "../interface/commonArgs";
|
|
3
|
+
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
3
4
|
import { CreateBotAadAppArgs } from "./interface/createBotAadAppArgs";
|
|
4
|
-
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
5
5
|
export declare class CreateBotAadAppDriver implements StepDriver {
|
|
6
6
|
readonly description?: string | undefined;
|
|
7
7
|
readonly progressTitle: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAgBjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAatE,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IACF,QAAQ,CAAC,aAAa,SAAyD;IAGlE,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAad,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAuFK,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;CAcrD"}
|
|
@@ -4,22 +4,22 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateBotAadAppDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const
|
|
7
|
+
const lib_1 = require("@feathersjs/hooks/lib");
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
const perf_hooks_1 = require("perf_hooks");
|
|
10
9
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
14
|
-
const constants_1 = require("./utility/constants");
|
|
10
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
11
|
+
const typedi_1 = require("typedi");
|
|
15
12
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
13
|
+
const common_1 = require("../../../error/common");
|
|
14
|
+
const common_2 = require("../../utils/common");
|
|
15
|
+
const aadAppNameTooLongError_1 = require("../aad/error/aadAppNameTooLongError");
|
|
16
|
+
const signInAudience_1 = require("../aad/interface/signInAudience");
|
|
17
|
+
const aadAppClient_1 = require("../aad/utility/aadAppClient");
|
|
18
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
19
|
+
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
16
20
|
const utils_1 = require("../util/utils");
|
|
17
21
|
const unexpectedEmptyBotPasswordError_1 = require("./error/unexpectedEmptyBotPasswordError");
|
|
18
|
-
const
|
|
19
|
-
const outputEnvironmentVariableUndefinedError_1 = require("../error/outputEnvironmentVariableUndefinedError");
|
|
20
|
-
const aadAppClient_1 = require("../aad/utility/aadAppClient");
|
|
21
|
-
const signInAudience_1 = require("../aad/interface/signInAudience");
|
|
22
|
-
const aadAppNameTooLongError_1 = require("../aad/error/aadAppNameTooLongError");
|
|
22
|
+
const constants_1 = require("./utility/constants");
|
|
23
23
|
const actionName = "botAadApp/create"; // DO NOT MODIFY the name
|
|
24
24
|
const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
|
|
25
25
|
const successRegisterBotAad = `${actionName}/success`;
|
|
@@ -33,14 +33,14 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
33
33
|
this.progressTitle = localizeUtils_1.getLocalizedString(constants_1.progressBarKeys.creatingBotAadApp);
|
|
34
34
|
}
|
|
35
35
|
async run(args, context) {
|
|
36
|
-
return
|
|
36
|
+
return common_2.wrapRun(async () => {
|
|
37
37
|
const result = await this.handler(args, context);
|
|
38
38
|
return result.output;
|
|
39
39
|
}, actionName);
|
|
40
40
|
}
|
|
41
41
|
async execute(args, ctx, outputEnvVarNames) {
|
|
42
42
|
let summaries = [];
|
|
43
|
-
const outputResult = await
|
|
43
|
+
const outputResult = await common_2.wrapRun(async () => {
|
|
44
44
|
const result = await this.handler(args, ctx, outputEnvVarNames);
|
|
45
45
|
summaries = result.summaries;
|
|
46
46
|
return result.output;
|
|
@@ -101,18 +101,18 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
101
101
|
const message = JSON.stringify((_h = error.response) === null || _h === void 0 ? void 0 : _h.data);
|
|
102
102
|
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
103
103
|
if (error.response.status >= 400 && error.response.status < 500) {
|
|
104
|
-
throw new
|
|
104
|
+
throw new common_1.HttpClientError(error, actionName, message, helpLink);
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
107
|
-
throw new
|
|
107
|
+
throw new common_1.HttpServerError(error, actionName, message);
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
if (error.name === "AadCreateAppError") {
|
|
111
|
-
throw
|
|
111
|
+
throw common_1.assembleError(error, actionName);
|
|
112
112
|
}
|
|
113
113
|
const message = JSON.stringify(error);
|
|
114
114
|
(_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
115
|
-
throw
|
|
115
|
+
throw common_1.assembleError(error, actionName);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
validateArgs(args) {
|
|
@@ -121,7 +121,7 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
|
|
|
121
121
|
invalidParameters.push("name");
|
|
122
122
|
}
|
|
123
123
|
if (invalidParameters.length > 0) {
|
|
124
|
-
throw new
|
|
124
|
+
throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
|
|
125
125
|
}
|
|
126
126
|
if (args.name.length > 120) {
|
|
127
127
|
throw new aadAppNameTooLongError_1.AadAppNameTooLongError(actionName);
|