@crowdin/app-project-module 0.80.0 → 0.81.0

package/out/modules/api/api.js

@@ -499,9 +499,9 @@ function addDefaultApiEndpoints(app, config) {
                 checkSubscriptionExpiration: true,
                 moduleKey: config.projectIntegration.key,
             }), (req, res) => {
-                var _a;
+                var _a, _b;
                 let fields = [];
-                if ((_a = config.projectIntegration) === null || _a === void 0 ? void 0 : _a.loginForm.fields) {
+                if ((_b = (_a = config.projectIntegration) === null || _a === void 0 ? void 0 : _a.loginForm) === null || _b === void 0 ? void 0 : _b.fields) {
                     fields = getFormFields(config === null || config === void 0 ? void 0 : config.projectIntegration.loginForm.fields);
                 }
                 res.send({ fields });

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

@@ -47,19 +47,25 @@ function handle() {
         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,
@@ -69,6 +75,7 @@ function handle() {
             return res.send({
                 data: {
                     isAdmin,
+                    inviteRestricted,
                     editApplicationAvailable: applicationInstallation !== null,
                     usersWhoWillBeInvitedToOrganization,
                     usersWhoWillBeInvitedToProject,
@@ -81,6 +88,7 @@ function handle() {
             req,
             projectId,
             isAdmin,
+            inviteRestricted,
             usersToInvite,
             applicationInstallation,
             usersWhoWillBeInvitedToOrganization,
@@ -94,10 +102,10 @@ exports.default = handle;
 function filterOrganizationUsers(usersToInvite) {
     return usersToInvite.filter((identifier) => (0, util_1.validateEmail)(identifier)).map((name) => ({ name: `${name}` }));
 }
-function filterProjectUsers({ usersToInvite, projectMembers, organizationMembers, }) {
+function filterProjectUsers({ inviteRestricted, usersToInvite, projectMembers, organizationMembers, }) {
     return usersToInvite
         .map((identifier) => {
-        if ((0, util_1.validateEmail)(identifier)) {
+        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
             return { name: `${identifier}` };
         }
         const user = projectMembers.find((member) => member.id === +identifier);
@@ -113,7 +121,7 @@ function filterProjectUsers({ usersToInvite, projectMembers, organizationMembers
     })
         .filter(Boolean);
 }
-function filterNotIssetApplicationUsers({ usersToInvite, applicationInstallation, projectMembers, organizationMembers, }) {
+function filterNotIssetApplicationUsers({ inviteRestricted, usersToInvite, applicationInstallation, projectMembers, organizationMembers, }) {
     let userIdentifiers = [];
     if (!applicationInstallation) {
         return [];
@@ -130,7 +138,7 @@ function filterNotIssetApplicationUsers({ usersToInvite, applicationInstallation
     }
     return userIdentifiers
         .map((identifier) => {
-        if ((0, util_1.validateEmail)(identifier)) {
+        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
             return { name: `${identifier}` };
         }
         let user;
@@ -142,7 +150,7 @@ function filterNotIssetApplicationUsers({ usersToInvite, applicationInstallation
     })
         .filter(Boolean);
 }
-function filterNotIssetIntegrationUsers({ usersToInvite, integrationCredentials, projectMembers, organizationMembers, }) {
+function filterNotIssetIntegrationUsers({ inviteRestricted, usersToInvite, integrationCredentials, projectMembers, organizationMembers, }) {
     let integrationManagers = [];
     if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.managers) {
         integrationManagers = JSON.parse(integrationCredentials.managers);
@@ -152,7 +160,7 @@ function filterNotIssetIntegrationUsers({ usersToInvite, integrationCredentials,
         if (integrationManagers.includes(`${identifier}`)) {
             return null;
         }
-        if ((0, util_1.validateEmail)(identifier)) {
+        if ((0, util_1.validateEmail)(identifier) && !inviteRestricted) {
             return { name: `${identifier}` };
         }
         let user;
@@ -164,9 +172,12 @@ function filterNotIssetIntegrationUsers({ usersToInvite, integrationCredentials,
     })
         .filter(Boolean);
 }
-function inviteUsers({ req, projectId, isAdmin, usersToInvite, applicationInstallation, usersWhoWillBeInvitedToOrganization, usersWhoWillBeInvitedToProject, usersWhoNotIssetInApplicationInstallation, }) {
+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,

package/out/modules/integration/index.js

@@ -197,8 +197,10 @@ function register({ config, app }) {
     }
     // remove user errors
     cron.schedule('0 0 * * *', () => __awaiter(this, void 0, void 0, function* () {
-        const date = (0, util_1.getPreviousDate)(integrationLogic.userErrorLifetimeDays);
-        yield (0, storage_1.getStorage)().deleteAllUsersErrorsOlderThan(`${date.getTime()}`);
+        if (integrationLogic.userErrorLifetimeDays) {
+            const date = (0, util_1.getPreviousDate)(integrationLogic.userErrorLifetimeDays);
+            yield (0, storage_1.getStorage)().deleteAllUsersErrorsOlderThan(`${date.getTime()}`);
+        }
     }));
     if (integrationLogic.webhooks) {
         app.post(`${integrationLogic.webhooks.crowdinWebhookUrl

package/out/modules/integration/types.d.ts

@@ -6,7 +6,7 @@ export interface IntegrationLogic extends ModuleKey {
     /**
      * Customize your app login form
      */
-    loginForm: LoginForm;
+    loginForm?: LoginForm;
     /**
      * Define login process via OAuth2 protocol
      */
@@ -162,7 +162,7 @@ export interface IntegrationLogic extends ModuleKey {
     /**
      * The duration for storing user errors, default is 30 days.
      */
-    userErrorLifetimeDays: number;
+    userErrorLifetimeDays?: number;
     /**
      * When true, folder filtering during automatic translation sync is bypassed, and the file tree is returned unchanged.
      */

package/out/views/main.handlebars

@@ -71,7 +71,7 @@
                     integration-one-level-fetching="true"
                 {{/if}}
                 {{#if integrationSearchListener}}
-                    allow-filter-change-listener="true"
+                    allow-integration-filter-change-listener="true"
                 {{/if}}
                 {{#if integrationPagination}}
                     integration-load-more-files="true"
@@ -166,6 +166,7 @@
                                 <tr class="organization-invite">
                                     <td>
                                         <crowdin-p>Registration in Organization</crowdin-p>
+                                        <div class="permission-description"></div>
                                     </td>
                                     <td class="affected-users"></td>
                                     <td class="status"></td>
@@ -1009,7 +1010,7 @@
         if (organizationInvite) {
             const organizationWillGrantElement = `<span class="badge badge-will-be-granted">Will Be Registered</span>`;
 
-            processUsersWhoWillBeInvited(organizationInvite, usersData.usersWhoWillBeInvitedToOrganization, organizationWillGrantElement, grantedElement);
+            processUsersWhoWillBeInvitedToOrganization(organizationInvite, usersData, organizationWillGrantElement, grantedElement, notAvailableElement);
         }
 
         processUsersWhoWillBeInvited(projectInvite, usersData.usersWhoWillBeInvitedToProject, willGrantedElement, grantedElement);
@@ -1018,6 +1019,38 @@
         processUsersWhoWillBeInvitedApplicationSettings(usersData, willGrantedElement, grantedElement, notAvailableElement);
     }
 
+    function processUsersWhoWillBeInvitedToOrganization(element, usersData, willGrantedElement, alreadyGrantedMessage, notAvailableElement) {
+        const tooltip = element.querySelector('.status');
+        const description = element.querySelector('.permission-description');
+        const userList = element.querySelector('.affected-users');
+
+        description.classList.remove('text-warning');
+        description.innerText = '';
+
+        const users = usersData.usersWhoWillBeInvitedToOrganization;
+
+        if (users.length) {
+            if (usersData.inviteRestricted) {
+                description.classList.add('text-warning');
+                description.innerText = 'New user invitations are restricted to administrators.';
+
+                tooltip.innerHTML = notAvailableElement;
+            } else {
+                tooltip.innerHTML = willGrantedElement;
+            }
+
+            let affectedUsers = '<ul>';
+            for (const user of users) {
+                affectedUsers += `<li><crowdin-p>${sanitizeHTML(user.name)}</crowdin-p></li>`;
+            }
+            affectedUsers += '</ul>';
+            userList.innerHTML = affectedUsers;
+        } else {
+            tooltip.innerHTML = alreadyGrantedMessage;
+            userList.innerHTML = alreadyGrantedMessage;
+        }
+    }
+
     function processUsersWhoWillBeInvited(element, users, grantMessage, alreadyGrantedMessage) {
         const tooltip = element.querySelector('.status');
         const userList = element.querySelector('.affected-users');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.80.0",
+  "version": "0.81.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",