Page MenuHomePhabricator
Differential D7695

[native] register user on native (C++ changes)
ClosedPublic
Actions

Authored by varun on May 1 2023, 7:26 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 11:43 AM
Unknown Object (File)
Mon, Apr 21, 1:31 AM
Unknown Object (File)
Wed, Apr 16, 12:28 AM
Unknown Object (File)
Tue, Apr 15, 10:32 PM
Unknown Object (File)
Sun, Apr 13, 4:23 PM
Unknown Object (File)
Sun, Apr 13, 12:10 PM
Unknown Object (File)
Sun, Apr 13, 11:42 AM
Unknown Object (File)
Thu, Apr 10, 11:43 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
ashoat
Commits
rCOMM552ea82de18b: [native] register user on native (C++ changes)
Summary

add registerUser function to CommCoreModule

Test Plan

successfully registered a new user from js

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.May 1 2023, 7:26 AM
Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 1 2023, 7:26 AM
Harbormaster completed remote builds in B18955: Diff 25965.May 1 2023, 7:45 AM
varun requested review of this revision.May 1 2023, 7:45 AM
varun added a parent revision: D7694: [native] register user on native (rust changes).May 1 2023, 7:46 AM
ashoat added a comment.May 1 2023, 8:34 AM

Are any CMake changes necessary here? Or does it work because of a GLOB somewhere?

varun updated this revision to Diff 26025.May 2 2023, 4:49 PM

rename identity -> content

varun added a comment.May 2 2023, 4:51 PM
In D7695#228038, @ashoat wrote:

Are any CMake changes necessary here? Or does it work because of a GLOB somewhere?

we glob the files ("MODULE_ROOT_NATIVE_CODE") so no CMake changes needed

Harbormaster completed remote builds in B19005: Diff 26025.May 2 2023, 5:07 PM
varun added a child revision: D7706: [native] login password user on native (rust changes).May 2 2023, 5:09 PM
ashoat added inline comments.May 3 2023, 6:20 AM
native/cpp/CommonCpp/NativeModules/JSIRust.cpp
6 ↗(On Diff #26025)

You should #include all of the stuff you use, so eg. #include <string> for this

varun updated this revision to Diff 26045.May 3 2023, 1:26 PM

include string

varun edited reviewers, added: ashoat; removed: tomek.May 3 2023, 1:26 PM
ashoat accepted this revision.May 3 2023, 1:29 PM

Seems good to me (assuming it passes CI)

This revision is now accepted and ready to land.May 3 2023, 1:29 PM
Harbormaster completed remote builds in B19018: Diff 26045.May 3 2023, 1:46 PM
Closed by commit rCOMM552ea82de18b: [native] register user on native (C++ changes) (authored by varun). · Explain WhyMay 3 2023, 2:02 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM552ea82de18b: [native] register user on native (C++ changes).

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
14 lines
48 lines
12 lines
25 lines
_generated/
ios/
Comm.xcodeproj/
6 lines
native_rust_library/
src/
2 lines
schema/
12 lines

Diff 26045

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/cpp/CommonCpp/NativeModules/JSIRust.h

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/cpp/CommonCpp/NativeModules/JSIRust.cpp

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

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

Loading...
View Options

native/cpp/CommonCpp/_generated/commJSI.h

Loading...
View Options

native/ios/Comm.xcodeproj/project.pbxproj

Loading...
View Options

native/native_rust_library/src/lib.rs

Loading...
View Options

native/schema/CommCoreModuleSchema.js

Loading...