[Keyserver] Refactor prekey lifecycle logic
AbandonedPublic
Actions

Authored by • jon on Jul 11 2023, 10:00 AM.

Details

Reviewers

kamil
michal

Summary

This is useful in implementing the identity
integration, refactor this logic into their own methods.

Part of https://linear.app/comm/issue/ENG-3944

Depends on D8473

Test Plan

N/A, tested in later diff

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Jul 11 2023, 10:00 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 11 2023, 10:00 AM

• jon added a child revision: D8475: [Keyserver] Refactor identity utilities.Jul 11 2023, 10:03 AM

Harbormaster completed remote builds in B20869: Diff 28589.Jul 11 2023, 10:17 AM

• jon requested review of this revision.Jul 11 2023, 10:17 AM

kamil accepted this revision.Jul 17 2023, 2:48 AM

kamil added inline comments.

keyserver/src/utils/olm-utils.js
92–101	you can early exit here to make the return statement simpler (this also applies to `shouldRotatePrekey`)
103	based on the previous stack `async` here is not needed but it looks like you did not rebase this diff

This revision is now accepted and ready to land.Jul 17 2023, 2:48 AM

I rebased this into D8476. But I applied your suggestion @kamil, thanks

• jon removed a parent revision: D8473: [Keyserver/rust] Add publish_prekeys implementation.Jul 24 2023, 6:41 AM

• jon removed a child revision: D8475: [Keyserver] Refactor identity utilities.

• jon added a child revision: D8475: [Keyserver] Refactor identity utilities.Aug 17 2023, 8:19 AM

Revision Contents
Changeset List

Path

Size

keyserver/

src/

utils/

olm-utils.js

31 lines

Diff 28589

View Options

keyserver/src/utils/olm-utils.js

	#include "CommCoreModule.h"			#include "CommCoreModule.h"
	#include "../CryptoTools/DeviceID.h"			#include "../CryptoTools/DeviceID.h"
	#include "../Notifications/BackgroundDataStorage/NotificationsCryptoModule.h"			#include "../Notifications/BackgroundDataStorage/NotificationsCryptoModule.h"
	#include "BaseDataStore.h"			#include "BaseDataStore.h"
	#include "DatabaseManager.h"			#include "DatabaseManager.h"
	#include "InternalModules/GlobalDBSingleton.h"			#include "InternalModules/GlobalDBSingleton.h"
	#include "InternalModules/RustPromiseManager.h"
	#include "NativeModuleUtils.h"			#include "NativeModuleUtils.h"
	#include "TerminateApp.h"			#include "TerminateApp.h"
	#include "lib.rs.h"

	#include <ReactCommon/TurboModuleUtils.h>			#include <ReactCommon/TurboModuleUtils.h>
	#include <folly/dynamic.h>			#include <folly/dynamic.h>
	#include <folly/json.h>			#include <folly/json.h>
	#include <future>			#include <future>

	namespace comm {			namespace comm {

	▲ Show 20 Lines • Show All 782 Lines • ▼ Show 20 Lines
	bool CommCoreModule::checkIfDatabaseNeedsDeletion(jsi::Runtime &rt) {			bool CommCoreModule::checkIfDatabaseNeedsDeletion(jsi::Runtime &rt) {
	return DatabaseManager::checkIfDatabaseNeedsDeletion();			return DatabaseManager::checkIfDatabaseNeedsDeletion();
	}			}

	void CommCoreModule::reportDBOperationsFailure(jsi::Runtime &rt) {			void CommCoreModule::reportDBOperationsFailure(jsi::Runtime &rt) {
	DatabaseManager::reportDBOperationsFailure();			DatabaseManager::reportDBOperationsFailure();
	}			}

	jsi::Value CommCoreModule::generateNonce(jsi::Runtime &rt) {
	return createPromiseAsJSIValue(
	rt, [this](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
	std::string error;
	try {
	auto currentID = RustPromiseManager::instance.addPromise(
	promise, this->jsInvoker_, innerRt);
	identityGenerateNonce(currentID);
	} catch (const std::exception &e) {
	error = e.what();
	};
	});
	}

	jsi::Value CommCoreModule::registerUser(
	jsi::Runtime &rt,
	jsi::String username,
	jsi::String password,
	jsi::String keyPayload,
	jsi::String keyPayloadSignature,
	jsi::String contentPrekey,
	jsi::String contentPrekeySignature,
	jsi::String notifPrekey,
	jsi::String notifPrekeySignature,
	jsi::Array contentOneTimeKeys,
	jsi::Array notifOneTimeKeys) {
	return createPromiseAsJSIValue(
	rt,
	[this,
	&username,
	&password,
	&keyPayload,
	&keyPayloadSignature,
	&contentPrekey,
	&contentPrekeySignature,
	&notifPrekey,
	&notifPrekeySignature,
	&contentOneTimeKeys,
	&notifOneTimeKeys](
	jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
	std::string error;
	try {
	auto currentID = RustPromiseManager::instance.addPromise(
	promise, this->jsInvoker_, innerRt);
	identityRegisterUser(
	jsiStringToRustString(username, innerRt),
	jsiStringToRustString(password, innerRt),
	jsiStringToRustString(keyPayload, innerRt),
	jsiStringToRustString(keyPayloadSignature, innerRt),
	jsiStringToRustString(contentPrekey, innerRt),
	jsiStringToRustString(contentPrekeySignature, innerRt),
	jsiStringToRustString(notifPrekey, innerRt),
	jsiStringToRustString(notifPrekeySignature, innerRt),
	jsiStringArrayToRustVec(contentOneTimeKeys, innerRt),
	jsiStringArrayToRustVec(notifOneTimeKeys, innerRt),
	currentID);
	} catch (const std::exception &e) {
	error = e.what();
	};
	});
	}

	jsi::Value CommCoreModule::loginPasswordUser(
	jsi::Runtime &rt,
	jsi::String username,
	jsi::String password,
	jsi::String keyPayload,
	jsi::String keyPayloadSignature,
	jsi::String contentPrekey,
	jsi::String contentPrekeySignature,
	jsi::String notifPrekey,
	jsi::String notifPrekeySignature,
	jsi::Array contentOneTimeKeys,
	jsi::Array notifOneTimeKeys) {
	return createPromiseAsJSIValue(
	rt,
	[this,
	&username,
	&password,
	&keyPayload,
	&keyPayloadSignature,
	&contentPrekey,
	&contentPrekeySignature,
	&notifPrekey,
	&notifPrekeySignature,
	&contentOneTimeKeys,
	&notifOneTimeKeys](
	jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
	std::string error;
	try {
	auto currentID = RustPromiseManager::instance.addPromise(
	promise, this->jsInvoker_, innerRt);
	identityLoginPasswordUser(
	jsiStringToRustString(username, innerRt),
	jsiStringToRustString(password, innerRt),
	jsiStringToRustString(keyPayload, innerRt),
	jsiStringToRustString(keyPayloadSignature, innerRt),
	jsiStringToRustString(contentPrekey, innerRt),
	jsiStringToRustString(contentPrekeySignature, innerRt),
	jsiStringToRustString(notifPrekey, innerRt),
	jsiStringToRustString(notifPrekeySignature, innerRt),
	jsiStringArrayToRustVec(contentOneTimeKeys, innerRt),
	jsiStringArrayToRustVec(notifOneTimeKeys, innerRt),
	currentID);
	} catch (const std::exception &e) {
	error = e.what();
	};
	});
	}

	jsi::Value CommCoreModule::loginWalletUser(
	jsi::Runtime &rt,
	jsi::String siweMessage,
	jsi::String siweSignature,
	jsi::String keyPayload,
	jsi::String keyPayloadSignature,
	jsi::String contentPrekey,
	jsi::String contentPrekeySignature,
	jsi::String notifPrekey,
	jsi::String notifPrekeySignature,
	jsi::Array contentOneTimeKeys,
	jsi::Array notifOneTimeKeys,
	jsi::String socialProof) {
	return createPromiseAsJSIValue(
	rt,
	[this,
	&siweMessage,
	&siweSignature,
	&keyPayload,
	&keyPayloadSignature,
	&contentPrekey,
	&contentPrekeySignature,
	&notifPrekey,
	&notifPrekeySignature,
	&contentOneTimeKeys,
	&notifOneTimeKeys,
	&socialProof](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
	std::string error;
	try {
	auto currentID = RustPromiseManager::instance.addPromise(
	promise, this->jsInvoker_, innerRt);
	identityLoginWalletUser(
	jsiStringToRustString(siweMessage, innerRt),
	jsiStringToRustString(siweSignature, innerRt),
	jsiStringToRustString(keyPayload, innerRt),
	jsiStringToRustString(keyPayloadSignature, innerRt),
	jsiStringToRustString(contentPrekey, innerRt),
	jsiStringToRustString(contentPrekeySignature, innerRt),
	jsiStringToRustString(notifPrekey, innerRt),
	jsiStringToRustString(notifPrekeySignature, innerRt),
	jsiStringArrayToRustVec(contentOneTimeKeys, innerRt),
	jsiStringArrayToRustVec(notifOneTimeKeys, innerRt),
	jsiStringToRustString(socialProof, innerRt),
	currentID);
	} catch (const std::exception &e) {
	error = e.what();
	};
	});
	}

	} // namespace comm			} // namespace comm

[Keyserver] Refactor prekey lifecycle logicAbandonedPublicActions