@crowdin/app-project-module 0.71.0 → 0.71.2

package/out/middlewares/integration-credentials.js

@@ -63,7 +63,8 @@ function handle(config, integration, optional = false) {
             }
         }
         if (!integrationCredentials) {
-            if (optional && !ownerIds.length) {
+            const owners = yield getIntegrationManagedBy(ownerIds, req);
+            if (optional && !owners.length) {
                 return next();
             }
             const errorOptions = {
@@ -72,10 +73,10 @@ function handle(config, integration, optional = false) {
                 owners: null,
                 hideActions: false,
             };
-            if (ownerIds) {
+            if (owners) {
                 errorOptions.message = 'Looks like you don’t have access';
                 errorOptions.hideActions = true;
-                errorOptions.owners = yield getIntegrationManagedBy(ownerIds, req);
+                errorOptions.owners = owners;
             }
             else {
                 (0, logger_1.temporaryErrorDebug)('Access denied: integration-credentials', req);
@@ -109,10 +110,21 @@ function checkUserAccessToIntegration(integrationCredentials, userId) {
 }
 function getIntegrationManagedBy(ownerIds, req) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (!ownerIds.length) {
+            return [];
+        }
         const projectId = crowdinAppFunctions.getProjectId(req.crowdinContext.clientId);
-        const owners = ownerIds.length > 1
-            ? (yield req.crowdinApiClient.usersApi.listProjectMembers(projectId)).data.filter((member) => ownerIds.includes(member.data.id))
-            : [yield req.crowdinApiClient.usersApi.getProjectMemberPermissions(projectId, ownerIds[0])];
+        let owners = [];
+        try {
+            owners =
+                ownerIds.length > 1
+                    ? (yield req.crowdinApiClient.usersApi.listProjectMembers(projectId)).data.filter((member) => ownerIds.includes(member.data.id))
+                    : [yield req.crowdinApiClient.usersApi.getProjectMemberPermissions(projectId, ownerIds[0])];
+        }
+        catch (e) {
+            console.warn('Failed to get project members', e);
+            return [];
+        }
         return owners.map((owner) => {
             const ownerFullName = 'fullName' in owner.data
                 ? owner.data.fullName

package/out/modules/integration/util/defaults.js

@@ -147,7 +147,7 @@ function applyIntegrationModuleDefaults(config, integration) {
             fields = yield getUserSettings(projectId, crowdinClient, integrationCredentials);
         }
         const defaultSettings = [];
-        const mangers = yield getManagers(projectId, crowdinClient, integrationCredentials);
+        const mangers = yield getManagers(crowdinClient, projectId, integrationCredentials.ownerId);
         if (mangers.length) {
             defaultSettings.push({
                 key: 'managers',
@@ -320,17 +320,30 @@ function getOAuthLoginFormId(clientId) {
     return `oauth_form_${clientId}`;
 }
 exports.getOAuthLoginFormId = getOAuthLoginFormId;
-function getManagers(projectId, client, integrationCredentials) {
+function getManagers(client, projectId, ownerId) {
     return __awaiter(this, void 0, void 0, function* () {
         const managers = [];
         if (client.organization) {
-            const admins = (yield client.usersApi.listUsers()).data.filter((user) => user.data.isAdmin);
-            managers.push(...admins.map((admin) => admin.data));
+            try {
+                const admins = (yield client.usersApi.withFetchAll().listUsers()).data.filter((user) => user.data.isAdmin);
+                managers.push(...admins.map((admin) => admin.data));
+            }
+            catch (e) {
+                console.error('Failed to get organization users', e);
+            }
         }
-        const projectMembers = (yield client.usersApi.listProjectMembers(projectId)).data.filter((user) => 'role' in user.data ? ['owner', 'manager'].includes(user.data.role) : user.data.isManager);
+        const projectMembers = (yield client.usersApi.withFetchAll().listProjectMembers(projectId)).data.filter((user) => 'role' in user.data ? ['owner', 'manager'].includes(user.data.role) : user.data.isManager);
         managers.push(...projectMembers.map((members) => members.data));
-        return managers
-            .filter((manager) => manager.id !== +integrationCredentials.ownerId)
-            .filter((manager, index, self) => self.findIndex((m) => m.id === manager.id) === index);
+        const uniqueManagers = new Map();
+        managers.forEach((manager) => {
+            if (manager.id !== ownerId && !uniqueManagers.has(manager.id)) {
+                uniqueManagers.set(manager.id, manager);
+            }
+        });
+        return Array.from(uniqueManagers.values()).sort((a, b) => {
+            const aValue = a.firstName || a.username || '';
+            const bValue = b.firstName || b.username || '';
+            return aValue.localeCompare(bValue);
+        });
     });
 }