@crowdin/app-project-module 0.91.0 → 0.92.0

package/out/modules/integration/handlers/invite-users.js

@@ -10,270 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../../../util");
-const types_1 = require("../../../types");
 const storage_1 = require("../../../storage");
-const users_1 = require("./users");
-const CONSTANTS = {
-    MAX_EMAIL_LENGTH: 76,
-    MANAGER_ROLES: ['owner', 'manager'],
-    PROJECT_INTEGRATIONS_MODULE_TYPE: 'project-integrations',
-};
 function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        const onlyCheck = req.body.onlyCheck;
-        const usersToInvite = req.body.users;
-        if (!Array.isArray(usersToInvite)) {
-            return res.status(400).send('Invalid request');
-        }
-        const client = req.crowdinApiClient;
-        const projectId = req.crowdinContext.jwtPayload.context.project_id;
-        const userId = req.crowdinContext.jwtPayload.context.user_id;
-        const { projectMembers, organizationMembers } = yield (0, users_1.getUsers)({ client, projectId });
-        const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(req.crowdinContext.clientId);
-        let applicationInstallation = null;
-        try {
-            applicationInstallation = yield client.applicationsApi.getApplicationInstallation(req.crowdinContext.appIdentifier);
-        }
-        catch (error) {
-            if (error.code !== 403) {
-                console.error('Failed to get application installation', error);
-            }
-        }
-        const isAdmin = organizationMembers.some((member) => member.id === +userId && member.isAdmin) ||
-            projectMembers.some((member) => member.id === +userId && 'role' in member && member.role === 'owner');
-        const hasManagerAccess = isAdmin ||
-            projectMembers.some((member) => member.id === +userId &&
-                ('role' in member ? CONSTANTS.MANAGER_ROLES.includes(member.role) : member.isManager));
-        if (!hasManagerAccess) {
-            return res.status(403).send({ error: 'Access denied' });
-        }
-        const inviteRestricted = !isAdmin &&
-            'invite_restrict_enabled' in req.crowdinContext.jwtPayload.context &&
-            !!req.crowdinContext.jwtPayload.context.invite_restrict_enabled;
-        const usersWhoWillBeInvitedToOrganization = filterOrganizationUsers(usersToInvite);
-        const usersWhoWillBeInvitedToProject = filterProjectUsers({
-            inviteRestricted,
-            usersToInvite,
-            projectMembers,
-            organizationMembers,
-        });
-        const usersWhoNotIssetInApplicationInstallation = filterNotIssetApplicationUsers({
-            inviteRestricted,
-            usersToInvite,
-            applicationInstallation,
-            projectMembers,
-            organizationMembers,
-        });
-        const usersWhoNotIssetInIntegration = filterNotIssetIntegrationUsers({
-            inviteRestricted,
-            usersToInvite,
-            integrationCredentials,
-            projectMembers,
-            organizationMembers,
-        });
-        if (onlyCheck) {
+        const clientId = req.crowdinContext.clientId;
+        const users = req.body.users;
+        if (!users) {
             return res.send({
-                data: {
-                    isAdmin,
-                    inviteRestricted,
-                    editApplicationAvailable: applicationInstallation !== null,
-                    usersWhoWillBeInvitedToOrganization,
-                    usersWhoWillBeInvitedToProject,
-                    usersWhoNotIssetInApplicationInstallation,
-                    usersWhoNotIssetInIntegration,
-                },
+                success: false,
+                message: 'No users provided',
             });
         }
-        const response = yield inviteUsers({
-            req,
-            projectId,
-            isAdmin,
-            inviteRestricted,
-            usersToInvite,
-            applicationInstallation,
-            usersWhoWillBeInvitedToOrganization,
-            usersWhoWillBeInvitedToProject,
-            usersWhoNotIssetInApplicationInstallation,
+        yield (0, storage_1.getStorage)().updateIntegrationManagers(clientId, JSON.stringify(users.map((user) => `${user.id}`)));
+        return res.send({
+            success: true,
         });
-        return res.send(response);
     }));
 }
 exports.default = handle;
-function filterOrganizationUsers(usersToInvite) {
-    return usersToInvite.filter((identifier) => (0, util_1.validateEmail)(identifier)).map((name) => ({ name: `${name}` }));
-}
-function filterProjectUsers({ inviteRestricted, usersToInvite, projectMembers, organizationMembers, }) {
-    return usersToInvite
-        .map((identifier) => {
-        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
-            return { name: `${identifier}` };
-        }
-        const user = projectMembers.find((member) => member.id === +identifier);
-        if (!user) {
-            const organizationUser = organizationMembers.find((member) => member.id === +identifier);
-            return organizationUser && !organizationUser.isAdmin
-                ? { id: organizationUser.id, name: (0, users_1.getUserFullName)(organizationUser) }
-                : null;
-        }
-        return ('role' in user ? !CONSTANTS.MANAGER_ROLES.includes(user.role) : !user.isManager)
-            ? { id: user.id, name: (0, users_1.getUserFullName)(user) }
-            : null;
-    })
-        .filter(Boolean);
-}
-function filterNotIssetApplicationUsers({ inviteRestricted, usersToInvite, applicationInstallation, projectMembers, organizationMembers, }) {
-    let userIdentifiers = [];
-    if (!applicationInstallation) {
-        return [];
-    }
-    const projectIntegrationModules = applicationInstallation.data.modules.filter((module) => module.type === CONSTANTS.PROJECT_INTEGRATIONS_MODULE_TYPE);
-    if (!projectIntegrationModules.length) {
-        return [];
-    }
-    if (projectIntegrationModules.some((module) => module.permissions.user.value === types_1.UserPermissions.ALL_MEMBERS)) {
-        return [];
-    }
-    else {
-        userIdentifiers = usersToInvite.filter((userId) => projectIntegrationModules.every((module) => !module.permissions.user.ids.includes(+userId)));
-    }
-    return userIdentifiers
-        .map((identifier) => {
-        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
-            return { name: `${identifier}` };
-        }
-        let user;
-        user = projectMembers.find((member) => member.id === +identifier);
-        if (!user) {
-            user = organizationMembers.find((member) => member.id === +identifier);
-        }
-        return user ? { id: user.id, name: (0, users_1.getUserFullName)(user) } : null;
-    })
-        .filter(Boolean);
-}
-function filterNotIssetIntegrationUsers({ inviteRestricted, usersToInvite, integrationCredentials, projectMembers, organizationMembers, }) {
-    let integrationManagers = [];
-    if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.managers) {
-        integrationManagers = JSON.parse(integrationCredentials.managers);
-    }
-    return usersToInvite
-        .map((identifier) => {
-        if (integrationManagers.includes(`${identifier}`)) {
-            return null;
-        }
-        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
-            return { name: `${identifier}` };
-        }
-        let user;
-        user = projectMembers.find((member) => member.id === +identifier);
-        if (!user) {
-            user = organizationMembers.find((member) => member.id === +identifier);
-        }
-        return user ? { id: user.id, name: (0, users_1.getUserFullName)(user) } : null;
-    })
-        .filter(Boolean);
-}
-function inviteUsers({ req, projectId, isAdmin, inviteRestricted, usersToInvite, applicationInstallation, usersWhoWillBeInvitedToOrganization, usersWhoWillBeInvitedToProject, usersWhoNotIssetInApplicationInstallation, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = req.crowdinApiClient;
-        if (inviteRestricted) {
-            usersWhoWillBeInvitedToOrganization = [];
-        }
-        const alreadyAddedUserIds = yield inviteUsersToProject({
-            client,
-            projectId,
-            usersWhoWillBeInvitedToOrganization,
-            usersWhoWillBeInvitedToProject,
-        });
-        if (isAdmin) {
-            yield addUsersToApplicationInstallation({
-                client,
-                ownerId: req.integrationCredentials.ownerId,
-                applicationInstallation,
-                alreadyAddedUserIds,
-                usersWhoNotIssetInApplicationInstallation,
-            });
-        }
-        yield addUsersToIntegration({
-            clientId: req.crowdinContext.clientId,
-            alreadyAddedUserIds,
-            usersToInvite,
-        });
-        return { success: true };
-    });
-}
-function inviteUsersToProject({ client, projectId, usersWhoWillBeInvitedToOrganization, usersWhoWillBeInvitedToProject, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let addedIds = [];
-        const emailInvites = usersWhoWillBeInvitedToOrganization.map((user) => user.name);
-        const userIdInvites = usersWhoWillBeInvitedToProject.map((user) => user.id).filter(Boolean);
-        try {
-            if (emailInvites.length) {
-                const inviteResponse = (yield client.usersApi.addProjectMember(projectId, {
-                    managerAccess: true,
-                    emails: emailInvites,
-                })); // TODO: fix typings in the @crowdin/crowdin-api-client
-                addedIds = inviteResponse.data.added.map((member) => member.id);
-            }
-        }
-        catch (error) {
-            console.error('Failed to invite users', error);
-        }
-        try {
-            if (userIdInvites.length) {
-                yield client.usersApi.addProjectMember(projectId, {
-                    managerAccess: true,
-                    userIds: userIdInvites,
-                }); // TODO: fix typings in the @crowdin/crowdin-api-client
-            }
-        }
-        catch (error) {
-            console.error('Failed to grant project manager access', error);
-        }
-        return addedIds;
-    });
-}
-function addUsersToApplicationInstallation({ client, ownerId, applicationInstallation, alreadyAddedUserIds, usersWhoNotIssetInApplicationInstallation, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!applicationInstallation || !usersWhoNotIssetInApplicationInstallation.length) {
-            return;
-        }
-        const applicationInvites = [
-            ownerId,
-            ...alreadyAddedUserIds,
-            ...usersWhoNotIssetInApplicationInstallation.map((user) => user.id).filter(Boolean),
-        ];
-        const permissions = applicationInstallation.data.modules.filter((module) => module.type === CONSTANTS.PROJECT_INTEGRATIONS_MODULE_TYPE);
-        if (!permissions.length) {
-            return;
-        }
-        try {
-            for (const module of permissions) {
-                if (module.permissions.user.value === types_1.UserPermissions.ALL_MEMBERS) {
-                    continue;
-                }
-                const userIds = [...new Set([...module.permissions.user.ids, ...applicationInvites])];
-                client.applicationsApi.editApplicationInstallation(applicationInstallation.data.identifier, [
-                    {
-                        op: 'replace',
-                        path: `/modules/${module.key}/permissions`,
-                        value: {
-                            user: {
-                                value: types_1.UserPermissions.RESTRICTED,
-                                ids: userIds,
-                            },
-                        },
-                    },
-                ]);
-            }
-        }
-        catch (error) {
-            console.error('Failed to update application permissions', error);
-        }
-    });
-}
-function addUsersToIntegration({ clientId, alreadyAddedUserIds, usersToInvite, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const integrationInvites = [...alreadyAddedUserIds, ...usersToInvite.filter((identifier) => +identifier)];
-        yield (0, storage_1.getStorage)().updateIntegrationManagers(clientId, JSON.stringify(integrationInvites.map((id) => `${id}`)));
-    });
-}

package/out/modules/integration/handlers/main.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,7 +13,7 @@ const util_1 = require("../../../util");
 const logger_1 = require("../../../util/logger");
 const subscription_1 = require("../../../util/subscription");
 const defaults_1 = require("../util/defaults");
-const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
+const users_1 = require("./users");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
@@ -64,21 +41,29 @@ function handle(config, integration) {
                 options.oauthMode = integration.oauthLogin.mode;
             }
         }
-        else if (integration.getConfiguration) {
-            const { userId } = crowdinAppFunctions.parseCrowdinId(req.crowdinContext.clientId);
+        else {
+            if (integration.getConfiguration) {
+                options.config = JSON.stringify(req.integrationSettings || {});
+                options.reloadOnConfigSave = !!integration.reloadOnConfigSave;
+                options.integrationPagination = integration.integrationPagination;
+                if ((_b = req.query) === null || _b === void 0 ? void 0 : _b.parentUrl) {
+                    const parentUrl = new URL(req.query.parentUrl);
+                    parentUrl.searchParams.set('zen-mode', 'true');
+                    options.zenModeUrl = parentUrl.toString();
+                }
+                const configurationFields = yield integration.getConfiguration(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials);
+                options.configurationFields = (0, defaults_1.groupFieldsByCategory)(configurationFields);
+                logger(`Adding configuration fields ${JSON.stringify(options.configurationFields, null, 2)}`);
+            }
             options.hasOrganization = !!req.crowdinContext.jwtPayload.domain;
+            const userId = req.crowdinContext.jwtPayload.context.user_id;
             options.isOwner = req.integrationCredentials.ownerId === userId;
-            options.config = JSON.stringify(req.integrationSettings || {});
-            options.reloadOnConfigSave = !!integration.reloadOnConfigSave;
-            options.integrationPagination = integration.integrationPagination;
-            if ((_b = req.query) === null || _b === void 0 ? void 0 : _b.parentUrl) {
-                const parentUrl = new URL(req.query.parentUrl);
-                parentUrl.searchParams.set('zen-mode', 'true');
-                options.zenModeUrl = parentUrl.toString();
-            }
-            const configurationFields = yield integration.getConfiguration(req.crowdinContext.jwtPayload.context.project_id, req.crowdinApiClient, req.integrationCredentials);
-            options.configurationFields = (0, defaults_1.groupFieldsByCategory)(configurationFields);
-            logger(`Adding configuration fields ${JSON.stringify(options.configurationFields, null, 2)}`);
+            options.userId = userId;
+            options.isManager = yield (0, users_1.isManager)({
+                client: req.crowdinApiClient,
+                projectId: req.crowdinContext.jwtPayload.context.project_id,
+                memberId: userId,
+            });
         }
         options.infoModal = integration.infoModal;
         options.syncNewElements = integration.syncNewElements;

package/out/modules/integration/handlers/users.d.ts

@@ -3,11 +3,8 @@ import Crowdin, { UsersModel } from '@crowdin/crowdin-api-client';
 import { Response } from 'express';
 export type ProjectMember = UsersModel.ProjectMember | UsersModel.EnterpriseProjectMember;
 export default function handle(): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
-export declare function getUsers({ client, projectId }: {
+export declare function isManager({ client, projectId, memberId, }: {
     client: Crowdin;
     projectId: number;
-}): Promise<{
-    projectMembers: ProjectMember[];
-    organizationMembers: UsersModel.User[];
-}>;
-export declare function getUserFullName(user: UsersModel.User | ProjectMember): string;
+    memberId: number;
+}): Promise<{}>;

package/out/modules/integration/handlers/users.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,32 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserFullName = exports.getUsers = void 0;
+exports.isManager = void 0;
 const util_1 = require("../../../util");
 const storage_1 = require("../../../storage");
-const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
+const MANAGER_ROLES = ['owner', 'manager'];
 function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        const client = req.crowdinApiClient;
-        const ownerId = req.integrationCredentials.ownerId;
-        const { projectId } = crowdinAppFunctions.parseCrowdinId(req.crowdinContext.clientId);
-        const { projectMembers, organizationMembers } = yield getUsers({ client, projectId });
-        const uniqueUsers = new Map();
-        [...projectMembers, ...organizationMembers].forEach((manager) => {
-            if (manager.id !== ownerId && !uniqueUsers.has(manager.id)) {
-                uniqueUsers.set(manager.id, manager);
-            }
-        });
-        const sortedUsers = Array.from(uniqueUsers.values())
-            .sort((a, b) => {
-            const aValue = a.firstName || a.username || '';
-            const bValue = b.firstName || b.username || '';
-            return aValue.localeCompare(bValue);
-        })
-            .map((user) => ({
-            id: user.id.toString(),
-            name: getUserFullName(user),
-        }));
         let integrationManagers = [];
         const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(req.crowdinContext.clientId);
         if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.managers) {
@@ -65,38 +22,18 @@ function handle() {
         }
         res.json({
             data: {
-                users: sortedUsers,
                 managers: integrationManagers,
             },
         });
     }));
 }
 exports.default = handle;
-function getUsers({ client, projectId }) {
+function isManager({ client, projectId, memberId, }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const users = {
-            projectMembers: [],
-            organizationMembers: [],
-        };
-        const projectMembers = (yield client.usersApi.withFetchAll().listProjectMembers(projectId)).data;
-        users.projectMembers = projectMembers.map((members) => members.data);
-        if (client.organization) {
-            try {
-                const admins = (yield client.usersApi.withFetchAll().listUsers()).data;
-                users.organizationMembers = admins.map((admin) => admin.data);
-            }
-            catch (error) {
-                console.error('Failed to get organization users', error);
-            }
-        }
-        return users;
+        const member = (yield client.usersApi.getProjectMemberPermissions(projectId, memberId)).data;
+        const isAdmin = 'isAdmin' in member ? member.isAdmin : 'role' in member && member.role === 'owner';
+        const isManager = ('role' in member && MANAGER_ROLES.includes(member.role)) || ('isManager' in member && member.isManager);
+        return isAdmin || isManager;
     });
 }
-exports.getUsers = getUsers;
-function getUserFullName(user) {
-    const ownerFullName = 'fullName' in user ? user.fullName : ((user.firstName || '') + ' ' + (user.lastName || '')).trim();
-    return !!ownerFullName && (user === null || user === void 0 ? void 0 : user.username) !== ownerFullName
-        ? `${ownerFullName} (${user === null || user === void 0 ? void 0 : user.username})`
-        : user === null || user === void 0 ? void 0 : user.username;
-}
-exports.getUserFullName = getUserFullName;
+exports.isManager = isManager;

package/out/modules/manifest.js

@@ -362,9 +362,7 @@ function handle(config) {
     if (!(0, subscription_1.isAppFree)(config)) {
         events['subscription_paid'] = '/subscription-paid';
     }
-    const defaultScopes = config.projectIntegration
-        ? [types_1.Scope.USERS, types_1.Scope.PROJECTS, types_1.Scope.APPLICATIONS]
-        : [types_1.Scope.PROJECTS];
+    const defaultScopes = config.projectIntegration ? [types_1.Scope.USERS, types_1.Scope.PROJECTS] : [types_1.Scope.PROJECTS];
     return (_req, res) => {
         const manifest = Object.assign(Object.assign(Object.assign(Object.assign({ identifier: config.identifier, name: config.name, logo: (0, util_1.getLogoUrl)(), baseUrl: config.baseUrl, authentication: {
                 type: config.authenticationType || types_1.AuthenticationType.APP,

package/out/views/main.handlebars

@@ -36,7 +36,9 @@
             <div id="buttons">
                 <crowdin-button id="show-integration-btn" class="hidden" icon-before="arrow_back" onclick="showIntegration();">Integration</crowdin-button>
                 <crowdin-button id="show-error-logs-btn" icon-before="list" onclick="showErrorLogs();">Error logs</crowdin-button>
-                <crowdin-button icon-before="link" onclick="showPermissionsDialog()">Share</crowdin-button>
+                {{#if isManager}}
+                    <crowdin-button icon-before="link" onclick="showPermissionsDialog()">Share</crowdin-button>
+                {{/if}}
                 {{#if infoModal}}
                     <crowdin-button icon-before="info" onclick="openModal(infoModal);">{{infoModal.title}}</crowdin-button>
                 {{/if}}
@@ -154,7 +156,7 @@
                     label="Users"
                     help-text="Search for members by name, username, email, or invite new ones using their email."
                     is-position-fixed
-                    onchange="inviteUsers()"
+                    onchange="checkUsers()"
                     >
                 </crowdin-select>
             </div>
@@ -221,7 +223,7 @@
         </div>
 
         <div slot="footer">
-            <crowdin-button id="confirm-users-btn" outlined onclick="inviteUsers(false)">Save</crowdin-button>
+            <crowdin-button id="confirm-users-btn" outlined onclick="inviteUsers()">Save</crowdin-button>
         </div>
     </crowdin-modal>
 
@@ -959,6 +961,18 @@
         permissionsModal.setAttribute('body-overflow-unset', true)
     }
 
+    function getUserFullName(user) {
+        if (user.full_name) {
+            return user.full_name;
+        }
+
+        const ownerFullName = user.name || ((user.first_name || '') + ' ' + (user.last_name || '')).trim();
+
+        return !!ownerFullName && user?.login !== ownerFullName
+            ? `${ownerFullName} (${user?.login})`
+            : user?.login;
+    }
+
     function showPermissionsDialog() {
         hideConfirmUsersBlock();
         openModal(permissions)
@@ -967,13 +981,26 @@
 
         select.value = '[]';
 
-        checkOrigin()
-            .then(restParams => fetch('api/users' + restParams))
-            .then(checkResponse)
-            .then((res) => {
-                let userOptions = res.data.users.map(user => `<option value="${user.id}">${sanitizeHTML(user.name)}</option>`).join('');
-                select.innerHTML = userOptions;
-                select.value = JSON.stringify(res.data.managers);
+        Promise.all([
+            new Promise((resolve) => {
+                checkOrigin()
+                    .then(restParams => fetch('api/users' + restParams))
+                    .then(checkResponse)
+                    .then((res) => {
+                        resolve(JSON.stringify(res.data.managers));
+                    })
+            }),
+            new Promise((resolve) => {
+                AP.getUsers(res => {
+                    const users = Object.values(res).filter(user => user.id !== Number('{{userId}}'));
+
+                    resolve(users.map(user => `<option value="${user.id}">${sanitizeHTML(getUserFullName(user))}</option>`).join(''));
+                })
+            })
+        ])
+            .then(([managers, users]) => {
+                select.innerHTML = users;
+                select.value = managers;
             })
             .catch(e => catchRejection(e, 'Can\'t fetch users'))
             .finally(() => unsetLoader('#permissions-modal'));
@@ -987,43 +1014,116 @@
         permissionsModal.removeAttribute('body-overflow-unset')
     }
 
-    async function inviteUsers(onlyCheck = true) {
+    function checkUsers() {
         setLoader('#permissions-modal');
 
         const select = document.getElementById('users');
 
-        if (onlyCheck && select.value === '[]') {
+        if (select.value === '[]') {
             hideConfirmUsersBlock();
             unsetLoader('#permissions-modal');
             return;
         }
 
-        const params = {
-            users: JSON.parse(select.value),
-            onlyCheck,
-        };
+        const users = JSON.parse(select.value);
+        const user_ids = users.filter(id => parseInt(id));
+        const emails = users.filter(id => !parseInt(id));
+
+        const params = { user_ids, emails };
+
+        Promise.all([
+            new Promise((resolve) => {
+                checkOrigin()
+                    .then(restParams => fetch('api/users' + restParams))
+                    .then(checkResponse)
+                    .then((usersResponse) => {
+                        resolve(usersResponse.data.managers);
+                    });
+            }),
+            new Promise((resolve) => {
+                AP.validateUsers(params, (res) => {
+                    resolve(res.data);
+                });
+            }),
+            new Promise((resolve) => {
+                AP.getUsers(res => {
+                    resolve(res);
+                });
+            })
+        ])
+        .then(([appManagers, checkUsersResponse, allUsers]) => {
+            const newUserEmails = checkUsersResponse.newUserEmails.map(email => ({name: email}));
+
+            const newProjectManagers = [
+                ...newUserEmails,
+                ...checkUsersResponse.newProjectManagers.map(user => ({
+                    name: getUserFullName(user),
+                })),
+            ];
+
+            const newApplicationAccessUsers = [
+                ...newUserEmails,
+                ...checkUsersResponse.newApplicationAccessUsers.map(user => ({
+                    name: getUserFullName(user),
+                })),
+            ];
+
+            const newApplicationManagers = [
+                ...newUserEmails,
+                ...Object.values(allUsers)
+                    .filter(user => users.some(id => +id === user.id) && !appManagers.some(id => +id === user.id))
+                    .map(user => ({name: getUserFullName(user)})),
+            ];
+
+            prepareUsersConfirmBlock({
+                ...checkUsersResponse,
+                newUserEmails,
+                newProjectManagers,
+                newApplicationAccessUsers,
+                newApplicationManagers,
+            });
+        })
+        .catch(e => catchRejection(e, e?.error || 'Can\'t invite users'))
+        .finally(() => unsetLoader('#permissions-modal'));
+    }
+
+    function inviteUsers() {
+        setLoader('#permissions-modal');
+
+        const select = document.getElementById('users');
+        const users = JSON.parse(select.value);
+        const user_ids = users.filter(id => parseInt(id));
+        const emails = users.filter(id => !parseInt(id));
+
+        const params = { user_ids, emails };
+
+        AP.inviteUsers(params, (res) => {
+            if (!res.success) {
+                catchRejection(res, res?.error?.message || 'Can\'t invite users')
+                unsetLoader('#permissions-modal');
+                return;
+            }
+
+            checkOrigin()
+                .then(restParams => fetch('api/invite-users' + restParams, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(res.data)
+                }))
+                .then(checkResponse)
+                .then((res) => {
+                    if (!res.success) {
+                        catchRejection(res, res?.message || 'Can\'t invite users');
+                        return;
+                    }
 
-        checkOrigin()
-            .then(restParams => fetch('api/invite-users' + restParams, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(params)
-            }))
-            .then(checkResponse)
-            .then((response) => {
-                if (!onlyCheck) {
                     showToast('Users successfully updated');
                     hideConfirmUsersBlock();
                     closeModal(permissions);
-                    return;
-                }
-
-                prepareUsersConfirmBlock(response.data);
-            })
-            .catch(e => {
-                catchRejection(e, e?.error || 'Can\'t invite users')
-            })
-            .finally(() => unsetLoader('#permissions-modal'));
+                })
+                .catch((e) => catchRejection(e, e?.error || 'Can\'t invite users'))
+                .finally(() => unsetLoader('#permissions-modal'));
+        });
     }
 
     function prepareUsersConfirmBlock(usersData) {
@@ -1044,8 +1144,8 @@
             processUsersWhoWillBeInvitedToOrganization(organizationInvite, usersData, organizationWillGrantElement, grantedElement, notAvailableElement);
         }
 
-        processUsersWhoWillBeInvited(projectInvite, usersData.usersWhoWillBeInvitedToProject, willGrantedElement, grantedElement);
-        processUsersWhoWillBeInvited(applicationCredentialsInvite, usersData.usersWhoNotIssetInIntegration, willGrantedElement, grantedElement);
+        processUsersWhoWillBeInvited(projectInvite, usersData.newProjectManagers, willGrantedElement, grantedElement);
+        processUsersWhoWillBeInvited(applicationCredentialsInvite, usersData.newApplicationManagers, willGrantedElement, grantedElement);
 
         processUsersWhoWillBeInvitedApplicationSettings(usersData, willGrantedElement, grantedElement, notAvailableElement);
     }
@@ -1058,7 +1158,7 @@
         description.classList.remove('text-warning');
         description.innerText = '';
 
-        const users = usersData.usersWhoWillBeInvitedToOrganization;
+        const users = usersData.newUserEmails;
 
         if (users.length) {
             if (usersData.inviteRestricted) {
@@ -1114,25 +1214,13 @@
 
         let affectedUsers = '<ul>';
 
-        if (!usersData.editApplicationAvailable) {
-            descriptionMessage += ' The application doesn\'t have permission to update this setting.';
-            descriptionMessage += usersData.isAdmin ? ' Please reinstall the app.' : ' Please ask the organization admin to reinstall the app.';
-
-            description.classList.add('text-warning');
-            description.innerText = descriptionMessage;
-
-            tooltip.innerHTML = notAvailableElement;
-            for (const user of usersData.usersWhoNotIssetInApplicationInstallation) {
-                affectedUsers += `<li><crowdin-p>${sanitizeHTML(user.name)}</crowdin-p></li>`;
-            }
-            userList.innerHTML = affectedUsers + '</ul>';
-        } else if (!usersData.usersWhoNotIssetInApplicationInstallation.length) {
+        if (!usersData.newApplicationAccessUsers.length) {
             tooltip.innerHTML = grantedElement;
             userList.innerHTML = grantedElement;
         } else {
             if (usersData.isAdmin) {
                 tooltip.innerHTML = willGrantedElement;
-                for (const user of usersData.usersWhoNotIssetInApplicationInstallation) {
+                for (const user of usersData.newApplicationAccessUsers) {
                     affectedUsers += `<li><crowdin-p>${sanitizeHTML(user.name)}</crowdin-p></li>`;
                 }
                 userList.innerHTML = affectedUsers + '</ul>';
@@ -1143,7 +1231,7 @@
                 description.innerText = descriptionMessage;
 
                 tooltip.innerHTML = notAvailableElement;
-                for (const user of usersData.usersWhoNotIssetInApplicationInstallation) {
+                for (const user of usersData.newApplicationAccessUsers) {
                     affectedUsers += `<li><crowdin-p>${sanitizeHTML(user.name)}</crowdin-p></li>`;
                 }
                 userList.innerHTML = affectedUsers + '</ul>';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.91.0",
+  "version": "0.92.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -34,7 +34,7 @@
     "lodash.isstring": "^4.0.1",
     "lodash.snakecase": "^4.1.1",
     "lodash.uniqby": "^4.7.0",
-    "minimatch": "^10.0.1",
+    "minimatch": "^10.0.3",
     "mysql2": "^3.12.0",
     "node-cron": "^3.0.3",
     "pg": "^8.13.3",