Page MenuHomePhabricator
Differential D8751

[Keyserver] Refactor getOneTimeKeyValues
ClosedPublic
Actions

Authored by kamil on Aug 7 2023, 8:21 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 5:58 AM
Unknown Object (File)
Sun, Mar 16, 11:25 PM
Unknown Object (File)
Thu, Mar 13, 7:36 AM
Unknown Object (File)
Sat, Mar 8, 7:08 AM
Unknown Object (File)
Sat, Mar 8, 7:08 AM
Unknown Object (File)
Sat, Mar 8, 7:08 AM
Unknown Object (File)
Sat, Mar 8, 7:08 AM
Unknown Object (File)
Sat, Mar 8, 7:07 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
• jon
Commits
rCOMM0d30bbfc847b: [Keyserver] Refactor getOneTimeKeyValues
Summary

This is useful for more than the current login workflow,
refactor to separate file

In support of https://linear.app/comm/issue/ENG-4602

Depends on D8750

Test Plan
# Start localstack and rabbitmq
comm-dev services start

(cd services/identity && cargo run -- server)
(cd services/tunnelbroker && cargo run)

# If keyserver has already logged in, reset user_id entry in metadata table
# This will force keyserver to re-login

cd keyserver
yarn dev

# Assert the user is populated in MariaDB

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Aug 7 2023, 8:21 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 7 2023, 8:21 AM
• jon added a child revision: D8752: [Keyserver] Upload new onetime keys to identity service when requested.Aug 7 2023, 8:25 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Aug 7 2023, 8:36 AM
Harbormaster failed remote builds in B21567: Diff 29591!
• jon updated this revision to Diff 30026.Aug 17 2023, 10:19 AM

Fix type import

Harbormaster completed remote builds in B21852: Diff 30026.Aug 17 2023, 10:36 AM
• jon requested review of this revision.Aug 17 2023, 10:36 AM
marcin accepted this revision.Aug 21 2023, 1:54 AM
This revision is now accepted and ready to land.Aug 21 2023, 1:54 AM
kamil commandeered this revision.Sep 8 2023, 7:32 AM
kamil edited reviewers, added: • jon; removed: kamil.
ashoat mentioned this in D9129: [lib] utility function to get array of OneTimeKeys from an OLMOneTimeKeys object.Sep 12 2023, 11:28 AM
kamil updated this revision to Diff 31034.Sep 13 2023, 6:00 AM

rebase before landing

Harbormaster completed remote builds in B22581: Diff 31034.Sep 13 2023, 6:17 AM
Closed by commit rCOMM0d30bbfc847b: [Keyserver] Refactor getOneTimeKeyValues (authored by • jon, committed by kamil). · Explain WhySep 13 2023, 6:43 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM0d30bbfc847b: [Keyserver] Refactor getOneTimeKeyValues.

Revision Contents
Changeset List

PathSize
keyserver/
src/
user/
12 lines
utils/
13 lines

Diff 31040

View Options

keyserver/src/user/login.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines
View Options

keyserver/src/utils/olm-utils.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines