Page MenuHomePhabricator
Differential D9645

[lib][web][native] Refactor actions in user-actions.js pt.2
ClosedPublic
Actions

Authored by inka on Oct 31 2023, 2:51 AM.
Tags
None
Referenced Files
F5988479: D9645.id32524.diff
Sat, Apr 19, 6:38 AM
Unknown Object (File)
Wed, Apr 9, 1:21 AM
Unknown Object (File)
Wed, Apr 9, 12:16 AM
Unknown Object (File)
Tue, Apr 8, 10:09 PM
Unknown Object (File)
Tue, Apr 8, 9:50 PM
Unknown Object (File)
Tue, Apr 8, 9:29 PM
Unknown Object (File)
Tue, Apr 8, 8:45 PM
Unknown Object (File)
Mon, Mar 31, 12:41 PM
View All Files
Subscribers
ashoat
tomek
will

Details

Reviewers
michal
kamil
ginsu
Commits
rCOMM19021f0f428a: [lib][web][native] Refactor actions in user-actions.js pt.2
Summary

issue: https://linear.app/comm/issue/ENG-5281/refactor-logout-and-deleteaccount-actions

Test Plan

tested that the actions work and no errors show up.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

inka created this revision.Oct 31 2023, 2:51 AM
Herald added subscribers: will, tomek, ashoat. · View Herald TranscriptOct 31 2023, 2:51 AM
inka added a parent revision: D9640: [keyserver][lib] Remove id from LoggedOutUserInfo.Oct 31 2023, 2:51 AM
inka added a child revision: D9644: [lib] Add function for splitting calendar query per keyserver.
Harbormaster completed remote builds in B23588: Diff 32524.Oct 31 2023, 3:15 AM
inka requested review of this revision.Oct 31 2023, 3:15 AM
inka added a child revision: D9648: [lib][web][native] Refactor actions in user-actions.js pt.3 - login.Oct 31 2023, 5:13 AM
inka removed a child revision: D9644: [lib] Add function for splitting calendar query per keyserver.Nov 2 2023, 6:42 AM
michal accepted this revision.Nov 7 2023, 2:15 AM
This revision is now accepted and ready to land.Nov 7 2023, 2:15 AM
inka updated this revision to Diff 32846.Nov 7 2023, 2:18 AM

Rebase

Harbormaster failed remote builds in B23830: Diff 32846!Nov 7 2023, 2:35 AM
inka updated this revision to Diff 32851.Nov 7 2023, 3:53 AM

Rebase

Harbormaster failed remote builds in B23834: Diff 32851!Nov 7 2023, 4:22 AM
This revision was landed with ongoing or failed builds.Nov 7 2023, 6:35 AM
Closed by commit rCOMM19021f0f428a: [lib][web][native] Refactor actions in user-actions.js pt.2 (authored by inka). · Explain Why
This revision was automatically updated to reflect the committed changes.
inka added a commit: rCOMM19021f0f428a: [lib][web][native] Refactor actions in user-actions.js pt.2.

Revision Contents
Changeset List

Diff 32884

View Options

lib/actions/user-actions.js

// @flow // @flow
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import type {
RoleDeletionRequest,
RoleDeletionResult,
} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import {
fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos,
fetchThreadInfos,
} from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
async function deleteOrphanedRoles(): Promise<void> { async function deleteOrphanedRoles(): Promise<void> {
await dbQuery(SQL` await dbQuery(SQL`
DELETE r, i DELETE r, i
FROM roles r FROM roles r
LEFT JOIN ids i ON i.id = r.id LEFT JOIN ids i ON i.id = r.id
LEFT JOIN threads t ON t.id = r.thread LEFT JOIN threads t ON t.id = r.thread
WHERE t.id IS NULL WHERE t.id IS NULL
`); `);
} }
export { deleteOrphanedRoles }; async function deleteRole(
viewer: Viewer,
request: RoleDeletionRequest,
): Promise<RoleDeletionResult> {
const hasPermission = await checkThreadPermission(
viewer,
request.community,
threadPermissions.CHANGE_ROLE,
);
if (!hasPermission) {
throw new ServerError('invalid_credentials');
}
const { community, roleID } = request;
const defaultRoleQuery = SQL`
SELECT default_role
FROM threads
WHERE id = ${community}
`;
const membersWithRoleQuery = SQL`
SELECT user
FROM memberships
WHERE thread = ${community}
AND role = ${roleID}
`;
const [[defaultRoleResult], [membersWithRoleResult], { threadInfos }] =
await Promise.all([
dbQuery(defaultRoleQuery),
dbQuery(membersWithRoleQuery),
fetchThreadInfos(viewer, {
threadID: community,
}),
]);
const threadInfo = threadInfos[community];
if (!threadInfo) {
throw new ServerError('invalid_parameters');
}
const defaultRoleID = defaultRoleResult[0].default_role.toString();
const membersWithRole = membersWithRoleResult.map(result => result.user);
const adminRoleID = Object.keys(threadInfo.roles).find(
role => threadInfo.roles[role].name === 'Admins',
);
if (roleID === defaultRoleID || roleID === adminRoleID) {
throw new ServerError('invalid_parameters');
}
if (membersWithRole.length > 0) {
await updateRole(viewer, {
threadID: community,
memberIDs: membersWithRole,
role: defaultRoleID,
});
}
const deleteFromRolesQuery = SQL`
DELETE FROM roles
WHERE id = ${roleID}
AND thread = ${community}
`;
await dbQuery(deleteFromRolesQuery);
const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community,
});
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community];
const time = Date.now();
const updateDatas = [];
for (const memberInfo of serverThreadInfo.members) {
updateDatas.push({
type: updateTypes.UPDATE_THREAD,
userID: memberInfo.id,
time,
threadID: community,
});
}
const { viewerUpdates } = await createUpdates(updateDatas, {
viewer,
updatesForCurrentSession: 'return',
});
const { threadInfos: rawThreadInfos } = rawThreadInfosFromServerThreadInfos(
viewer,
fetchServerThreadInfosResult,
);
const rawThreadInfo = rawThreadInfos[community];
return {
threadInfo: rawThreadInfo,
updatesResult: {
newUpdates: viewerUpdates,
},
};
}
export { deleteOrphanedRoles, deleteRole };
View Options

native/crash.react.js

// @flow // @flow
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import type {
RoleDeletionRequest,
RoleDeletionResult,
} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import {
fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos,
fetchThreadInfos,
} from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
async function deleteOrphanedRoles(): Promise<void> { async function deleteOrphanedRoles(): Promise<void> {
await dbQuery(SQL` await dbQuery(SQL`
DELETE r, i DELETE r, i
FROM roles r FROM roles r
LEFT JOIN ids i ON i.id = r.id LEFT JOIN ids i ON i.id = r.id
LEFT JOIN threads t ON t.id = r.thread LEFT JOIN threads t ON t.id = r.thread
WHERE t.id IS NULL WHERE t.id IS NULL
`); `);
} }
export { deleteOrphanedRoles }; async function deleteRole(
viewer: Viewer,
request: RoleDeletionRequest,
): Promise<RoleDeletionResult> {
const hasPermission = await checkThreadPermission(
viewer,
request.community,
threadPermissions.CHANGE_ROLE,
);
if (!hasPermission) {
throw new ServerError('invalid_credentials');
}
const { community, roleID } = request;
const defaultRoleQuery = SQL`
SELECT default_role
FROM threads
WHERE id = ${community}
`;
const membersWithRoleQuery = SQL`
SELECT user
FROM memberships
WHERE thread = ${community}
AND role = ${roleID}
`;
const [[defaultRoleResult], [membersWithRoleResult], { threadInfos }] =
await Promise.all([
dbQuery(defaultRoleQuery),
dbQuery(membersWithRoleQuery),
fetchThreadInfos(viewer, {
threadID: community,
}),
]);
const threadInfo = threadInfos[community];
if (!threadInfo) {
throw new ServerError('invalid_parameters');
}
const defaultRoleID = defaultRoleResult[0].default_role.toString();
const membersWithRole = membersWithRoleResult.map(result => result.user);
const adminRoleID = Object.keys(threadInfo.roles).find(
role => threadInfo.roles[role].name === 'Admins',
);
if (roleID === defaultRoleID || roleID === adminRoleID) {
throw new ServerError('invalid_parameters');
}
if (membersWithRole.length > 0) {
await updateRole(viewer, {
threadID: community,
memberIDs: membersWithRole,
role: defaultRoleID,
});
}
const deleteFromRolesQuery = SQL`
DELETE FROM roles
WHERE id = ${roleID}
AND thread = ${community}
`;
await dbQuery(deleteFromRolesQuery);
const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community,
});
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community];
const time = Date.now();
const updateDatas = [];
for (const memberInfo of serverThreadInfo.members) {
updateDatas.push({
type: updateTypes.UPDATE_THREAD,
userID: memberInfo.id,
time,
threadID: community,
});
}
const { viewerUpdates } = await createUpdates(updateDatas, {
viewer,
updatesForCurrentSession: 'return',
});
const { threadInfos: rawThreadInfos } = rawThreadInfosFromServerThreadInfos(
viewer,
fetchServerThreadInfosResult,
);
const rawThreadInfo = rawThreadInfos[community];
return {
threadInfo: rawThreadInfo,
updatesResult: {
newUpdates: viewerUpdates,
},
};
}
export { deleteOrphanedRoles, deleteRole };
View Options

native/profile/delete-account.react.js

// @flow // @flow
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import type {
RoleDeletionRequest,
RoleDeletionResult,
} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import {
fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos,
fetchThreadInfos,
} from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
async function deleteOrphanedRoles(): Promise<void> { async function deleteOrphanedRoles(): Promise<void> {
await dbQuery(SQL` await dbQuery(SQL`
DELETE r, i DELETE r, i
FROM roles r FROM roles r
LEFT JOIN ids i ON i.id = r.id LEFT JOIN ids i ON i.id = r.id
LEFT JOIN threads t ON t.id = r.thread LEFT JOIN threads t ON t.id = r.thread
WHERE t.id IS NULL WHERE t.id IS NULL
`); `);
} }
export { deleteOrphanedRoles }; async function deleteRole(
viewer: Viewer,
request: RoleDeletionRequest,
): Promise<RoleDeletionResult> {
const hasPermission = await checkThreadPermission(
viewer,
request.community,
threadPermissions.CHANGE_ROLE,
);
if (!hasPermission) {
throw new ServerError('invalid_credentials');
}
const { community, roleID } = request;
const defaultRoleQuery = SQL`
SELECT default_role
FROM threads
WHERE id = ${community}
`;
const membersWithRoleQuery = SQL`
SELECT user
FROM memberships
WHERE thread = ${community}
AND role = ${roleID}
`;
const [[defaultRoleResult], [membersWithRoleResult], { threadInfos }] =
await Promise.all([
dbQuery(defaultRoleQuery),
dbQuery(membersWithRoleQuery),
fetchThreadInfos(viewer, {
threadID: community,
}),
]);
const threadInfo = threadInfos[community];
if (!threadInfo) {
throw new ServerError('invalid_parameters');
}
const defaultRoleID = defaultRoleResult[0].default_role.toString();
const membersWithRole = membersWithRoleResult.map(result => result.user);
const adminRoleID = Object.keys(threadInfo.roles).find(
role => threadInfo.roles[role].name === 'Admins',
);
if (roleID === defaultRoleID || roleID === adminRoleID) {
throw new ServerError('invalid_parameters');
}
if (membersWithRole.length > 0) {
await updateRole(viewer, {
threadID: community,
memberIDs: membersWithRole,
role: defaultRoleID,
});
}
const deleteFromRolesQuery = SQL`
DELETE FROM roles
WHERE id = ${roleID}
AND thread = ${community}
`;
await dbQuery(deleteFromRolesQuery);
const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community,
});
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community];
const time = Date.now();
const updateDatas = [];
for (const memberInfo of serverThreadInfo.members) {
updateDatas.push({
type: updateTypes.UPDATE_THREAD,
userID: memberInfo.id,
time,
threadID: community,
});
}
const { viewerUpdates } = await createUpdates(updateDatas, {
viewer,
updatesForCurrentSession: 'return',
});
const { threadInfos: rawThreadInfos } = rawThreadInfosFromServerThreadInfos(
viewer,
fetchServerThreadInfosResult,
);
const rawThreadInfo = rawThreadInfos[community];
return {
threadInfo: rawThreadInfo,
updatesResult: {
newUpdates: viewerUpdates,
},
};
}
export { deleteOrphanedRoles, deleteRole };
View Options

native/profile/profile-screen.react.js

// @flow // @flow
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import type {
RoleDeletionRequest,
RoleDeletionResult,
} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import {
fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos,
fetchThreadInfos,
} from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
async function deleteOrphanedRoles(): Promise<void> { async function deleteOrphanedRoles(): Promise<void> {
await dbQuery(SQL` await dbQuery(SQL`
DELETE r, i DELETE r, i
FROM roles r FROM roles r
LEFT JOIN ids i ON i.id = r.id LEFT JOIN ids i ON i.id = r.id
LEFT JOIN threads t ON t.id = r.thread LEFT JOIN threads t ON t.id = r.thread
WHERE t.id IS NULL WHERE t.id IS NULL
`); `);
} }
export { deleteOrphanedRoles }; async function deleteRole(
viewer: Viewer,
request: RoleDeletionRequest,
): Promise<RoleDeletionResult> {
const hasPermission = await checkThreadPermission(
viewer,
request.community,
threadPermissions.CHANGE_ROLE,
);
if (!hasPermission) {
throw new ServerError('invalid_credentials');
}
const { community, roleID } = request;
const defaultRoleQuery = SQL`
SELECT default_role
FROM threads
WHERE id = ${community}
`;
const membersWithRoleQuery = SQL`
SELECT user
FROM memberships
WHERE thread = ${community}
AND role = ${roleID}
`;
const [[defaultRoleResult], [membersWithRoleResult], { threadInfos }] =
await Promise.all([
dbQuery(defaultRoleQuery),
dbQuery(membersWithRoleQuery),
fetchThreadInfos(viewer, {
threadID: community,
}),
]);
const threadInfo = threadInfos[community];
if (!threadInfo) {
throw new ServerError('invalid_parameters');
}
const defaultRoleID = defaultRoleResult[0].default_role.toString();
const membersWithRole = membersWithRoleResult.map(result => result.user);
const adminRoleID = Object.keys(threadInfo.roles).find(
role => threadInfo.roles[role].name === 'Admins',
);
if (roleID === defaultRoleID || roleID === adminRoleID) {
throw new ServerError('invalid_parameters');
}
if (membersWithRole.length > 0) {
await updateRole(viewer, {
threadID: community,
memberIDs: membersWithRole,
role: defaultRoleID,
});
}
const deleteFromRolesQuery = SQL`
DELETE FROM roles
WHERE id = ${roleID}
AND thread = ${community}
`;
await dbQuery(deleteFromRolesQuery);
const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community,
});
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community];
const time = Date.now();
const updateDatas = [];
for (const memberInfo of serverThreadInfo.members) {
updateDatas.push({
type: updateTypes.UPDATE_THREAD,
userID: memberInfo.id,
time,
threadID: community,
});
}
const { viewerUpdates } = await createUpdates(updateDatas, {
viewer,
updatesForCurrentSession: 'return',
});
const { threadInfos: rawThreadInfos } = rawThreadInfosFromServerThreadInfos(
viewer,
fetchServerThreadInfosResult,
);
const rawThreadInfo = rawThreadInfos[community];
return {
threadInfo: rawThreadInfo,
updatesResult: {
newUpdates: viewerUpdates,
},
};
}
export { deleteOrphanedRoles, deleteRole };
View Options

native/socket.react.js

Loading...
View Options

web/settings/account-delete-modal.react.js

Loading...
View Options

web/settings/account-settings.react.js

Loading...
View Options

web/socket.react.js

Loading...