@microsoft/teamsfx-core 3.0.5-alpha.2df64786b.0 → 3.0.5-alpha.45efd31a4.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.
Files changed (97) hide show
  1. package/build/client/graphClient.d.ts +8 -4
  2. package/build/client/graphClient.d.ts.map +1 -1
  3. package/build/client/graphClient.js +35 -8
  4. package/build/client/graphClient.js.map +1 -1
  5. package/build/client/interfaces/GetGroupResponse.d.ts +6 -0
  6. package/build/client/interfaces/GetGroupResponse.d.ts.map +1 -0
  7. package/build/client/interfaces/GetGroupResponse.js +5 -0
  8. package/build/client/interfaces/GetGroupResponse.js.map +1 -0
  9. package/build/client/interfaces/GetUserResponse.d.ts +7 -0
  10. package/build/client/interfaces/GetUserResponse.d.ts.map +1 -0
  11. package/build/client/interfaces/GetUserResponse.js +5 -0
  12. package/build/client/interfaces/GetUserResponse.js.map +1 -0
  13. package/build/common/constants.d.ts +1 -0
  14. package/build/common/constants.d.ts.map +1 -1
  15. package/build/common/constants.js +2 -1
  16. package/build/common/constants.js.map +1 -1
  17. package/build/common/permissionInterface.d.ts +6 -0
  18. package/build/common/permissionInterface.d.ts.map +1 -1
  19. package/build/common/templates-config.json +1 -1
  20. package/build/component/configManager/validator.d.ts.map +1 -1
  21. package/build/component/configManager/validator.js +1 -0
  22. package/build/component/configManager/validator.js.map +1 -1
  23. package/build/component/coordinator/index.d.ts.map +1 -1
  24. package/build/component/coordinator/index.js +0 -1
  25. package/build/component/coordinator/index.js.map +1 -1
  26. package/build/component/deps-checker/internal/testToolChecker.js +1 -1
  27. package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
  28. package/build/component/driver/index.d.ts +19 -20
  29. package/build/component/driver/index.d.ts.map +1 -1
  30. package/build/component/driver/index.js +19 -20
  31. package/build/component/driver/index.js.map +1 -1
  32. package/build/component/driver/m365/acquire.d.ts +3 -0
  33. package/build/component/driver/m365/acquire.d.ts.map +1 -1
  34. package/build/component/driver/m365/acquire.js +29 -19
  35. package/build/component/driver/m365/acquire.js.map +1 -1
  36. package/build/component/driver/share/utils.d.ts.map +1 -1
  37. package/build/component/driver/share/utils.js +12 -10
  38. package/build/component/driver/share/utils.js.map +1 -1
  39. package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +1 -1
  40. package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
  41. package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +5 -2
  42. package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
  43. package/build/component/feature/collaboration.d.ts +7 -1
  44. package/build/component/feature/collaboration.d.ts.map +1 -1
  45. package/build/component/feature/collaboration.js +84 -1
  46. package/build/component/feature/collaboration.js.map +1 -1
  47. package/build/component/m365/packageService.d.ts +6 -1
  48. package/build/component/m365/packageService.d.ts.map +1 -1
  49. package/build/component/m365/packageService.js +28 -5
  50. package/build/component/m365/packageService.js.map +1 -1
  51. package/build/core/FxCore.d.ts.map +1 -1
  52. package/build/core/FxCore.js +1 -29
  53. package/build/core/FxCore.js.map +1 -1
  54. package/build/core/collaborator.d.ts +1 -0
  55. package/build/core/collaborator.d.ts.map +1 -1
  56. package/build/core/collaborator.js +55 -29
  57. package/build/core/collaborator.js.map +1 -1
  58. package/build/core/share.d.ts.map +1 -1
  59. package/build/core/share.js +16 -2
  60. package/build/core/share.js.map +1 -1
  61. package/build/question/collaborator.d.ts +6 -0
  62. package/build/question/collaborator.d.ts.map +1 -0
  63. package/build/question/collaborator.js +166 -0
  64. package/build/question/collaborator.js.map +1 -0
  65. package/build/question/index.d.ts.map +1 -1
  66. package/build/question/index.js +3 -2
  67. package/build/question/index.js.map +1 -1
  68. package/build/question/inputs/ShareInputs.d.ts +2 -2
  69. package/build/question/inputs/ShareInputs.d.ts.map +1 -1
  70. package/build/question/options/ShareOptions.js +1 -1
  71. package/build/question/options/ShareOptions.js.map +1 -1
  72. package/build/question/other.d.ts +1 -4
  73. package/build/question/other.d.ts.map +1 -1
  74. package/build/question/other.js +2 -145
  75. package/build/question/other.js.map +1 -1
  76. package/build/question/share.d.ts +1 -3
  77. package/build/question/share.d.ts.map +1 -1
  78. package/build/question/share.js +2 -14
  79. package/build/question/share.js.map +1 -1
  80. package/build/tsconfig.tsbuildinfo +1 -1
  81. package/package.json +4 -4
  82. package/resource/package.nls.json +8 -8
  83. package/resource/yaml-schema/v1.10/yaml.schema.json +2058 -0
  84. package/resource/yaml-schema/yaml.schema.json +5 -54
  85. package/templates/fallback/common.zip +0 -0
  86. package/templates/fallback/csharp.zip +0 -0
  87. package/templates/fallback/js.zip +0 -0
  88. package/templates/fallback/python.zip +0 -0
  89. package/templates/fallback/ts.zip +0 -0
  90. package/templates/plugins/resource/aad/auth/V3/Bot/SSO/SsoDialog.cs +1 -1
  91. package/templates/plugins/resource/aad/auth/V3/Bot/SSO/SsoOperations.cs +1 -1
  92. package/templates/plugins/resource/aad/auth/V3/Bot/SSO/TeamsBotSsoPrompt.cs +2 -3
  93. package/templates/plugins/resource/aad/auth/V3/Bot/SSO/TeamsBotSsoPromptSettings.cs +41 -0
  94. package/build/component/driver/share/shareToOthers.d.ts +0 -17
  95. package/build/component/driver/share/shareToOthers.d.ts.map +0 -1
  96. package/build/component/driver/share/shareToOthers.js +0 -127
  97. package/build/component/driver/share/shareToOthers.js.map +0 -1
@@ -1,40 +1,39 @@
1
1
  /**
2
2
  * @author xzf0587 <zhaofengxu@microsoft.com>
3
3
  */
4
- import "./teamsApp/create";
5
- import "./teamsApp/validate";
6
- import "./teamsApp/validateAppPackage";
7
- import "./teamsApp/validateTestCases";
8
- import "./teamsApp/configure";
9
- import "./teamsApp/copyAppPackageToSPFx";
10
- import "./teamsApp/publishAppPackage";
11
- import "./teamsApp/syncManifest";
12
- import "./devChannel/create";
13
- import "./devChannel/installApp";
14
4
  import "./aad/create";
15
5
  import "./aad/update";
6
+ import "./add/addWebPart";
7
+ import "./apiKey/create";
8
+ import "./apiKey/update";
16
9
  import "./arm/deploy";
17
10
  import "./botAadApp/create";
11
+ import "./botFramework/createOrUpdateBot";
18
12
  import "./deploy/azure/azureAppServiceDeployDriver";
19
13
  import "./deploy/azure/azureFunctionDeployDriver";
14
+ import "./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver";
20
15
  import "./deploy/azure/azureStorageDeployDriver";
21
16
  import "./deploy/azure/azureStorageStaticWebsiteConfigDriver";
22
17
  import "./deploy/spfx/deployDriver";
23
- import "./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver";
24
- import "./script/dotnetBuildDriver";
25
- import "./script/npmBuildDriver";
26
- import "./script/npxBuildDriver";
27
- import "./script/scriptDriver";
18
+ import "./devChannel/create";
19
+ import "./devChannel/installApp";
28
20
  import "./devTool/installDriver";
29
21
  import "./file/createOrUpdateEnvironmentFile";
30
22
  import "./file/createOrUpdateJsonFile";
31
- import "./botFramework/createOrUpdateBot";
32
23
  import "./m365/acquire";
33
- import "./add/addWebPart";
34
- import "./apiKey/create";
35
- import "./apiKey/update";
36
24
  import "./oauth/create";
37
25
  import "./oauth/update";
38
- import "./share/shareToOthers";
26
+ import "./script/dotnetBuildDriver";
27
+ import "./script/npmBuildDriver";
28
+ import "./script/npxBuildDriver";
29
+ import "./script/scriptDriver";
30
+ import "./teamsApp/configure";
31
+ import "./teamsApp/copyAppPackageToSPFx";
32
+ import "./teamsApp/create";
33
+ import "./teamsApp/publishAppPackage";
34
+ import "./teamsApp/syncManifest";
35
+ import "./teamsApp/validate";
36
+ import "./teamsApp/validateAppPackage";
37
+ import "./teamsApp/validateTestCases";
39
38
  import "./typeSpec/compile";
40
39
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,mBAAmB,CAAC;AAC3B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,+BAA+B,CAAC;AACvC,OAAO,8BAA8B,CAAC;AACtC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,8BAA8B,CAAC;AACtC,OAAO,yBAAyB,CAAC;AACjC,OAAO,qBAAqB,CAAC;AAC7B,OAAO,yBAAyB,CAAC;AACjC,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,0DAA0D,CAAC;AAClE,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,yBAAyB,CAAC;AACjC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,+BAA+B,CAAC;AACvC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,gBAAgB,CAAC;AACxB,OAAO,kBAAkB,CAAC;AAC1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,CAAC;AACzB,OAAO,gBAAgB,CAAC;AACxB,OAAO,gBAAgB,CAAC;AACxB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,kBAAkB,CAAC;AAC1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,CAAC;AACzB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,kCAAkC,CAAC;AAC1C,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,0DAA0D,CAAC;AAClE,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,qBAAqB,CAAC;AAC7B,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,+BAA+B,CAAC;AACvC,OAAO,gBAAgB,CAAC;AACxB,OAAO,gBAAgB,CAAC;AACxB,OAAO,gBAAgB,CAAC;AACxB,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,mBAAmB,CAAC;AAC3B,OAAO,8BAA8B,CAAC;AACtC,OAAO,yBAAyB,CAAC;AACjC,OAAO,qBAAqB,CAAC;AAC7B,OAAO,+BAA+B,CAAC;AACvC,OAAO,8BAA8B,CAAC;AACtC,OAAO,oBAAoB,CAAC"}
@@ -5,40 +5,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
5
5
  /**
6
6
  * @author xzf0587 <zhaofengxu@microsoft.com>
7
7
  */
8
- require("./teamsApp/create");
9
- require("./teamsApp/validate");
10
- require("./teamsApp/validateAppPackage");
11
- require("./teamsApp/validateTestCases");
12
- require("./teamsApp/configure");
13
- require("./teamsApp/copyAppPackageToSPFx");
14
- require("./teamsApp/publishAppPackage");
15
- require("./teamsApp/syncManifest");
16
- require("./devChannel/create");
17
- require("./devChannel/installApp");
18
8
  require("./aad/create");
19
9
  require("./aad/update");
10
+ require("./add/addWebPart");
11
+ require("./apiKey/create");
12
+ require("./apiKey/update");
20
13
  require("./arm/deploy");
21
14
  require("./botAadApp/create");
15
+ require("./botFramework/createOrUpdateBot");
22
16
  require("./deploy/azure/azureAppServiceDeployDriver");
23
17
  require("./deploy/azure/azureFunctionDeployDriver");
18
+ require("./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver");
24
19
  require("./deploy/azure/azureStorageDeployDriver");
25
20
  require("./deploy/azure/azureStorageStaticWebsiteConfigDriver");
26
21
  require("./deploy/spfx/deployDriver");
27
- require("./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver");
28
- require("./script/dotnetBuildDriver");
29
- require("./script/npmBuildDriver");
30
- require("./script/npxBuildDriver");
31
- require("./script/scriptDriver");
22
+ require("./devChannel/create");
23
+ require("./devChannel/installApp");
32
24
  require("./devTool/installDriver");
33
25
  require("./file/createOrUpdateEnvironmentFile");
34
26
  require("./file/createOrUpdateJsonFile");
35
- require("./botFramework/createOrUpdateBot");
36
27
  require("./m365/acquire");
37
- require("./add/addWebPart");
38
- require("./apiKey/create");
39
- require("./apiKey/update");
40
28
  require("./oauth/create");
41
29
  require("./oauth/update");
42
- require("./share/shareToOthers");
30
+ require("./script/dotnetBuildDriver");
31
+ require("./script/npmBuildDriver");
32
+ require("./script/npxBuildDriver");
33
+ require("./script/scriptDriver");
34
+ require("./teamsApp/configure");
35
+ require("./teamsApp/copyAppPackageToSPFx");
36
+ require("./teamsApp/create");
37
+ require("./teamsApp/publishAppPackage");
38
+ require("./teamsApp/syncManifest");
39
+ require("./teamsApp/validate");
40
+ require("./teamsApp/validateAppPackage");
41
+ require("./teamsApp/validateTestCases");
43
42
  require("./typeSpec/compile");
44
43
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,6BAA2B;AAC3B,+BAA6B;AAC7B,yCAAuC;AACvC,wCAAsC;AACtC,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,mCAAiC;AACjC,+BAA6B;AAC7B,mCAAiC;AACjC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,oEAAkE;AAClE,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,4CAA0C;AAC1C,0BAAwB;AACxB,4BAA0B;AAC1B,2BAAyB;AACzB,2BAAyB;AACzB,0BAAwB;AACxB,0BAAwB;AACxB,iCAA+B;AAC/B,8BAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,wBAAsB;AACtB,wBAAsB;AACtB,4BAA0B;AAC1B,2BAAyB;AACzB,2BAAyB;AACzB,wBAAsB;AACtB,8BAA4B;AAC5B,4CAA0C;AAC1C,sDAAoD;AACpD,oDAAkD;AAClD,oEAAkE;AAClE,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,+BAA6B;AAC7B,mCAAiC;AACjC,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,0BAAwB;AACxB,0BAAwB;AACxB,0BAAwB;AACxB,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,gCAA8B;AAC9B,2CAAyC;AACzC,6BAA2B;AAC3B,wCAAsC;AACtC,mCAAiC;AACjC,+BAA6B;AAC7B,yCAAuC;AACvC,wCAAsC;AACtC,8BAA4B"}
@@ -1,9 +1,12 @@
1
1
  import { FxError, Result } from "@microsoft/teamsfx-api";
2
+ import { AppScope } from "../../m365/packageService";
2
3
  import { DriverContext } from "../interface/commonArgs";
3
4
  import { ExecutionResult, StepDriver } from "../interface/stepDriver";
4
5
  interface AcquireArgs {
5
6
  appPackagePath?: string;
7
+ scope?: AppScope;
6
8
  }
9
+ export declare const actionName = "teamsApp/extendToM365";
7
10
  export declare class M365TitleAcquireDriver implements StepDriver {
8
11
  description: string;
9
12
  readonly progressTitle: string;
@@ -1 +1 @@
1
- {"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAQjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAUD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA8D;IAGvE,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAsDrB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;CAKlC"}
1
+ {"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAIjF,OAAO,EAAE,QAAQ,EAAkB,MAAM,2BAA2B,CAAC;AAIrE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED,eAAO,MAAM,UAAU,0BAA0B,CAAC;AASlD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA8D;IAGvE,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IA6DrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,yBAAyB;CAKlC"}
@@ -2,24 +2,25 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.M365TitleAcquireDriver = void 0;
5
+ exports.M365TitleAcquireDriver = exports.actionName = void 0;
6
6
  const tslib_1 = require("tslib");
7
7
  const fs = tslib_1.__importStar(require("fs-extra"));
8
8
  const typedi_1 = require("typedi");
9
9
  const lib_1 = require("@feathersjs/hooks/lib");
10
10
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
11
11
  const localizeUtils_1 = require("../../../common/localizeUtils");
12
+ const common_1 = require("../../../error/common");
12
13
  const packageService_1 = require("../../m365/packageService");
13
14
  const serviceConstant_1 = require("../../m365/serviceConstant");
14
- const common_1 = require("../../../error/common");
15
15
  const common_2 = require("../../utils/common");
16
16
  const constants_1 = require("../aad/utility/constants");
17
17
  const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
18
- const actionName = "teamsApp/extendToM365";
18
+ exports.actionName = "teamsApp/extendToM365";
19
19
  const helpLink = "https://aka.ms/teamsfx-actions/teamsapp-extendToM365";
20
20
  const outputKeys = {
21
21
  titleId: "titleId",
22
22
  appId: "appId",
23
+ shareLink: "shareLink",
23
24
  };
24
25
  let M365TitleAcquireDriver = class M365TitleAcquireDriver {
25
26
  constructor() {
@@ -30,7 +31,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
30
31
  return (0, common_2.wrapRun)(async () => {
31
32
  const result = await this.handler(args, context);
32
33
  return result.output;
33
- }, actionName);
34
+ }, exports.actionName);
34
35
  }
35
36
  async execute(args, ctx, outputEnvVarNames) {
36
37
  let summaries = [];
@@ -38,7 +39,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
38
39
  const result = await this.handler(args, ctx, outputEnvVarNames);
39
40
  summaries = result.summaries;
40
41
  return result.output;
41
- }, actionName);
42
+ }, exports.actionName);
42
43
  return {
43
44
  result: outputResult,
44
45
  summaries,
@@ -51,7 +52,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
51
52
  this.validateOutputEnvVarNames(outputEnvVarNames);
52
53
  const appPackagePath = (0, common_2.getAbsolutePath)(args.appPackagePath, context.projectPath);
53
54
  if (!(await fs.pathExists(appPackagePath))) {
54
- throw new common_1.FileNotFoundError(actionName, appPackagePath, helpLink);
55
+ throw new common_1.FileNotFoundError(exports.actionName, appPackagePath, helpLink);
55
56
  }
56
57
  // get sideloading service settings
57
58
  const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.MosServiceEndpoint;
@@ -64,23 +65,26 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
64
65
  throw sideloadingTokenRes.error;
65
66
  }
66
67
  const sideloadingToken = sideloadingTokenRes.value;
67
- const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath);
68
+ const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath, args.scope);
69
+ const mapping = new Map();
70
+ mapping.set(outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]);
71
+ mapping.set(outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]);
72
+ if (outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.shareLink)) {
73
+ mapping.set(outputEnvVarNames.get(outputKeys.shareLink), sideloadingRes[2]);
74
+ }
68
75
  return {
69
- output: new Map([
70
- [outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]],
71
- [outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]],
72
- ]),
76
+ output: mapping,
73
77
  summaries: [(0, localizeUtils_1.getLocalizedString)("driver.m365.acquire.summary", sideloadingRes[0])],
74
78
  };
75
79
  }
76
80
  catch (error) {
77
81
  if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
78
- (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
82
+ (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
79
83
  throw error;
80
84
  }
81
85
  const message = JSON.stringify(error);
82
- (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
83
- throw (0, common_1.assembleError)(error, actionName);
86
+ (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
87
+ throw (0, common_1.assembleError)(error, exports.actionName);
84
88
  }
85
89
  }
86
90
  validateArgs(args) {
@@ -88,30 +92,36 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
88
92
  if (!args.appPackagePath || typeof args.appPackagePath !== "string") {
89
93
  invalidParameters.push("appPackagePath");
90
94
  }
95
+ if (args.scope &&
96
+ !Object.values(packageService_1.AppScope)
97
+ .map((v) => v.toLowerCase())
98
+ .includes(args.scope)) {
99
+ invalidParameters.push("scope");
100
+ }
91
101
  if (invalidParameters.length > 0) {
92
- throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
102
+ throw new common_1.InvalidActionInputError(exports.actionName, invalidParameters, helpLink);
93
103
  }
94
104
  }
95
105
  validateOutputEnvVarNames(outputEnvVarNames) {
96
106
  if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) || !outputEnvVarNames.get(outputKeys.appId)) {
97
- throw new common_1.InvalidActionInputError(actionName, ["writeToEnvironmentFile"], helpLink);
107
+ throw new common_1.InvalidActionInputError(exports.actionName, ["writeToEnvironmentFile"], helpLink);
98
108
  }
99
109
  }
100
110
  };
101
111
  tslib_1.__decorate([
102
- (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
112
+ (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
103
113
  tslib_1.__metadata("design:type", Function),
104
114
  tslib_1.__metadata("design:paramtypes", [Object, Object]),
105
115
  tslib_1.__metadata("design:returntype", Promise)
106
116
  ], M365TitleAcquireDriver.prototype, "run", null);
107
117
  tslib_1.__decorate([
108
- (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
118
+ (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
109
119
  tslib_1.__metadata("design:type", Function),
110
120
  tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
111
121
  tslib_1.__metadata("design:returntype", Promise)
112
122
  ], M365TitleAcquireDriver.prototype, "execute", null);
113
123
  M365TitleAcquireDriver = tslib_1.__decorate([
114
- (0, typedi_1.Service)(actionName) // DO NOT MODIFY the service name
124
+ (0, typedi_1.Service)(exports.actionName) // DO NOT MODIFY the service name
115
125
  ], M365TitleAcquireDriver);
116
126
  exports.M365TitleAcquireDriver = M365TitleAcquireDriver;
117
127
  //# sourceMappingURL=acquire.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAc/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CAmGlF"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAc/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CAsGlF"}
@@ -13,26 +13,28 @@ const lifecycle_1 = require("../../configManager/lifecycle");
13
13
  const envUtil_1 = require("../../utils/envUtil");
14
14
  const metadataUtil_1 = require("../../utils/metadataUtil");
15
15
  const pathUtils_1 = require("../../utils/pathUtils");
16
+ const acquire_1 = require("../m365/acquire");
16
17
  const constants_1 = require("../teamsApp/constants");
17
- const shareToOthers = tslib_1.__importStar(require("./shareToOthers"));
18
18
  // Read m365agents.yaml and get the value of shared title id, and shared app id
19
19
  async function parseShareAppActionYamlConfig(projectPath) {
20
- var _a, _b, _c;
20
+ var _a, _b, _c, _d, _e;
21
21
  const templatePath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
22
22
  const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath);
23
23
  if (maybeProjectModel.isErr()) {
24
24
  return (0, teamsfx_api_1.err)(maybeProjectModel.error);
25
25
  }
26
26
  const projectModel = maybeProjectModel.value;
27
- if (!projectModel.deploy || !projectModel.deploy.driverDefs) {
27
+ if ((!projectModel.provision || !projectModel.provision.driverDefs) &&
28
+ (!projectModel.deploy || !projectModel.deploy.driverDefs)) {
28
29
  return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.yamlConfigNotFound")));
29
30
  }
30
- const shareToOthersAction = projectModel.deploy.driverDefs.find((d) => d.uses === shareToOthers.actionName);
31
- if (!shareToOthersAction) {
32
- return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", shareToOthers.actionName)));
31
+ const extendToM365Action = ((_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((d) => d.uses === acquire_1.actionName)) ||
32
+ ((_b = projectModel.deploy) === null || _b === void 0 ? void 0 : _b.driverDefs.find((d) => d.uses === acquire_1.actionName));
33
+ if (!extendToM365Action) {
34
+ return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", acquire_1.actionName)));
33
35
  }
34
36
  // 1. get manifest id
35
- const appPackagePath = (_a = shareToOthersAction.with) === null || _a === void 0 ? void 0 : _a.appPackagePath;
37
+ const appPackagePath = (_c = extendToM365Action.with) === null || _c === void 0 ? void 0 : _c.appPackagePath;
36
38
  if (!appPackagePath) {
37
39
  return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageConfigNotFound")));
38
40
  }
@@ -40,7 +42,7 @@ async function parseShareAppActionYamlConfig(projectPath) {
40
42
  if (readEnvRes.isErr()) {
41
43
  return (0, teamsfx_api_1.err)(readEnvRes.error);
42
44
  }
43
- const resolvedDriver = (0, lifecycle_1.resolve)(shareToOthersAction, [], []);
45
+ const resolvedDriver = (0, lifecycle_1.resolve)(extendToM365Action, [], []);
44
46
  const resolvedAppPackagePath = path_1.default.resolve(projectPath, resolvedDriver.with.appPackagePath);
45
47
  if (!fs_extra_1.default.existsSync(resolvedAppPackagePath)) {
46
48
  return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageNotFound", resolvedAppPackagePath)));
@@ -56,8 +58,8 @@ async function parseShareAppActionYamlConfig(projectPath) {
56
58
  return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.manifestIdNotFound")));
57
59
  }
58
60
  // 2. get shared title id and shared app id
59
- const sharedTitleIdEnvName = (_b = shareToOthersAction.writeToEnvironmentFile) === null || _b === void 0 ? void 0 : _b.titleId;
60
- const sharedAppIdEnvName = (_c = shareToOthersAction.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.appId;
61
+ const sharedTitleIdEnvName = (_d = extendToM365Action.writeToEnvironmentFile) === null || _d === void 0 ? void 0 : _d.titleId;
62
+ const sharedAppIdEnvName = (_e = extendToM365Action.writeToEnvironmentFile) === null || _e === void 0 ? void 0 : _e.appId;
61
63
  if (!sharedTitleIdEnvName || !sharedAppIdEnvName) {
62
64
  return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.sharedConfigNotFound")));
63
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ export declare class PluginManifestUtils {
15
15
  content: string;
16
16
  color: Colors;
17
17
  }>;
18
- getDefaultNextAvailableApiSpecPath(apiSpecPath: string, apiSpecFolder: string, apiSpecFileName?: string, isKiotaIntegration?: boolean): Promise<string>;
18
+ getDefaultNextAvailableApiSpecPath(apiSpecPath: string, apiSpecFolder: string, isKiotaIntegration?: boolean): Promise<string>;
19
19
  getApiSpecFileName(openApiSpecFileNamePrefix: string, openApiSpecFileType: string, apiSpecFileNameSuffix: number, isKiotaIntegration: boolean): string;
20
20
  getApiSpecFilePathFromPlugin(plugin: PluginManifestSchema, pluginPath: string): Promise<string[]>;
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsCxC,kCAAkC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,EACxB,kBAAkB,UAAQ;IAsC5B,kBAAkB,CAChB,yBAAyB,EAAE,MAAM,EACjC,mBAAmB,EAAE,MAAM,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,kBAAkB,EAAE,OAAO,GAC1B,MAAM;IAWH,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
1
+ {"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI3D,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsCxC,kCAAkC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,kBAAkB,UAAQ;IAwC5B,kBAAkB,CAChB,yBAAyB,EAAE,MAAM,EACjC,mBAAmB,EAAE,MAAM,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,kBAAkB,EAAE,OAAO,GAC1B,MAAM;IAWH,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
@@ -18,6 +18,7 @@ const constant_1 = require("../../../configManager/constant");
18
18
  const os_1 = require("os");
19
19
  const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
20
20
  const utils_2 = require("../../../../common/utils");
21
+ const featureFlags_1 = require("../../../../common/featureFlags");
21
22
  class PluginManifestUtils {
22
23
  async readPluginManifestFile(path) {
23
24
  if (!(await fs_extra_1.default.pathExists(path))) {
@@ -118,13 +119,15 @@ class PluginManifestUtils {
118
119
  return outputMessage;
119
120
  }
120
121
  }
121
- async getDefaultNextAvailableApiSpecPath(apiSpecPath, apiSpecFolder, apiSpecFileName, isKiotaIntegration = false) {
122
+ async getDefaultNextAvailableApiSpecPath(apiSpecPath, apiSpecFolder, isKiotaIntegration = false) {
122
123
  let isYaml = false;
123
124
  try {
124
125
  isYaml = !(await (0, utils_2.isJsonSpecFile)(apiSpecPath));
125
126
  }
126
127
  catch (e) { }
127
- let openApiSpecFileName = apiSpecFileName !== null && apiSpecFileName !== void 0 ? apiSpecFileName : (isYaml ? teamsfx_api_1.DefaultApiSpecYamlFileName : teamsfx_api_1.DefaultApiSpecJsonFileName);
128
+ let openApiSpecFileName = isYaml || featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaNPMIntegration)
129
+ ? teamsfx_api_1.DefaultApiSpecYamlFileName
130
+ : teamsfx_api_1.DefaultApiSpecJsonFileName;
128
131
  // Check if the default file name already exists
129
132
  if (!(await fs_extra_1.default.pathExists(path_1.default.join(apiSpecFolder, openApiSpecFileName)))) {
130
133
  return path_1.default.join(apiSpecFolder, openApiSpecFileName);
@@ -1 +1 @@
1
- {"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { Context, FxError, LogProvider, M365TokenProvider, Result } from "@microsoft/teamsfx-api";
2
- import { AadOwner, ResourcePermission, TeamsAppAdmin } from "../../common/permissionInterface";
2
+ import { AadOwner, AgentOwner, ResourcePermission, TeamsAppAdmin } from "../../common/permissionInterface";
3
3
  import { AppUser } from "../driver/teamsApp/interfaces/appdefinitions/appUser";
4
4
  export declare class AadCollaboration {
5
5
  private readonly aadAppClient;
@@ -17,4 +17,10 @@ export declare class TeamsCollaboration {
17
17
  checkPermission(ctx: Context, teamsAppId: string, userInfo: AppUser): Promise<Result<ResourcePermission[], FxError>>;
18
18
  private handleError;
19
19
  }
20
+ export declare class AgentCollaboration {
21
+ private readonly tokenProvider;
22
+ constructor(m365TokenProvider: M365TokenProvider);
23
+ grantPermission(ctx: Context, titleId: string, userInfo: AppUser): Promise<Result<ResourcePermission[], FxError>>;
24
+ listCollaborator(ctx: Context, titleId: string): Promise<Result<AgentOwner[], FxError>>;
25
+ }
20
26
  //# sourceMappingURL=collaboration.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAO/F,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAU/E,qBACa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAO9D,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAqBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAY1B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAmBjD,OAAO,CAAC,WAAW;CAiBpB;AAED,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;gBAEtC,iBAAiB,EAAE,iBAAiB;IAOnC,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAyBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAqC/B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BjD,OAAO,CAAC,WAAW;CAoBpB"}
1
+ {"version":3,"file":"collaboration.d.ts","sourceRoot":"","sources":["../../../src/component/feature/collaboration.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EACL,QAAQ,EACR,UAAU,EACV,kBAAkB,EAClB,aAAa,EACd,MAAM,kCAAkC,CAAC;AAS1C,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAW/E,qBACa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAO9D,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAqBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAY1B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAmBjD,OAAO,CAAC,WAAW;CAiBpB;AAED,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;gBAEtC,iBAAiB,EAAE,iBAAiB;IAOnC,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAyBpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAqC/B,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BjD,OAAO,CAAC,WAAW;CAoBpB;AAED,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;gBAEtC,iBAAiB,EAAE,iBAAiB;IAQnC,eAAe,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA4BpC,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;CA8B1C"}
@@ -2,15 +2,18 @@
2
2
  // Copyright (c) Microsoft Corporation.
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.TeamsCollaboration = exports.AadCollaboration = void 0;
5
+ exports.AgentCollaboration = exports.TeamsCollaboration = exports.AadCollaboration = void 0;
6
6
  const tslib_1 = require("tslib");
7
7
  const lib_1 = require("@feathersjs/hooks/lib");
8
8
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
9
9
  const axios_1 = tslib_1.__importDefault(require("axios"));
10
10
  const typedi_1 = require("typedi");
11
+ const graphClient_1 = require("../../client/graphClient");
11
12
  const teamsDevPortalClient_1 = require("../../client/teamsDevPortalClient");
12
13
  const constants_1 = require("../../common/constants");
13
14
  const globalVars_1 = require("../../common/globalVars");
15
+ const packageService_1 = require("../../component/m365/packageService");
16
+ const serviceConstant_1 = require("../../component/m365/serviceConstant");
14
17
  const common_1 = require("../../error/common");
15
18
  const teamsApp_1 = require("../../error/teamsApp");
16
19
  const aadAppClient_1 = require("../driver/aad/utility/aadAppClient");
@@ -24,6 +27,7 @@ const EventName = {
24
27
  };
25
28
  const componentNameAad = "fx-resource-aad-app-for-teams";
26
29
  const componentNameTeams = "AppStudioPlugin";
30
+ const componentNameAgent = "AgentPlugin";
27
31
  let AadCollaboration = class AadCollaboration {
28
32
  constructor(m365TokenProvider, logProvider) {
29
33
  this.aadAppClient = new aadAppClient_1.AadAppClient(m365TokenProvider, logProvider);
@@ -253,4 +257,83 @@ TeamsCollaboration = tslib_1.__decorate([
253
257
  tslib_1.__metadata("design:paramtypes", [Object])
254
258
  ], TeamsCollaboration);
255
259
  exports.TeamsCollaboration = TeamsCollaboration;
260
+ let AgentCollaboration = class AgentCollaboration {
261
+ constructor(m365TokenProvider) {
262
+ this.tokenProvider = m365TokenProvider;
263
+ }
264
+ async grantPermission(ctx, titleId, userInfo) {
265
+ const mosTokenRes = await this.tokenProvider.getAccessToken({
266
+ scopes: [serviceConstant_1.MosServiceScope],
267
+ });
268
+ if (mosTokenRes.isErr()) {
269
+ return (0, teamsfx_api_1.err)(mosTokenRes.error);
270
+ }
271
+ const mosToken = mosTokenRes.value;
272
+ // grant owner permission
273
+ const res = await packageService_1.PackageService.GetSharedInstance().addOwner(mosToken, titleId, userInfo);
274
+ if (res.isErr()) {
275
+ return (0, teamsfx_api_1.err)(res.error);
276
+ }
277
+ const result = [
278
+ {
279
+ name: packageService_1.AgentPermission.name,
280
+ roles: [packageService_1.AgentPermission.owner],
281
+ type: packageService_1.AgentPermission.type,
282
+ resourceId: titleId,
283
+ },
284
+ ];
285
+ return (0, teamsfx_api_1.ok)(result);
286
+ }
287
+ async listCollaborator(ctx, titleId) {
288
+ const mosTokenRes = await this.tokenProvider.getAccessToken({
289
+ scopes: [serviceConstant_1.MosServiceScope],
290
+ });
291
+ if (mosTokenRes.isErr()) {
292
+ return (0, teamsfx_api_1.err)(mosTokenRes.error);
293
+ }
294
+ const mosToken = mosTokenRes.value;
295
+ const res = await packageService_1.PackageService.GetSharedInstance().previewApp(mosToken, titleId);
296
+ if (res.isErr()) {
297
+ return (0, teamsfx_api_1.err)(res.error);
298
+ }
299
+ const owners = res.value.owners;
300
+ const agentOwners = [];
301
+ const graphClient = new graphClient_1.GraphClient(this.tokenProvider);
302
+ for (const owner of owners) {
303
+ const userInfo = await graphClient.getUserInfoFromId(owner.entityId);
304
+ if (userInfo) {
305
+ agentOwners.push({
306
+ userObjectId: owner.entityId,
307
+ displayName: userInfo.displayName,
308
+ userPrincipalName: userInfo.userPrincipalName,
309
+ resourceId: titleId,
310
+ });
311
+ }
312
+ }
313
+ return (0, teamsfx_api_1.ok)(agentOwners);
314
+ }
315
+ };
316
+ tslib_1.__decorate([
317
+ (0, lib_1.hooks)([
318
+ (0, globalVars_1.ErrorContextMW)({ source: "M365", component: "AgentCollaboration" }),
319
+ (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(EventName.grantPermission, componentNameAgent),
320
+ ]),
321
+ tslib_1.__metadata("design:type", Function),
322
+ tslib_1.__metadata("design:paramtypes", [Object, String, Object]),
323
+ tslib_1.__metadata("design:returntype", Promise)
324
+ ], AgentCollaboration.prototype, "grantPermission", null);
325
+ tslib_1.__decorate([
326
+ (0, lib_1.hooks)([
327
+ (0, globalVars_1.ErrorContextMW)({ source: "M365", component: "AgentCollaboration" }),
328
+ (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(EventName.listCollaborator, componentNameAgent),
329
+ ]),
330
+ tslib_1.__metadata("design:type", Function),
331
+ tslib_1.__metadata("design:paramtypes", [Object, String]),
332
+ tslib_1.__metadata("design:returntype", Promise)
333
+ ], AgentCollaboration.prototype, "listCollaborator", null);
334
+ AgentCollaboration = tslib_1.__decorate([
335
+ (0, typedi_1.Service)("agent-collaboration"),
336
+ tslib_1.__metadata("design:paramtypes", [Object])
337
+ ], AgentCollaboration);
338
+ exports.AgentCollaboration = AgentCollaboration;
256
339
  //# sourceMappingURL=collaboration.js.map