@microsoft/teamsfx-core 2.0.0-alpha.a17e3a89d.0 → 2.0.0-alpha.e6bcbdb22.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/local/constants.d.ts +1 -2
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +1 -2
- package/build/common/local/constants.js.map +1 -1
- package/build/common/m365/constants.d.ts +6 -0
- package/build/common/m365/constants.d.ts.map +1 -0
- package/build/common/m365/constants.js +12 -0
- package/build/common/m365/constants.js.map +1 -0
- package/build/common/m365/launchHelper.d.ts +12 -0
- package/build/common/m365/launchHelper.d.ts.map +1 -0
- package/build/common/m365/launchHelper.js +109 -0
- package/build/common/m365/launchHelper.js.map +1 -0
- package/build/component/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +1 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +18 -0
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/unhandledError.js +1 -1
- package/build/component/driver/aad/error/unhandledError.js.map +1 -1
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts +2 -0
- package/build/component/driver/aad/interface/createAadAppArgs.d.ts.map +1 -1
- package/build/component/driver/aad/interface/signInAudience.d.ts +7 -0
- package/build/component/driver/aad/interface/signInAudience.d.ts.map +1 -0
- package/build/component/driver/aad/interface/signInAudience.js +13 -0
- package/build/component/driver/aad/interface/signInAudience.js.map +1 -0
- package/build/component/driver/aad/utility/aadAppClient.d.ts +2 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +3 -2
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/botAadApp/error/unhandledError.js +1 -1
- package/build/component/driver/botAadApp/error/unhandledError.js.map +1 -1
- package/build/component/driver/botFramework/error/unhandledError.js +1 -1
- package/build/component/driver/botFramework/error/unhandledError.js.map +1 -1
- package/build/component/driver/file/error/unhandledError.js +1 -1
- package/build/component/driver/file/error/unhandledError.js.map +1 -1
- package/build/component/driver/interface/commonArgs.d.ts +2 -1
- package/build/component/driver/interface/commonArgs.d.ts.map +1 -1
- package/build/component/driver/m365/error/unhandledError.js +1 -1
- package/build/component/driver/m365/error/unhandledError.js.map +1 -1
- package/build/component/driver/middleware/updateProgress.d.ts +6 -0
- package/build/component/driver/middleware/updateProgress.d.ts.map +1 -0
- package/build/component/driver/middleware/updateProgress.js +15 -0
- package/build/component/driver/middleware/updateProgress.js.map +1 -0
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +5 -12
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +6 -14
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +9 -24
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +6 -5
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/middleware/envMW.d.ts +8 -2
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +13 -7
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +1 -0
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.js +16 -1
- package/build/component/resource/appManifest/appStudioClient.js.map +1 -1
- package/build/component/resource/appManifest/errors.d.ts.map +1 -1
- package/build/component/resource/appManifest/errors.js +1 -1
- package/build/component/resource/appManifest/errors.js.map +1 -1
- package/build/component/resource/botService/errors.d.ts +0 -6
- package/build/component/resource/botService/errors.d.ts.map +1 -1
- package/build/component/resource/botService/errors.js +8 -15
- package/build/component/resource/botService/errors.js.map +1 -1
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +1 -0
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +1 -0
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +40 -16
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +3 -7
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +35 -31
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +2 -2
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/question.d.ts +4 -2
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +48 -3
- package/build/core/question.js.map +1 -1
- package/build/error/common.js +3 -3
- package/build/error/common.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +179 -178
- package/resource/package.nls.zh-cn.json +200 -329
- package/resource/package.nls.zh-tw.json +200 -329
- package/templates/core/v3Migration/csharp.app.local.yml +18 -18
- package/templates/core/v3Migration/csharp.app.yml +18 -18
- package/templates/core/v3Migration/js.ts.app.local.yml +34 -28
- package/templates/core/v3Migration/js.ts.app.yml +27 -25
- package/templates/core/v3Migration/spfx.app.yml +8 -8
- 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
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { M365TokenProvider } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { AADApplication } from "../../../resource/aadApp/interfaces/AADApplication";
|
|
3
3
|
import { AADManifest } from "../../../resource/aadApp/interfaces/AADManifest";
|
|
4
|
+
import { SignInAudience } from "../interface/signInAudience";
|
|
4
5
|
export declare class AadAppClient {
|
|
5
6
|
private readonly retryNumber;
|
|
6
7
|
private readonly tokenProvider;
|
|
7
8
|
private readonly axios;
|
|
8
9
|
constructor(m365TokenProvider: M365TokenProvider);
|
|
9
|
-
createAadApp(displayName: string): Promise<AADApplication>;
|
|
10
|
+
createAadApp(displayName: string, signInAudience?: SignInAudience): Promise<AADApplication>;
|
|
10
11
|
generateClientSecret(objectId: string): Promise<string>;
|
|
11
12
|
updateAadApp(manifest: AADManifest): Promise<void>;
|
|
12
13
|
private is404Error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAK9E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;gBAE1B,iBAAiB,EAAE,iBAAiB;IA6BnC,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,iBAA8B,GAC3C,OAAO,CAAC,cAAc,CAAC;IAWb,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBvD,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB/D,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -9,6 +9,7 @@ const aadManifestHelper_1 = require("../../../resource/aadApp/utils/aadManifestH
|
|
|
9
9
|
const tools_1 = require("../../../../common/tools");
|
|
10
10
|
const constants_1 = require("../../../resource/aadApp/constants");
|
|
11
11
|
const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
|
|
12
|
+
const signInAudience_1 = require("../interface/signInAudience");
|
|
12
13
|
// Another implementation of src\component\resource\aadApp\graph.ts to reduce call stacks
|
|
13
14
|
// It's our internal utility so make sure pass valid parameters to it instead of relying on it to handle parameter errors
|
|
14
15
|
class AadAppClient {
|
|
@@ -38,10 +39,10 @@ class AadAppClient {
|
|
|
38
39
|
retryCondition: (error) => axios_retry_1.default.isNetworkError(error) || axios_retry_1.default.isRetryableError(error), // retry when there's network error or 5xx error
|
|
39
40
|
});
|
|
40
41
|
}
|
|
41
|
-
async createAadApp(displayName) {
|
|
42
|
+
async createAadApp(displayName, signInAudience = signInAudience_1.SignInAudience.AzureADMyOrg) {
|
|
42
43
|
const requestBody = {
|
|
43
44
|
displayName: displayName,
|
|
44
|
-
signInAudience:
|
|
45
|
+
signInAudience: signInAudience,
|
|
45
46
|
}; // Create an AAD app without setting anything
|
|
46
47
|
const response = await this.axios.post("applications", requestBody);
|
|
47
48
|
return response.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,0DAAyD;AAIzD,wFAAqF;AACrF,oDAAuD;AACvD,kEAA+D;AAC/D,sEAAqC;
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,0DAAyD;AAIzD,wFAAqF;AACrF,oDAAuD;AACvD,kEAA+D;AAC/D,sEAAqC;AACrC,gEAA6D;AAE7D,yFAAyF;AACzF,yHAAyH;AACzH,MAAa,YAAY;IAKvB,YAAY,iBAAoC;QAJ/B,gBAAW,GAAW,CAAC,CAAC;QAKvC,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;QACvC,mGAAmG;QACnG,IAAI,CAAC,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;YACxB,OAAO,EAAE,kCAAkC;SAC5C,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,mBAAW,EAAE,CAAC,CAAC;YACvF,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;gBACzB,MAAM,aAAa,CAAC,KAAK,CAAC;aAC3B;YACD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;YAElC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;aACrB;YACD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;YAEpD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,oHAAoH;QACpH,qBAAU,CAAC,IAAI,CAAC,KAAK,EAAE;YACrB,OAAO,EAAE,IAAI,CAAC,WAAW;YACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;YACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,gDAAgD;SAC3H,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,WAAmB,EACnB,cAAc,GAAG,+BAAc,CAAC,YAAY;QAE5C,MAAM,WAAW,GAAmB;YAClC,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,cAAc;SAC/B,CAAC,CAAC,6CAA6C;QAEhD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAEpE,OAAuB,QAAQ,CAAC,IAAI,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,QAAgB;QAChD,MAAM,WAAW,GAAG;YAClB,kBAAkB,EAAE;gBAClB,WAAW,EAAE,qBAAS,CAAC,yBAAyB;aACjD;SACF,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,cAAc,EAAE,WAAW,EAAE;YAC1F,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;gBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;oBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,4EAA4E;aACvG;SACF,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,QAAqB;QAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAG,CAAC,CAAC,sDAAsD;QACrF,MAAM,WAAW,GAAG,qCAAiB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,QAAQ,EAAE,EAAE,WAAW,EAAE;YAC9D,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;gBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;oBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,4EAA4E;oBACtG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,wGAAwG;aACnI;SACF,CAAC,CAAC;IACL,CAAC;IAED,kHAAkH;IAC1G,UAAU,CAAC,KAAsB;QACvC,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;IAC7F,CAAC;IAEO,UAAU,CAAC,KAAsB;QACvC,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;IAC7F,CAAC;CACF;AA7FD,oCA6FC"}
|
|
@@ -6,7 +6,7 @@ exports.UnhandledSystemError = exports.UnhandledUserError = void 0;
|
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
8
|
const errorCode = "UnhandledError";
|
|
9
|
-
const messageKey = "
|
|
9
|
+
const messageKey = "error.common.UnhandledError";
|
|
10
10
|
class UnhandledUserError extends teamsfx_api_1.UserError {
|
|
11
11
|
constructor(actionName, detail, helpLink) {
|
|
12
12
|
const errorOptions = generateErrorOptions(actionName, detail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAKgC;AAChC,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAKgC;AAChC,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,UAAkB,EAAE,MAAc,EAAE,QAAgB;QAC9D,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAqB,CAAC;QAClF,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACjC,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAND,gDAMC;AAED,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
|
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
8
|
const errorCode = "UnhandledError";
|
|
9
|
-
const messageKey = "
|
|
9
|
+
const messageKey = "error.common.UnhandledError";
|
|
10
10
|
class UnhandledSystemError extends teamsfx_api_1.SystemError {
|
|
11
11
|
constructor(actionName, detail) {
|
|
12
12
|
const errorOptions = generateErrorOptions(actionName, detail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botFramework/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botFramework/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
|
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
8
|
const errorCode = "UnhandledError";
|
|
9
|
-
const messageKey = "
|
|
9
|
+
const messageKey = "error.common.UnhandledError";
|
|
10
10
|
class UnhandledSystemError extends teamsfx_api_1.SystemError {
|
|
11
11
|
constructor(actionName, detail) {
|
|
12
12
|
const errorOptions = generateErrorOptions(actionName, detail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/file/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/file/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { AzureAccountProvider, LogProvider, M365TokenProvider, Platform, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { AzureAccountProvider, IProgressHandler, LogProvider, M365TokenProvider, Platform, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
|
|
2
2
|
export interface DriverContext {
|
|
3
3
|
azureAccountProvider: AzureAccountProvider;
|
|
4
4
|
m365TokenProvider: M365TokenProvider;
|
|
5
5
|
ui: UserInteraction | undefined;
|
|
6
|
+
progressBar: IProgressHandler | undefined;
|
|
6
7
|
logProvider: LogProvider;
|
|
7
8
|
telemetryReporter: TelemetryReporter;
|
|
8
9
|
projectPath: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/commonArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,EAAE,EAAE,eAAe,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
|
|
1
|
+
{"version":3,"file":"commonArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/commonArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,EAAE,EAAE,eAAe,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
|
|
@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
|
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
8
8
|
const errorCode = "UnhandledError";
|
|
9
|
-
const messageKey = "
|
|
9
|
+
const messageKey = "error.common.UnhandledError";
|
|
10
10
|
class UnhandledSystemError extends teamsfx_api_1.SystemError {
|
|
11
11
|
constructor(actionName, detail) {
|
|
12
12
|
const errorOptions = generateErrorOptions(actionName, detail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/m365/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/m365/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateProgress.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAG9E,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAM5D"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.updateProgress = void 0;
|
|
6
|
+
function updateProgress(eventName) {
|
|
7
|
+
return async (ctx, next) => {
|
|
8
|
+
var _a;
|
|
9
|
+
const driverContext = ctx.arguments[1];
|
|
10
|
+
await ((_a = driverContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(eventName));
|
|
11
|
+
await next();
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
exports.updateProgress = updateProgress;
|
|
15
|
+
//# sourceMappingURL=updateProgress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateProgress.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;QACpD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAsB,CAAC;QAC5D,MAAM,CAAA,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,CAAC,SAAS,CAAC,CAAA,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAND,wCAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/configure.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqB,MAAM,wBAAwB,CAAC;AAK5E,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/configure.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqB,MAAM,wBAAwB,CAAC;AAK5E,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAe3E,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAE5C,eAAO,MAAM,kBAAkB;;CAE9B,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,qBACa,uBAAwB,YAAW,UAAU;IACxD,WAAW,SAAkE;IAEhE,GAAG,CACd,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAarB,MAAM,CACV,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,iBAAiB,EAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAyGhD,OAAO,CAAC,YAAY;CAiBrB"}
|
|
@@ -22,6 +22,7 @@ const telemetry_2 = require("../../../common/telemetry");
|
|
|
22
22
|
const typedi_1 = require("typedi");
|
|
23
23
|
const common_1 = require("../../utils/common");
|
|
24
24
|
const common_2 = require("../../../error/common");
|
|
25
|
+
const updateProgress_1 = require("../middleware/updateProgress");
|
|
25
26
|
exports.actionName = "teamsApp/update";
|
|
26
27
|
exports.defaultOutputNames = {
|
|
27
28
|
teamsAppId: "TEAMS_APP_ID",
|
|
@@ -48,7 +49,6 @@ let ConfigureTeamsAppDriver = class ConfigureTeamsAppDriver {
|
|
|
48
49
|
};
|
|
49
50
|
}
|
|
50
51
|
async update(args, context, outputEnvVarNames) {
|
|
51
|
-
var _a, _b;
|
|
52
52
|
telemetry_1.TelemetryUtils.init(context);
|
|
53
53
|
const result = this.validateArgs(args);
|
|
54
54
|
if (result.isErr()) {
|
|
@@ -98,18 +98,12 @@ let ConfigureTeamsAppDriver = class ConfigureTeamsAppDriver {
|
|
|
98
98
|
catch (error) {
|
|
99
99
|
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppNotExistsError.name, errors_1.AppStudioError.TeamsAppNotExistsError.message(teamsAppId), "https://aka.ms/teamsfx-actions/teamsapp-update"));
|
|
100
100
|
}
|
|
101
|
-
const progressHandler = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.updateTeamsAppTitle"), 1);
|
|
102
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.start());
|
|
103
101
|
try {
|
|
104
102
|
let message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.updateTeamsAppStepMessage");
|
|
105
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(message));
|
|
106
103
|
const appDefinition = await appStudioClient_1.AppStudioClient.importApp(archivedFile, appStudioToken, context.logProvider, true);
|
|
107
104
|
message = localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedLog", appDefinition.teamsAppId);
|
|
108
105
|
context.logProvider.info(message);
|
|
109
106
|
context.addSummary(message);
|
|
110
|
-
if (context.platform === teamsfx_api_1.Platform.VSCode) {
|
|
111
|
-
(_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", message, false);
|
|
112
|
-
}
|
|
113
107
|
return teamsfx_api_1.ok(new Map([
|
|
114
108
|
[outputEnvVarNames.get("teamsAppId"), appDefinition.teamsAppId],
|
|
115
109
|
[outputEnvVarNames.get("teamsAppTenantId"), appDefinition.tenantId],
|
|
@@ -117,12 +111,8 @@ let ConfigureTeamsAppDriver = class ConfigureTeamsAppDriver {
|
|
|
117
111
|
]));
|
|
118
112
|
}
|
|
119
113
|
catch (e) {
|
|
120
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
|
|
121
114
|
return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.TeamsAppUpdateFailedError.name, errors_1.AppStudioError.TeamsAppUpdateFailedError.message(teamsAppId), "https://aka.ms/teamsfx-actions/teamsapp-update"));
|
|
122
115
|
}
|
|
123
|
-
finally {
|
|
124
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
|
|
125
|
-
}
|
|
126
116
|
}
|
|
127
117
|
validateArgs(args) {
|
|
128
118
|
const invalidParams = [];
|
|
@@ -138,7 +128,10 @@ let ConfigureTeamsAppDriver = class ConfigureTeamsAppDriver {
|
|
|
138
128
|
}
|
|
139
129
|
};
|
|
140
130
|
tslib_1.__decorate([
|
|
141
|
-
lib_1.hooks([
|
|
131
|
+
lib_1.hooks([
|
|
132
|
+
addStartAndEndTelemetry_1.addStartAndEndTelemetry(exports.actionName, exports.actionName),
|
|
133
|
+
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.updateTeamsAppStepMessage")),
|
|
134
|
+
]),
|
|
142
135
|
tslib_1.__metadata("design:type", Function),
|
|
143
136
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext,
|
|
144
137
|
Map]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/configure.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA4E;AAC5E,gEAA0B;AAC1B,+CAA8C;AAC9C,0EAA0C;AAC1C,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,gFAA6E;AAC7E,gEAA4E;AAC5E,0EAA4E;AAC5E,kFAA+E;AAC/E,8DAAmE;AACnE,iDAAwD;AACxD,iEAAmE;AACnE,yDAA8D;AAC9D,mCAAiC;AACjC,+CAAqD;AACrD,kDAAmF;
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/configure.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA4E;AAC5E,gEAA0B;AAC1B,+CAA8C;AAC9C,0EAA0C;AAC1C,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,gFAA6E;AAC7E,gEAA4E;AAC5E,0EAA4E;AAC5E,kFAA+E;AAC/E,8DAAmE;AACnE,iDAAwD;AACxD,iEAAmE;AACnE,yDAA8D;AAC9D,mCAAiC;AACjC,+CAAqD;AACrD,kDAAmF;AACnF,iEAA8D;AAEjD,QAAA,UAAU,GAAG,iBAAiB,CAAC;AAE/B,QAAA,kBAAkB,GAAG;IAChC,UAAU,EAAE,cAAc;CAC3B,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,uBAAuB;IAC3C,gBAAgB,EAAE,qBAAqB;CACxC,CAAC;AAGF,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAApC;QACE,gBAAW,GAAG,kCAAkB,CAAC,0CAA0C,CAAC,CAAC;IA0J/E,CAAC;IAxJQ,KAAK,CAAC,GAAG,CACd,IAA2B,EAC3B,OAAsB;QAEtB,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,kBAAU,EAAE,kBAAU,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,IAA2B,EAC3B,OAAsB,EACtB,iBAAuC;QAEvC,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,kBAAU,EAAE,kBAAU,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACpE,OAAO;YACL,MAAM,EAAE,GAAG;YACX,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;IACJ,CAAC;IAMD,KAAK,CAAC,MAAM,CACV,IAA2B,EAC3B,OAA0B,EAC1B,iBAAuC;QAEvC,0BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,IAAI,CAAC,iBAAiB,EAAE;YACtB,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,0BAAkB,CAAC,CAAC,CAAC;SACjE;QACD,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,2BAAmB,CAAC,CAAC,CAAC,CAAC;QAE5F,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACvE,MAAM,EAAE,uBAAe;SACxB,CAAC,CAAC;QACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SACrC;QACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;QAC/C,MAAM,cAAc,GAAG,wBAAe,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE;YAC1C,OAAO,iBAAG,CACR,IAAI,0BAAiB,CACnB,kBAAU,EACV,cAAc,EACd,gDAAgD,CACjD,CACF,CAAC;SACH;QACD,MAAM,YAAY,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAEvD,2CAA2C;QAC3C,MAAM,QAAQ,GAAG,6BAAa,CAAC,+BAA+B,CAAC,YAAY,CAAC,CAAC;QAC7E,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;YACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC5B;QACD,MAAM,YAAY,GAAG,6BAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5E,IAAI,CAAC,IAAI,WAAW,IAAI,CAAC,IAAI,iBAAiB,EAAE;gBAC9C,OAAO,KAAK,CAAC;aACd;iBAAM;gBACL,OAAO,CAAC,CAAC;aACV;QACH,CAAC,CAAC,CAAC;QACH,cAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACjC,CAAC,6BAAiB,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACvE,CAAC,CAAC;QAEH,qFAAqF;QACrF,yBAAyB;QACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC,gBAAM,CAAC,UAAU,CAAC,EAAE;YACvB,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,sBAAsB,CAAC,IAAI,EAC1C,uBAAc,CAAC,sBAAsB,CAAC,OAAO,CAAC,UAAU,CAAC,EACzD,gDAAgD,CACjD,CACF,CAAC;SACH;QACD,IAAI;YACF,MAAM,iCAAe,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;SAC/E;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,sBAAsB,CAAC,IAAI,EAC1C,uBAAc,CAAC,sBAAsB,CAAC,OAAO,CAAC,UAAU,CAAC,EACzD,gDAAgD,CACjD,CACF,CAAC;SACH;QAED,IAAI;YACF,IAAI,OAAO,GAAG,kCAAkB,CAAC,uDAAuD,CAAC,CAAC;YAE1F,MAAM,aAAa,GAAG,MAAM,iCAAe,CAAC,SAAS,CACnD,YAAY,EACZ,cAAc,EACd,OAAO,CAAC,WAAW,EACnB,IAAI,CACL,CAAC;YACF,OAAO,GAAG,kCAAkB,CAC1B,sCAAsC,EACtC,aAAa,CAAC,UAAW,CAC1B,CAAC;YACF,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,gBAAE,CACP,IAAI,GAAG,CAAC;gBACN,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAW,EAAE,aAAa,CAAC,UAAW,CAAC;gBAC1E,CAAC,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAW,EAAE,aAAa,CAAC,QAAS,CAAC;gBAC9E,CAAC,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,CAAW,EAAE,aAAa,CAAC,SAAU,CAAC;aAClF,CAAC,CACH,CAAC;SACH;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,iBAAG,CACR,gCAAsB,CAAC,WAAW,CAChC,uBAAc,CAAC,yBAAyB,CAAC,IAAI,EAC7C,uBAAc,CAAC,yBAAyB,CAAC,OAAO,CAAC,UAAU,CAAC,EAC5D,gDAAgD,CACjD,CACF,CAAC;SACH;IACH,CAAC;IAEO,YAAY,CAAC,IAA2B;QAC9C,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACjC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACtC;QACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,iBAAG,CACR,IAAI,gCAAuB,CACzB,kBAAU,EACV,aAAa,EACb,gDAAgD,CACjD,CACF,CAAC;SACH;aAAM;YACL,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;IACH,CAAC;CACF,CAAA;AA9HC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,kBAAU,EAAE,kBAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,uDAAuD,CAAC,CAAC;KAC5F,CAAC;;qDAGS,4BAAiB;QACN,GAAG;;qDAwGxB;AAxIU,uBAAuB;IADnC,gBAAO,CAAC,kBAAU,CAAC;GACP,uBAAuB,CA2JnC;AA3JY,0DAAuB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AASzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IAE1E,GAAG,CACd,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IA8HhD,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,YAAY;CAuBrB"}
|
|
@@ -8,7 +8,6 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
|
8
8
|
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
9
9
|
const path = tslib_1.__importStar(require("path"));
|
|
10
10
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
11
|
-
const url_1 = require("url");
|
|
12
11
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
13
12
|
const typedi_1 = require("typedi");
|
|
14
13
|
const wrapUtil_1 = require("../util/wrapUtil");
|
|
@@ -16,8 +15,8 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
|
|
|
16
15
|
const ManifestUtils_1 = require("../../resource/appManifest/utils/ManifestUtils");
|
|
17
16
|
const constants_1 = require("../../resource/appManifest/constants");
|
|
18
17
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
19
|
-
const constants_2 = require("../../../common/constants");
|
|
20
18
|
const common_1 = require("../../../error/common");
|
|
19
|
+
const updateProgress_1 = require("../middleware/updateProgress");
|
|
21
20
|
exports.actionName = "teamsApp/zipAppPackage";
|
|
22
21
|
let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
23
22
|
constructor() {
|
|
@@ -37,7 +36,7 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
37
36
|
};
|
|
38
37
|
}
|
|
39
38
|
async build(args, context) {
|
|
40
|
-
var _a, _b
|
|
39
|
+
var _a, _b;
|
|
41
40
|
const result = this.validateArgs(args);
|
|
42
41
|
if (result.isErr()) {
|
|
43
42
|
return teamsfx_api_1.err(result.error);
|
|
@@ -128,16 +127,6 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
128
127
|
(_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", builtSuccess, false);
|
|
129
128
|
}
|
|
130
129
|
}
|
|
131
|
-
else if (context.platform === teamsfx_api_1.Platform.VSCode) {
|
|
132
|
-
const isWindows = process.platform === "win32";
|
|
133
|
-
let builtSuccess = localizeUtils_1.getLocalizedString("plugins.appstudio.buildSucceedNotice.fallback", zipFileName);
|
|
134
|
-
if (isWindows) {
|
|
135
|
-
const folderLink = url_1.pathToFileURL(path.dirname(zipFileName));
|
|
136
|
-
const appPackageLink = `${constants_2.VSCodeExtensionCommand.openFolder}?%5B%22${folderLink}%22%5D`;
|
|
137
|
-
builtSuccess = localizeUtils_1.getLocalizedString("plugins.appstudio.buildSucceedNotice", appPackageLink);
|
|
138
|
-
}
|
|
139
|
-
(_c = context.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", builtSuccess, false);
|
|
140
|
-
}
|
|
141
130
|
return teamsfx_api_1.ok(new Map());
|
|
142
131
|
}
|
|
143
132
|
loadCurrentState() {
|
|
@@ -169,7 +158,10 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
169
158
|
}
|
|
170
159
|
};
|
|
171
160
|
tslib_1.__decorate([
|
|
172
|
-
lib_1.hooks([
|
|
161
|
+
lib_1.hooks([
|
|
162
|
+
addStartAndEndTelemetry_1.addStartAndEndTelemetry(exports.actionName, exports.actionName),
|
|
163
|
+
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("plugins.appstudio.createPackage.progressBar.message")),
|
|
164
|
+
]),
|
|
173
165
|
tslib_1.__metadata("design:type", Function),
|
|
174
166
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
175
167
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,gEAA0B;AAC1B,8DAA6B;AAC7B,mDAA6B;AAC7B,+CAA8C;
|
|
1
|
+
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"publishAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAkB3E,qBACa,uBAAwB,YAAW,UAAU;IACxD,WAAW,SAAmE;IACjE,GAAG,CACd,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAUnC,OAAO,CAClB,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAad,OAAO,CAClB,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,iBAAiB,EAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAqIhD,OAAO,CAAC,YAAY;CAiBrB"}
|
|
@@ -20,6 +20,7 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
20
20
|
const typedi_1 = require("typedi");
|
|
21
21
|
const common_1 = require("../../utils/common");
|
|
22
22
|
const common_2 = require("../../../error/common");
|
|
23
|
+
const updateProgress_1 = require("../middleware/updateProgress");
|
|
23
24
|
const actionName = "teamsApp/publishAppPackage";
|
|
24
25
|
const defaultOutputNames = {
|
|
25
26
|
publishedAppId: "TEAMS_APP_PUBLISHED_APP_ID",
|
|
@@ -44,7 +45,7 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
44
45
|
};
|
|
45
46
|
}
|
|
46
47
|
async publish(args, context, outputEnvVarNames) {
|
|
47
|
-
var _a, _b, _c
|
|
48
|
+
var _a, _b, _c;
|
|
48
49
|
telemetry_1.TelemetryUtils.init(context);
|
|
49
50
|
const argsValidationResult = this.validateArgs(args);
|
|
50
51
|
if (argsValidationResult.isErr()) {
|
|
@@ -53,8 +54,6 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
53
54
|
if (!outputEnvVarNames) {
|
|
54
55
|
outputEnvVarNames = new Map(Object.entries(defaultOutputNames));
|
|
55
56
|
}
|
|
56
|
-
const progressHandler = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.publishTeamsAppTitle"), 2);
|
|
57
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.start());
|
|
58
57
|
const appPackagePath = common_1.getAbsolutePath(args.appPackagePath, context.projectPath);
|
|
59
58
|
if (!(await fs_extra_1.default.pathExists(appPackagePath))) {
|
|
60
59
|
return teamsfx_api_1.err(new common_2.FileNotFoundError(actionName, appPackagePath, "https://aka.ms/teamsfx-actions/teamsapp-publish"));
|
|
@@ -76,7 +75,6 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
76
75
|
}
|
|
77
76
|
let result;
|
|
78
77
|
const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.publishTeamsAppStep1");
|
|
79
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(message));
|
|
80
78
|
context.addSummary(message);
|
|
81
79
|
try {
|
|
82
80
|
const existApp = await appStudioClient_1.AppStudioClient.getAppByTeamsAppId(manifest.id, appStudioTokenRes.value);
|
|
@@ -87,17 +85,16 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
87
85
|
if (existApp.lastModifiedDateTime) {
|
|
88
86
|
description =
|
|
89
87
|
description +
|
|
90
|
-
localizeUtils_1.getLocalizedString("plugins.appstudio.lastModified", (
|
|
88
|
+
localizeUtils_1.getLocalizedString("plugins.appstudio.lastModified", (_a = existApp.lastModifiedDateTime) === null || _a === void 0 ? void 0 : _a.toLocaleString());
|
|
91
89
|
}
|
|
92
90
|
description =
|
|
93
91
|
description + localizeUtils_1.getLocalizedString("plugins.appstudio.updatePublihsedAppConfirm");
|
|
94
92
|
const confirm = localizeUtils_1.getLocalizedString("core.option.confirm");
|
|
95
|
-
const res = await ((
|
|
93
|
+
const res = await ((_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("warn", description, true, confirm));
|
|
96
94
|
if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === confirm)
|
|
97
95
|
executePublishUpdate = true;
|
|
98
96
|
if (executePublishUpdate) {
|
|
99
97
|
const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.publishTeamsAppStep2.1");
|
|
100
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(message));
|
|
101
98
|
context.addSummary(message);
|
|
102
99
|
const appId = await appStudioClient_1.AppStudioClient.publishTeamsAppUpdate(manifest.id, archivedFile, appStudioTokenRes.value);
|
|
103
100
|
result = new Map([[outputEnvVarNames.get("publishedAppId"), appId]]);
|
|
@@ -113,7 +110,6 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
113
110
|
else {
|
|
114
111
|
context.addSummary(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.publishTeamsAppNotExists", manifest.id));
|
|
115
112
|
const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.publishTeamsAppStep2.2");
|
|
116
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(message));
|
|
117
113
|
context.addSummary(message);
|
|
118
114
|
const appId = await appStudioClient_1.AppStudioClient.publishTeamsApp(manifest.id, archivedFile, appStudioTokenRes.value);
|
|
119
115
|
result = new Map([[outputEnvVarNames.get("publishedAppId"), appId]]);
|
|
@@ -123,27 +119,13 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
123
119
|
}
|
|
124
120
|
}
|
|
125
121
|
catch (e) {
|
|
126
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
|
|
127
122
|
return teamsfx_api_1.err(e);
|
|
128
123
|
}
|
|
129
|
-
finally {
|
|
130
|
-
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
|
|
131
|
-
}
|
|
132
124
|
context.logProvider.info(`Publish success!`);
|
|
133
125
|
context.addSummary(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.publishTeamsAppSuccess", manifest.id));
|
|
134
126
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
135
127
|
const msg = localizeUtils_1.getLocalizedString("plugins.appstudio.publishSucceedNotice.cli", manifest.name.short, constants_1.Constants.TEAMS_ADMIN_PORTAL, constants_1.Constants.TEAMS_MANAGE_APP_DOC);
|
|
136
|
-
(
|
|
137
|
-
}
|
|
138
|
-
else {
|
|
139
|
-
const msg = localizeUtils_1.getLocalizedString("plugins.appstudio.publishSucceedNotice", manifest.name.short, constants_1.Constants.TEAMS_MANAGE_APP_DOC);
|
|
140
|
-
const adminPortal = localizeUtils_1.getLocalizedString("plugins.appstudio.adminPortal");
|
|
141
|
-
(_e = context.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", msg, false, adminPortal).then((value) => {
|
|
142
|
-
var _a;
|
|
143
|
-
if (value.isOk() && value.value === adminPortal) {
|
|
144
|
-
(_a = context.ui) === null || _a === void 0 ? void 0 : _a.openUrl(constants_1.Constants.TEAMS_ADMIN_PORTAL);
|
|
145
|
-
}
|
|
146
|
-
});
|
|
128
|
+
(_c = context.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", msg, false);
|
|
147
129
|
}
|
|
148
130
|
return teamsfx_api_1.ok(result);
|
|
149
131
|
}
|
|
@@ -161,7 +143,10 @@ let PublishAppPackageDriver = class PublishAppPackageDriver {
|
|
|
161
143
|
}
|
|
162
144
|
};
|
|
163
145
|
tslib_1.__decorate([
|
|
164
|
-
lib_1.hooks([
|
|
146
|
+
lib_1.hooks([
|
|
147
|
+
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
148
|
+
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.publishTeamsAppStep2.2")),
|
|
149
|
+
]),
|
|
165
150
|
tslib_1.__metadata("design:type", Function),
|
|
166
151
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext,
|
|
167
152
|
Map]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAQgC;AAChC,gEAA0B;AAC1B,8DAA6B;AAC7B,mCAA+B;AAC/B,+CAA8C;AAG9C,+CAAqD;AACrD,mFAAgF;AAEhF,gFAA6E;AAC7E,oEAAiE;AACjE,0EAA4E;AAC5E,0EAAkF;AAClF,iDAAwD;AACxD,iEAAmE;AACnE,mCAAiC;AACjC,+CAAqD;AACrD,kDAAmF;
|
|
1
|
+
{"version":3,"file":"publishAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/publishAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAmC,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAmC,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAazE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAElE,GAAG,CACd,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAgEhD,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,YAAY;CAuBrB"}
|
|
@@ -16,6 +16,7 @@ const ManifestUtils_1 = require("../../resource/appManifest/utils/ManifestUtils"
|
|
|
16
16
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
17
17
|
const constants_1 = require("../../../common/constants");
|
|
18
18
|
const common_1 = require("../../utils/common");
|
|
19
|
+
const updateProgress_1 = require("../middleware/updateProgress");
|
|
19
20
|
const actionName = "teamsApp/validateManifest";
|
|
20
21
|
let ValidateManifestDriver = class ValidateManifestDriver {
|
|
21
22
|
constructor() {
|
|
@@ -35,7 +36,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
35
36
|
};
|
|
36
37
|
}
|
|
37
38
|
async validate(args, context) {
|
|
38
|
-
var _a
|
|
39
|
+
var _a;
|
|
39
40
|
telemetry_1.TelemetryUtils.init(context);
|
|
40
41
|
const result = this.validateArgs(args);
|
|
41
42
|
if (result.isErr()) {
|
|
@@ -73,9 +74,6 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
73
74
|
if (context.platform === teamsfx_api_1.Platform.VS) {
|
|
74
75
|
context.logProvider.info(validationSuccess);
|
|
75
76
|
}
|
|
76
|
-
else {
|
|
77
|
-
(_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", validationSuccess, false);
|
|
78
|
-
}
|
|
79
77
|
return teamsfx_api_1.ok(new Map());
|
|
80
78
|
}
|
|
81
79
|
loadCurrentState() {
|
|
@@ -94,7 +92,10 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
94
92
|
}
|
|
95
93
|
};
|
|
96
94
|
tslib_1.__decorate([
|
|
97
|
-
lib_1.hooks([
|
|
95
|
+
lib_1.hooks([
|
|
96
|
+
addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
|
|
97
|
+
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("plugins.appstudio.validateManifest.progressBar.message")),
|
|
98
|
+
]),
|
|
98
99
|
tslib_1.__metadata("design:type", Function),
|
|
99
100
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
100
101
|
tslib_1.__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA0F;AAC1F,+CAA8C;AAC9C,mCAAiC;AAGjC,+CAAqD;AAErD,mFAAgF;AAChF,0EAA4E;AAC5E,gEAA4E;AAC5E,8DAAmE;AACnE,kFAA+E;AAC/E,iEAAqF;AACrF,yDAAsD;AACtD,+CAAqD;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA0F;AAC1F,+CAA8C;AAC9C,mCAAiC;AAGjC,+CAAqD;AAErD,mFAAgF;AAChF,0EAA4E;AAC5E,gEAA4E;AAC5E,8DAAmE;AACnE,kFAA+E;AAC/E,iEAAqF;AACrF,yDAAsD;AACtD,+CAAqD;AACrD,iEAA8D;AAE9D,MAAM,UAAU,GAAG,2BAA2B,CAAC;AAG/C,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QACE,gBAAW,GAAG,kCAAkB,CAAC,4CAA4C,CAAC,CAAC;IA2HjF,CAAC;IAzHQ,KAAK,CAAC,GAAG,CACd,IAA0B,EAC1B,OAAsB;QAEtB,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,IAA0B,EAC1B,OAAsB;QAEtB,MAAM,WAAW,GAAG,IAAI,4BAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACnD,OAAO;YACL,MAAM,EAAE,GAAG;YACX,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;IACJ,CAAC;IAMM,KAAK,CAAC,QAAQ,CACnB,IAA0B,EAC1B,OAA0B;;QAE1B,0BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,6BAAa,CAAC,aAAa,CACnD,wBAAe,CAAC,IAAI,CAAC,YAAa,EAAE,OAAO,CAAC,WAAW,CAAC,EACxD,KAAK,CACN,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/B;QACD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC;QAEnC,IAAI,gBAAgB,CAAC;QACrB,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,IAAI;gBACF,gBAAgB,GAAG,MAAM,0BAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aAClE;YAAC,OAAO,CAAM,EAAE;gBACf,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC;oBAC3C,kCAAkB,CAChB,2CAA2C,EAC3C,QAAQ,CAAC,OAAO,EAChB,CAAC,CAAC,OAAO,CACV;iBACF,CAAC,EACF,qBAAS,CAAC,gBAAgB,CAC3B,CACF,CAAC;aACH;SACF;aAAM;YACL,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBAC3C,kCAAkB,CAAC,0CAA0C,CAAC;aAC/D,CAAC,EACF,qBAAS,CAAC,gBAAgB,CAC3B,CACF,CAAC;SACH;QAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,UAAU,GAAG,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAClF,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CAAC,kCAAkB,CAAC,0CAA0C,CAAC,CAAC,CAAC;YAC3F,MAAM,gBAAgB,GAAG,gCAAsB,CAAC,SAAS,CACvD,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,UAAU,EACV,kDAAkD,CACnD,CAAC;YACF,OAAO,iBAAG,CAAC,gBAAgB,CAAC,CAAC;SAC9B;QACD,MAAM,iBAAiB,GAAG,kCAAkB,CAAC,2CAA2C,CAAC,CAAC;QAC1F,IAAI,OAAO,CAAC,QAAQ,KAAK,sBAAQ,CAAC,EAAE,EAAE;YACpC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC7C;QACD,OAAO,gBAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IACvB,CAAC;IAEO,gBAAgB;QACtB,OAAO;YACL,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;SAClC,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,IAA0B;QAC7C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAC/B,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC;gBACE,gCAAgB,CACd,2CAA2C,EAC3C,cAAc,EACd,UAAU,CACX;gBACD,kCAAkB,CAChB,2CAA2C,EAC3C,cAAc,EACd,UAAU,CACX;aACF,EACD,kDAAkD,CACnD,CACF,CAAC;SACH;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CACF,CAAA;AAhGC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,wDAAwD,CAAC,CAAC;KAC7F,CAAC;;qDAGS,4BAAiB;;sDA+D3B;AA7FU,sBAAsB;IADlC,gBAAO,CAAC,UAAU,CAAC;GACP,sBAAsB,CA4HlC;AA5HY,wDAAsB"}
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { Middleware, NextFunction } from "@feathersjs/hooks";
|
|
2
2
|
import { CoreHookContext } from "../../core/types";
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
/**
|
|
4
|
+
*
|
|
5
|
+
* @param withLocalEnv whether include local env in env selection list
|
|
6
|
+
* @param skipLoadIfNoEnvInput whether to ignore this middleware if input.env is not available
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
9
|
+
export declare function EnvLoaderMW(withLocalEnv: boolean, skipLoadIfNoEnvInput?: boolean): Middleware;
|
|
10
|
+
export declare const envLoaderMWImpl: (withLocalEnv: boolean, ctx: CoreHookContext, next: NextFunction, skipLoadIfNoEnvInput?: boolean) => Promise<void>;
|
|
5
11
|
export declare const EnvWriterMW: Middleware;
|
|
6
12
|
//# sourceMappingURL=envMW.d.ts.map
|