Page MenuHomePhabricator
Differential D7669

Establish olm notifs sessions during siwe account creation
ClosedPublic
Actions

Authored by marcin on Apr 27 2023, 8:14 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 7:02 AM
Unknown Object (File)
Tue, Mar 18, 7:02 AM
Unknown Object (File)
Tue, Mar 18, 7:02 AM
Unknown Object (File)
Tue, Mar 18, 7:01 AM
Unknown Object (File)
Tue, Mar 18, 7:01 AM
Unknown Object (File)
Tue, Mar 18, 7:01 AM
Unknown Object (File)
Tue, Mar 18, 7:01 AM
Unknown Object (File)
Tue, Mar 18, 7:01 AM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
atul
bartek
ashoat
Commits
rCOMM836bc26762dd: Establish olm notifs sessions during siwe account creation
rCOMM8c78e9a9a193: Establish olm notifs sessions during siwe account creation
Summary

This differential implements olm notifs session establishment during siwe account creation.

Test Plan

Create siwe account. Ensure there is noew entry in olm_sessions table

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

marcin created this revision.Apr 27 2023, 8:14 AM
Herald added a subscriber: ashoat. · View Herald TranscriptApr 27 2023, 8:14 AM
marcin added a parent revision: D7657: Establish olm notifs session on both sides during registration.Apr 27 2023, 8:15 AM
Harbormaster completed remote builds in B18877: Diff 25855.Apr 27 2023, 8:32 AM
marcin requested review of this revision.Apr 27 2023, 8:32 AM
marcin updated this revision to Diff 26007.May 2 2023, 8:36 AM

Rebase

Harbormaster completed remote builds in B18990: Diff 26007.May 2 2023, 9:01 AM
ashoat accepted this revision.May 2 2023, 10:14 AM
This revision is now accepted and ready to land.May 2 2023, 10:14 AM
marcin updated this revision to Diff 26400.May 11 2023, 5:54 AM

Rebase

Harbormaster completed remote builds in B19287: Diff 26400.May 11 2023, 6:15 AM
marcin added a child revision: D7797: Implement olm session updater that has encrypting functionality.May 11 2023, 7:22 AM
marcin added a child revision: D7856: Add request and response types for the keyserver to request first encrypted message for e2e notifs.May 18 2023, 5:02 AM
marcin added a child revision: D7853: Create new olm session during invalidated cookie resolution.May 18 2023, 5:41 AM
marcin removed a child revision: D7856: Add request and response types for the keyserver to request first encrypted message for e2e notifs.
marcin removed a child revision: D7797: Implement olm session updater that has encrypting functionality.
marcin updated this revision to Diff 26743.May 22 2023, 1:48 AM

Rebase before landing

Harbormaster completed remote builds in B19562: Diff 26743.May 22 2023, 2:19 AM
marcin updated this revision to Diff 26752.May 22 2023, 3:30 AM

Rename call to get and rebase before landing

Harbormaster completed remote builds in B19571: Diff 26752.May 22 2023, 3:48 AM
marcin updated this revision to Diff 27174.May 29 2023, 11:36 AM

Rebase before landing

Harbormaster completed remote builds in B19843: Diff 27174.May 29 2023, 12:05 PM
Closed by commit rCOMM8c78e9a9a193: Establish olm notifs sessions during siwe account creation (authored by marcin). · Explain WhyMay 29 2023, 1:41 PM
This revision was automatically updated to reflect the committed changes.
marcin added a commit: rCOMM8c78e9a9a193: Establish olm notifs sessions during siwe account creation.
ashoat added a reverting change: rCOMMac32a79404e3: Revert "Establish olm notifs sessions during siwe account creation".May 31 2023, 4:51 AM
marcin reopened this revision.May 31 2023, 8:36 AM
This revision is now accepted and ready to land.May 31 2023, 8:36 AM
marcin updated this revision to Diff 27342.Jun 1 2023, 6:08 AM

Rebase before landing

Harbormaster completed remote builds in B19952: Diff 27342.Jun 1 2023, 6:27 AM
Closed by commit rCOMM836bc26762dd: Establish olm notifs sessions during siwe account creation (authored by marcin). · Explain WhyJun 1 2023, 6:55 AM
This revision was automatically updated to reflect the committed changes.
marcin added a commit: rCOMM836bc26762dd: Establish olm notifs sessions during siwe account creation.

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
3 lines
lib/
types/
1 line
native/
account/
18 lines

Diff 27348

View Options

keyserver/src/responders/user-responders.js

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines
View Options

lib/types/siwe-types.js

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines
View Options

native/account/siwe-hooks.js

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines