@microsoft/teamsfx-core 2.0.2-alpha.9fd4f497a.0 → 2.0.2-alpha.ae74bc360.0

package/build/core/collaborator.js

@@ -5,25 +5,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateEnvQuestion = exports.getQuestionsForListCollaborator = exports.getQuestionsForGrantPermission = exports.grantPermission = exports.checkPermission = exports.listCollaborator = exports.CollaborationUtil = exports.CollaborationConstants = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const typedi_1 = require("typedi");
+const axios_1 = tslib_1.__importDefault(require("axios"));
+const dotenv = tslib_1.__importStar(require("dotenv"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const uuid_1 = require("uuid");
+const constants_1 = require("../common/constants");
+const localizeUtils_1 = require("../common/localizeUtils");
 const permissionInterface_1 = require("../common/permissionInterface");
 const tools_1 = require("../common/tools");
-const constants_1 = require("../component/constants");
+const constants_2 = require("../component/constants");
+const question_1 = require("../component/question");
+const common_1 = require("../error/common");
 const error_1 = require("./error");
 const globalVars_1 = require("./globalVars");
-const question_1 = require("../component/question");
-const localizeUtils_1 = require("../common/localizeUtils");
-const constants_2 = require("../common/constants");
-const constants_3 = require("../component/constants");
-const projectSettingsHelperV3_1 = require("../common/projectSettingsHelperV3");
-require("../component/resource/appManifest/appManifest");
-const axios_1 = tslib_1.__importDefault(require("axios"));
-require("../component/resource/aadApp/aadApp");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const dotenv = tslib_1.__importStar(require("dotenv"));
-const uuid_1 = require("uuid");
 const question_2 = require("./question");
-const common_1 = require("../error/common");
+const collaboration_1 = require("../component/feature/collaboration");
+const question_3 = require("../question");
 class CollaborationConstants {
 }
 exports.CollaborationConstants = CollaborationConstants;
@@ -44,7 +41,7 @@ class CollaborationUtil {
     static async getCurrentUserInfo(m365TokenProvider) {
         const user = await CollaborationUtil.getUserInfo(m365TokenProvider);
         if (!user) {
-            return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_1.SolutionSource, constants_1.SolutionError.FailedToRetrieveUserInfo, "Failed to retrieve current user info from graph token."));
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionSource, constants_2.SolutionError.FailedToRetrieveUserInfo, "Failed to retrieve current user info from graph token."));
         }
         return teamsfx_api_1.ok(user);
     }
@@ -104,7 +101,7 @@ class CollaborationUtil {
             return teamsfx_api_1.ok(result);
         }
         catch (error) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, constants_1.SolutionError.FailedToLoadDotEnvFile, localizeUtils_1.getLocalizedString("core.collaboration.error.failedToLoadDotEnvFile", error === null || error === void 0 ? void 0 : error.message)));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadDotEnvFile, localizeUtils_1.getLocalizedString("core.collaboration.error.failedToLoadDotEnvFile", error === null || error === void 0 ? void 0 : error.message)));
         }
     }
     // Priority parameter > dotenv > env
@@ -142,12 +139,12 @@ class CollaborationUtil {
             }
         }
         // 3. load from env
-        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[question_2.CoreQuestionNames.TeamsAppManifestFilePath];
-        const aadAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[question_2.CoreQuestionNames.AadAppManifestFilePath];
+        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[question_3.QuestionNames.TeamsAppManifestFilePath];
+        const aadAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[question_3.QuestionNames.AadAppManifestFilePath];
         if (teamsAppManifestFilePath && !teamsAppId) {
             const teamsAppIdRes = await this.loadManifestId(teamsAppManifestFilePath);
             if (teamsAppIdRes.isOk()) {
-                teamsAppId = await this.parseManifestId(teamsAppIdRes.value, inputs);
+                teamsAppId = await this.parseManifestId(teamsAppIdRes.value);
             }
             else {
                 return teamsfx_api_1.err(teamsAppIdRes.error);
@@ -156,7 +153,7 @@ class CollaborationUtil {
         if (aadAppManifestFilePath && !aadObjectId) {
             const aadObjectIdRes = await this.loadManifestId(aadAppManifestFilePath);
             if (aadObjectIdRes.isOk()) {
-                aadObjectId = await this.parseManifestId(aadObjectIdRes.value, inputs);
+                aadObjectId = await this.parseManifestId(aadObjectIdRes.value);
             }
             else {
                 return teamsfx_api_1.err(aadObjectIdRes.error);
@@ -170,23 +167,23 @@ class CollaborationUtil {
     static async loadManifestId(manifestFilePath) {
         try {
             if (!manifestFilePath || !(await fs_extra_1.default.pathExists(manifestFilePath))) {
-                return teamsfx_api_1.err(new common_1.FileNotFoundError(constants_1.SolutionSource, manifestFilePath));
+                return teamsfx_api_1.err(new common_1.FileNotFoundError(constants_2.SolutionSource, manifestFilePath));
             }
             const manifest = await fs_extra_1.default.readJson(manifestFilePath);
             if (!manifest || !manifest.id) {
-                return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, constants_1.SolutionError.InvalidManifestError, localizeUtils_1.getLocalizedString("error.collaboration.InvalidManifestError", manifestFilePath)));
+                return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.InvalidManifestError, localizeUtils_1.getLocalizedString("error.collaboration.InvalidManifestError", manifestFilePath)));
             }
             const id = manifest.id;
             return teamsfx_api_1.ok(id);
         }
         catch (error) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, constants_1.SolutionError.FailedToLoadManifestFile, localizeUtils_1.getLocalizedString("error.collaboration.FailedToLoadManifest", manifestFilePath)));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.FailedToLoadManifestFile, localizeUtils_1.getLocalizedString("error.collaboration.FailedToLoadManifest", manifestFilePath)));
         }
     }
     static requireEnvQuestion(appId) {
         return !!appId.match(CollaborationConstants.placeholderRegex);
     }
-    static async parseManifestId(appId, inputs) {
+    static async parseManifestId(appId) {
         var _a;
         // Hardcoded id in manifest
         if (uuid_1.validate(appId)) {
@@ -204,57 +201,37 @@ class CollaborationUtil {
     }
 }
 exports.CollaborationUtil = CollaborationUtil;
-async function listCollaborator(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
-    var _a, _b, _c, _d, _e;
+async function listCollaborator(ctx, inputs, tokenProvider, telemetryProps) {
+    var _a, _b, _c, _d;
     const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
     if (result.isErr()) {
         return teamsfx_api_1.err(result.error);
     }
     const user = result.value;
-    if (!tools_1.isV3Enabled()) {
-        const stateResult = getCurrentCollaborationState(envInfo, user);
-        if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-            if (inputs.platform === teamsfx_api_1.Platform.CLI && stateResult.message) {
-                ctx.userInteraction.showMessage("warn", stateResult.message, false);
-            }
-            else if (inputs.platform === teamsfx_api_1.Platform.VSCode && stateResult.message) {
-                ctx.logProvider.warning(stateResult.message);
-            }
-            return teamsfx_api_1.ok({
-                state: stateResult.state,
-                message: stateResult.message,
-            });
-        }
-    }
-    let appIds;
-    if (tools_1.isV3Enabled()) {
-        const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
-        if (getAppIdsResult.isErr()) {
-            return teamsfx_api_1.err(getAppIdsResult.error);
-        }
-        appIds = getAppIdsResult.value;
+    const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
+    if (getAppIdsResult.isErr()) {
+        return teamsfx_api_1.err(getAppIdsResult.error);
     }
-    const hasAad = tools_1.isV3Enabled() ? appIds.aadObjectId != undefined : projectSettingsHelperV3_1.hasAAD(ctx.projectSetting);
-    const hasTeams = tools_1.isV3Enabled() ? appIds.teamsAppId != undefined : true;
-    const appStudio = typedi_1.Container.get(constants_3.ComponentNames.AppManifest);
-    const aadPlugin = typedi_1.Container.get(constants_3.ComponentNames.AadApp);
+    const appIds = getAppIdsResult.value;
+    const hasAad = appIds.aadObjectId != undefined;
+    const hasTeams = appIds.teamsAppId != undefined;
+    const teamsCollaboration = new collaboration_1.TeamsCollaboration(ctx, tokenProvider.m365TokenProvider);
+    const aadCollaboration = new collaboration_1.AadCollaboration(tokenProvider.m365TokenProvider);
     const appStudioRes = hasTeams
-        ? await appStudio.listCollaborator(ctx, inputs, envInfo, tokenProvider.m365TokenProvider, tools_1.isV3Enabled() ? appIds.teamsAppId : undefined)
+        ? await teamsCollaboration.listCollaborator(ctx, appIds.teamsAppId)
         : teamsfx_api_1.ok([]);
     if (appStudioRes.isErr())
         return teamsfx_api_1.err(appStudioRes.error);
     const teamsAppOwners = appStudioRes.value;
     const aadRes = hasAad
-        ? await aadPlugin.listCollaborator(ctx, tools_1.isV3Enabled() ? appIds.aadObjectId : undefined)
+        ? await aadCollaboration.listCollaborator(ctx, appIds.aadObjectId)
         : teamsfx_api_1.ok([]);
     if (aadRes.isErr())
         return teamsfx_api_1.err(aadRes.error);
     const aadOwners = aadRes.value;
     const teamsAppId = (_b = (_a = teamsAppOwners[0]) === null || _a === void 0 ? void 0 : _a.resourceId) !== null && _b !== void 0 ? _b : "";
     const aadAppId = (_d = (_c = aadOwners[0]) === null || _c === void 0 ? void 0 : _c.resourceId) !== null && _d !== void 0 ? _d : "";
-    const aadAppTenantId = tools_1.isV3Enabled()
-        ? user.tenantId
-        : (_e = envInfo.state[constants_3.ComponentNames.AppManifest]) === null || _e === void 0 ? void 0 : _e.tenantId;
+    const aadAppTenantId = user.tenantId;
     if (inputs.platform === teamsfx_api_1.Platform.CLI || inputs.platform === teamsfx_api_1.Platform.VSCode) {
         const message = [
             {
@@ -270,7 +247,7 @@ async function listCollaborator(ctx, inputs, envInfo, tokenProvider, telemetryPr
             { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
         ];
         if (hasTeams) {
-            message.push(...getPrintEnvMessage(tools_1.isV3Enabled() ? inputs.env : envInfo.envName, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllTeamsAppOwners")), {
+            message.push(...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllTeamsAppOwners")), {
                 content: localizeUtils_1.getLocalizedString("core.collaboration.M365TeamsAppId"),
                 color: teamsfx_api_1.Colors.BRIGHT_WHITE,
             }, { content: teamsAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
@@ -282,7 +259,7 @@ async function listCollaborator(ctx, inputs, envInfo, tokenProvider, telemetryPr
             }
         }
         if (hasAad) {
-            message.push(...getPrintEnvMessage(tools_1.isV3Enabled() ? inputs.env : envInfo.envName, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllAadAppOwners")), {
+            message.push(...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingListAllAadAppOwners")), {
                 content: localizeUtils_1.getLocalizedString("core.collaboration.SsoAadAppId"),
                 color: teamsfx_api_1.Colors.BRIGHT_WHITE,
             }, { content: aadAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
@@ -297,108 +274,62 @@ async function listCollaborator(ctx, inputs, envInfo, tokenProvider, telemetryPr
             ctx.userInteraction.showMessage("info", message, false);
         }
         else if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-            ctx.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.ListCollaboratorsSuccess", constants_2.VSCodeExtensionCommand.showOutputChannel), false);
+            ctx.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.ListCollaboratorsSuccess", constants_1.VSCodeExtensionCommand.showOutputChannel), false);
             ctx.logProvider.info(message);
         }
     }
     const aadOwnerCount = hasAad ? aadOwners.length : -1;
     const teamsOwnerCount = hasTeams ? teamsAppOwners.length : -1;
     if (telemetryProps) {
-        telemetryProps[constants_1.SolutionTelemetryProperty.Env] = tools_1.isV3Enabled()
-            ? inputs.env
-                ? tools_1.getHashedEnv(inputs.env)
-                : undefined
-            : tools_1.getHashedEnv(envInfo.envName);
-        telemetryProps[constants_1.SolutionTelemetryProperty.CollaboratorCount] = teamsOwnerCount.toString();
-        telemetryProps[constants_1.SolutionTelemetryProperty.AadOwnerCount] = aadOwnerCount.toString();
+        telemetryProps[constants_2.SolutionTelemetryProperty.Env] = inputs.env || "";
+        telemetryProps[constants_2.SolutionTelemetryProperty.CollaboratorCount] = teamsOwnerCount.toString();
+        telemetryProps[constants_2.SolutionTelemetryProperty.AadOwnerCount] = aadOwnerCount.toString();
     }
     return teamsfx_api_1.ok({
         state: permissionInterface_1.CollaborationState.OK,
     });
 }
 exports.listCollaborator = listCollaborator;
-function getCurrentCollaborationState(envInfo, user) {
+async function checkPermission(ctx, inputs, tokenProvider, telemetryProps) {
     var _a;
-    const provisioned = envInfo.state.solution[constants_1.SOLUTION_PROVISION_SUCCEEDED] === "true" ||
-        envInfo.state.solution[constants_1.SOLUTION_PROVISION_SUCCEEDED] === true;
-    if (!provisioned) {
-        const warningMsg = localizeUtils_1.getLocalizedString("core.collaboration.notProvisioned");
-        return {
-            state: permissionInterface_1.CollaborationState.NotProvisioned,
-            message: warningMsg,
-        };
-    }
-    const aadAppTenantId = (_a = envInfo.state[constants_3.ComponentNames.AppManifest]) === null || _a === void 0 ? void 0 : _a.tenantId;
-    if (!aadAppTenantId || user.tenantId != aadAppTenantId) {
-        const warningMsg = localizeUtils_1.getLocalizedString("core.collaboration.tenantNotMatch");
-        return {
-            state: permissionInterface_1.CollaborationState.M365TenantNotMatch,
-            message: warningMsg,
-        };
-    }
-    return {
-        state: permissionInterface_1.CollaborationState.OK,
-    };
-}
-async function checkPermission(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
-    var _a, _b;
     const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
     if (result.isErr()) {
         return teamsfx_api_1.err(result.error);
     }
-    if (!tools_1.isV3Enabled()) {
-        const stateResult = getCurrentCollaborationState(envInfo, result.value);
-        if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-            if (inputs.platform === teamsfx_api_1.Platform.CLI && stateResult.message) {
-                ctx.userInteraction.showMessage("warn", stateResult.message, false);
-            }
-            return teamsfx_api_1.ok({
-                state: stateResult.state,
-                message: stateResult.message,
-            });
-        }
-    }
     const userInfo = result.value;
     if (inputs.platform === teamsfx_api_1.Platform.CLI) {
         // TODO: get tenant id from .env
-        const aadAppTenantId = tools_1.isV3Enabled()
-            ? userInfo.tenantId
-            : (_a = envInfo.state[constants_3.ComponentNames.AppManifest]) === null || _a === void 0 ? void 0 : _a.tenantId;
+        const aadAppTenantId = userInfo.tenantId;
         const message = [
             {
                 content: localizeUtils_1.getLocalizedString("core.collaboration.AccountUsedToCheck"),
                 color: teamsfx_api_1.Colors.BRIGHT_WHITE,
             },
             { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-            ...getPrintEnvMessage(tools_1.isV3Enabled() ? inputs.env : envInfo.envName, localizeUtils_1.getLocalizedString("core.collaboration.StaringCheckPermission")),
+            ...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StaringCheckPermission")),
             { content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
             { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
         ];
         ctx.userInteraction.showMessage("info", message, false);
     }
-    let appIds;
-    if (tools_1.isV3Enabled()) {
-        const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
-        if (getAppIdsResult.isErr()) {
-            return teamsfx_api_1.err(getAppIdsResult.error);
-        }
-        appIds = getAppIdsResult.value;
+    const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
+    if (getAppIdsResult.isErr()) {
+        return teamsfx_api_1.err(getAppIdsResult.error);
     }
-    const appStudio = typedi_1.Container.get(constants_3.ComponentNames.AppManifest);
-    const aadPlugin = typedi_1.Container.get(constants_3.ComponentNames.AadApp);
-    const isTeamsActivated = tools_1.isV3Enabled() ? appIds.teamsAppId != undefined : true;
+    const appIds = getAppIdsResult.value;
+    const teamsCollaboration = new collaboration_1.TeamsCollaboration(ctx, tokenProvider.m365TokenProvider);
+    const aadCollaboration = new collaboration_1.AadCollaboration(tokenProvider.m365TokenProvider);
+    const isTeamsActivated = appIds.teamsAppId != undefined;
     const appStudioRes = isTeamsActivated
-        ? await appStudio.checkPermission(ctx, inputs, envInfo, tokenProvider.m365TokenProvider, userInfo, tools_1.isV3Enabled() ? appIds.teamsAppId : undefined)
+        ? await teamsCollaboration.checkPermission(ctx, appIds.teamsAppId, userInfo)
         : teamsfx_api_1.ok([]);
     if (appStudioRes.isErr()) {
         return teamsfx_api_1.err(appStudioRes.error);
     }
     const permissions = appStudioRes.value;
-    const isAadActivated = tools_1.isV3Enabled()
-        ? appIds.aadObjectId != undefined
-        : projectSettingsHelperV3_1.hasAAD(ctx.projectSetting);
+    const isAadActivated = appIds.aadObjectId != undefined;
     if (isAadActivated) {
-        const aadRes = await aadPlugin.checkPermission(ctx, result.value, tools_1.isV3Enabled() ? appIds.aadObjectId : undefined);
+        const aadRes = await aadCollaboration.checkPermission(ctx, appIds.aadObjectId, result.value.aadId);
         if (aadRes.isErr())
             return teamsfx_api_1.err(aadRes.error);
         aadRes.value.forEach((r) => {
@@ -413,7 +344,7 @@ async function checkPermission(ctx, inputs, envInfo, tokenProvider, telemetryPro
                     color: teamsfx_api_1.Colors.BRIGHT_WHITE,
                 },
                 {
-                    content: (_b = permission.resourceId) !== null && _b !== void 0 ? _b : localizeUtils_1.getLocalizedString("core.collaboration.Undefined"),
+                    content: (_a = permission.resourceId) !== null && _a !== void 0 ? _a : localizeUtils_1.getLocalizedString("core.collaboration.Undefined"),
                     color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
                 },
                 {
@@ -438,10 +369,10 @@ async function checkPermission(ctx, inputs, envInfo, tokenProvider, telemetryPro
     const aadPermission = permissions.find((permission) => permission.name === "Azure AD App");
     const teamsAppPermission = permissions.find((permission) => permission.name === "Teams App");
     if (telemetryProps) {
-        telemetryProps[constants_1.SolutionTelemetryProperty.AadPermission] = (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
+        telemetryProps[constants_2.SolutionTelemetryProperty.AadPermission] = (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
             ? aadPermission.roles.join(";")
             : localizeUtils_1.getLocalizedString("core.collaboration.Undefined");
-        telemetryProps[constants_1.SolutionTelemetryProperty.TeamsAppPermission] = (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
+        telemetryProps[constants_2.SolutionTelemetryProperty.TeamsAppPermission] = (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
             ? teamsAppPermission.roles.join(";")
             : localizeUtils_1.getLocalizedString("core.collaboration.Undefined");
     }
@@ -451,79 +382,57 @@ async function checkPermission(ctx, inputs, envInfo, tokenProvider, telemetryPro
     });
 }
 exports.checkPermission = checkPermission;
-async function grantPermission(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
-    var _a, _b;
+async function grantPermission(ctx, inputs, tokenProvider) {
+    var _a;
     const progressBar = ctx.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.collaboration.GrantingPermission"), 1);
     try {
         const result = await CollaborationUtil.getCurrentUserInfo(tokenProvider.m365TokenProvider);
         if (result.isErr()) {
             return teamsfx_api_1.err(result.error);
         }
-        if (!tools_1.isV3Enabled()) {
-            const stateResult = getCurrentCollaborationState(envInfo, result.value);
-            if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-                if (inputs.platform === teamsfx_api_1.Platform.CLI && stateResult.message) {
-                    ctx.userInteraction.showMessage("warn", stateResult.message, false);
-                }
-                else if (inputs.platform === teamsfx_api_1.Platform.VSCode && stateResult.message) {
-                    ctx.logProvider.warning(stateResult.message);
-                }
-                return teamsfx_api_1.ok({
-                    state: stateResult.state,
-                    message: stateResult.message,
-                });
-            }
-        }
         const email = inputs.email;
         if (!email || email === result.value.userPrincipalName) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(error_1.CoreSource, constants_1.SolutionError.EmailCannotBeEmptyOrSame, localizeUtils_1.getDefaultString("core.collaboration.EmailCannotBeEmptyOrSame"), localizeUtils_1.getLocalizedString("core.collaboration.EmailCannotBeEmptyOrSame")));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(error_1.CoreSource, constants_2.SolutionError.EmailCannotBeEmptyOrSame, localizeUtils_1.getDefaultString("core.collaboration.EmailCannotBeEmptyOrSame"), localizeUtils_1.getLocalizedString("core.collaboration.EmailCannotBeEmptyOrSame")));
         }
         const userInfo = await CollaborationUtil.getUserInfo(tokenProvider.m365TokenProvider, email);
         if (!userInfo) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError(error_1.CoreSource, constants_1.SolutionError.CannotFindUserInCurrentTenant, localizeUtils_1.getDefaultString("core.collaboration.CannotFindUserInCurrentTenant"), localizeUtils_1.getLocalizedString("core.collaboration.CannotFindUserInCurrentTenant")));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(error_1.CoreSource, constants_2.SolutionError.CannotFindUserInCurrentTenant, localizeUtils_1.getDefaultString("core.collaboration.CannotFindUserInCurrentTenant"), localizeUtils_1.getLocalizedString("core.collaboration.CannotFindUserInCurrentTenant")));
         }
         await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.start());
         await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(localizeUtils_1.getLocalizedString("core.collaboration.GrantPermissionForUser", email)));
-        let appIds;
-        if (tools_1.isV3Enabled()) {
-            const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
-            if (getAppIdsResult.isErr()) {
-                return teamsfx_api_1.err(getAppIdsResult.error);
-            }
-            appIds = getAppIdsResult.value;
+        const getAppIdsResult = await CollaborationUtil.getTeamsAppIdAndAadObjectId(inputs);
+        if (getAppIdsResult.isErr()) {
+            return teamsfx_api_1.err(getAppIdsResult.error);
         }
+        const appIds = getAppIdsResult.value;
         if (inputs.platform === teamsfx_api_1.Platform.CLI) {
             // TODO: get tenant id from .env
-            const aadAppTenantId = tools_1.isV3Enabled()
-                ? result.value.tenantId
-                : (_a = envInfo.state[constants_3.ComponentNames.AppManifest]) === null || _a === void 0 ? void 0 : _a.tenantId;
+            const aadAppTenantId = result.value.tenantId;
             const message = [
                 {
                     content: localizeUtils_1.getLocalizedString("core.collaboration.AccountToGrantPermission"),
                     color: teamsfx_api_1.Colors.BRIGHT_WHITE,
                 },
                 { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-                ...getPrintEnvMessage(tools_1.isV3Enabled() ? inputs.env : envInfo.envName, localizeUtils_1.getLocalizedString("core.collaboration.StartingGrantPermission")),
+                ...getPrintEnvMessage(inputs.env, localizeUtils_1.getLocalizedString("core.collaboration.StartingGrantPermission")),
                 { content: localizeUtils_1.getLocalizedString("core.collaboration.TenantId"), color: teamsfx_api_1.Colors.BRIGHT_WHITE },
                 { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
             ];
             ctx.userInteraction.showMessage("info", message, false);
         }
-        const isAadActivated = tools_1.isV3Enabled()
-            ? appIds.aadObjectId != undefined
-            : projectSettingsHelperV3_1.hasAAD(ctx.projectSetting);
-        const isTeamsActivated = tools_1.isV3Enabled() ? appIds.teamsAppId != undefined : true;
-        const appStudio = typedi_1.Container.get(constants_3.ComponentNames.AppManifest);
-        const aadPlugin = typedi_1.Container.get(constants_3.ComponentNames.AadApp);
+        const isAadActivated = appIds.aadObjectId != undefined;
+        const isTeamsActivated = appIds.teamsAppId != undefined;
+        const teamsCollaboration = new collaboration_1.TeamsCollaboration(ctx, tokenProvider.m365TokenProvider);
+        const aadCollaboration = new collaboration_1.AadCollaboration(tokenProvider.m365TokenProvider);
         const appStudioRes = isTeamsActivated
-            ? await appStudio.grantPermission(ctx, inputs, envInfo, tokenProvider.m365TokenProvider, userInfo, tools_1.isV3Enabled() ? appIds.teamsAppId : undefined)
+            ? await teamsCollaboration.grantPermission(ctx, appIds.teamsAppId, userInfo)
             : teamsfx_api_1.ok([]);
         if (appStudioRes.isErr()) {
             return teamsfx_api_1.err(appStudioRes.error);
         }
         const permissions = appStudioRes.value;
         if (isAadActivated) {
-            const aadRes = await aadPlugin.grantPermission(ctx, userInfo, tools_1.isV3Enabled() ? appIds.aadObjectId : undefined);
+            const aadRes = await aadCollaboration.grantPermission(ctx, appIds.aadObjectId, userInfo.aadId);
             if (aadRes.isErr())
                 return teamsfx_api_1.err(aadRes.error);
             aadRes.value.forEach((r) => {
@@ -533,7 +442,7 @@ async function grantPermission(ctx, inputs, envInfo, tokenProvider, telemetryPro
         if (inputs.platform === teamsfx_api_1.Platform.CLI) {
             for (const permission of permissions) {
                 const message = [
-                    { content: `${(_b = permission.roles) === null || _b === void 0 ? void 0 : _b.join(",")} `, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    { content: `${(_a = permission.roles) === null || _a === void 0 ? void 0 : _a.join(",")} `, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
                     {
                         content: localizeUtils_1.getLocalizedString("core.collaboration.PermissionHasBeenGrantTo"),
                         color: teamsfx_api_1.Colors.BRIGHT_WHITE,
@@ -547,15 +456,6 @@ async function grantPermission(ctx, inputs, envInfo, tokenProvider, telemetryPro
                 ];
                 ctx.userInteraction.showMessage("info", message, false);
             }
-            // Will not show helplink for v3
-            if (!tools_1.isV3Enabled() && projectSettingsHelperV3_1.hasSPFxTab(ctx.projectSetting)) {
-                ctx.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.SharePointTip") +
-                    constants_1.SharePointManageSiteAdminHelpLink, false);
-            }
-            // Will not show helplink for v3
-            if (!tools_1.isV3Enabled() && projectSettingsHelperV3_1.hasAzureResourceV3(ctx.projectSetting)) {
-                ctx.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("core.collaboration.AzureTip") + constants_1.AzureRoleAssignmentsHelpLink, false);
-            }
         }
         return teamsfx_api_1.ok({
             state: permissionInterface_1.CollaborationState.OK,
@@ -640,25 +540,23 @@ async function getCollaborationQuestionNode(inputs) {
         return root;
     }
     envNode.data.name = "env";
-    envNode.condition = {
-        validFunc: validateEnvQuestion,
-    };
+    envNode.condition = validateEnvQuestion;
     teamsAppSelectNode.addChild(envNode);
     aadAppSelectNode.addChild(envNode);
     return root;
 }
-async function validateEnvQuestion(input, inputs) {
+async function validateEnvQuestion(inputs) {
     if ((inputs === null || inputs === void 0 ? void 0 : inputs.env) || (inputs === null || inputs === void 0 ? void 0 : inputs.targetEnvName)) {
-        return "Env already selected";
+        return false;
     }
     const appType = inputs === null || inputs === void 0 ? void 0 : inputs[CollaborationConstants.AppType];
     const requireAad = appType.includes(CollaborationConstants.AadAppQuestionId);
     const requireTeams = appType.includes(CollaborationConstants.TeamsAppQuestionId);
-    const aadManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[question_2.CoreQuestionNames.AadAppManifestFilePath];
-    const teamsManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[question_2.CoreQuestionNames.TeamsAppManifestFilePath];
+    const aadManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[question_3.QuestionNames.AadAppManifestFilePath];
+    const teamsManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[question_3.QuestionNames.TeamsAppManifestFilePath];
     // When both is selected, only show the question once at the end
     if ((requireAad && !aadManifestPath) || (requireTeams && !teamsManifestPath)) {
-        return "Question not finished";
+        return false;
     }
     // Only show env question when manifest id is referencing value from .env file
     let requireEnv = false;
@@ -667,11 +565,11 @@ async function validateEnvQuestion(input, inputs) {
         if (teamsAppIdRes.isOk()) {
             requireEnv = CollaborationUtil.requireEnvQuestion(teamsAppIdRes.value);
             if (requireEnv) {
-                return undefined;
+                return true;
             }
         }
         else {
-            return "Invalid manifest";
+            return false;
         }
     }
     if (requireAad && aadManifestPath) {
@@ -679,14 +577,14 @@ async function validateEnvQuestion(input, inputs) {
         if (aadAppIdRes.isOk()) {
             requireEnv = CollaborationUtil.requireEnvQuestion(aadAppIdRes.value);
             if (requireEnv) {
-                return undefined;
+                return true;
             }
         }
         else {
-            return "Invalid manifest";
+            return false;
         }
     }
-    return "Env question not required";
+    return false;
 }
 exports.validateEnvQuestion = validateEnvQuestion;
 //# sourceMappingURL=collaborator.js.map