Page MenuHomePhabricator
Differential D9113

[native] get notifications one time keys
ClosedPublic
Actions

Authored by varun on Sep 8 2023, 9:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 20, 1:06 PM
Unknown Object (File)
Sun, Apr 20, 3:06 AM
Unknown Object (File)
Sat, Apr 19, 7:54 PM
Unknown Object (File)
Sat, Apr 19, 9:00 AM
Unknown Object (File)
Thu, Apr 17, 12:36 PM
Unknown Object (File)
Wed, Apr 9, 9:28 AM
Unknown Object (File)
Mar 27 2025, 3:50 AM
Unknown Object (File)
Mar 16 2025, 11:15 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
Commits
rCOMMf13fe4b8c615: [native] get notifications one time keys
Summary

we need to send the notif one time keys to the identity service

depends on D9085

Test Plan

console logged the getNotificationsOneTimeKeys output. got the following when trying to get 2 and 8 keys:

LOG  2 notif one time keys: {"curve25519":{"AAAAAQ":"yiyPOxAtEM9W3vLbCrGmgLSI1uN87Io22aIqAyV4GS8","AAAAAg":"Wh4RI2Ipnheh2bVVg27vYPh+665+SpM2H4IVNdBdjlg"}}
LOG  8 notif one time keys: {"curve25519":{"AAAAAw":"nx6pjgnIlwon6JJBDwMoHUTJuGQyWXlaKiNIUk38nF4","AAAABA":"5+TOgrUPJarYKGIyDLhFYxBTQUN5JLZIFQitNJoYDFY","AAAABQ":"NqY6yqiWvPco6OyVfQXOFHHsFnNToBojCBoUZaxobCQ","AAAACA":"GaVutqDQ5tnlwrOfb6EhSFSay/Al0l9mpeNBsLRiY3E","AAAABw":"JzZarwDf3zcN7Op+aNQWoeuEiGFU8BAyvykhOW1cUmQ","AAAACQ":"qAcrrP558HCYEeu3BZ+QTJY9BNfr5z96lfSjmDDtYlQ","AAAABg":"W4N7CBlV3UPdDdI32TpCYHTXL+EilPqH7RQMN4ijXzo","AAAACg":"T1vCUTrmmR/PpalbWZF1Zm1CLWsYaeLWJZnTx/vWf2s"}}

Diff Detail

Repository
rCOMM Comm
Branch
native (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
3 lines
26 lines
_generated/
schema/
3 lines

Diff 30873

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines
View Options

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines
View Options

native/cpp/CommonCpp/_generated/commJSI.h

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines
View Options

native/schema/CommCoreModuleSchema.js

Loading...