Paths

Table of Contentst

-
web/
-
database/worker/
-
worker/
-
backup.js
-
db-worker.js
-
types/
-
worker-types.js

[web] Restore logs
ClosedPublic
Actions

Authored by michal on Feb 12 2024, 7:29 AM.

Details

Reviewers

marcin
bartek
kamil

Commits

rCOMMbc8f71d25837: [web] Restore logs

Summary

After restoring the compaction we can restore the logs, using another key passed in the message.

Depends on D11043

Test Plan

Add logging to the native client so that it logs backupID and encryption keys for compaction and logs
Upload a new compaction from native with a draft
Add a new draft, so that there are logs created
Send restore message on web with values logged from native
Reload web app
Check that both drafts (from compaction and logs) exists now on web. Check that the enabled apps are the same as before restore (redux persist didn't change)

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

michal created this revision.Feb 12 2024, 7:29 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 12 2024, 7:29 AM

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 12 2024, 7:34 AM

Harbormaster failed remote builds in B26764: Diff 37003!

Rebase

michal added a child revision: D11074: [native] Stop backup client in background.Feb 14 2024, 6:26 AM

michal published this revision for review.Feb 14 2024, 6:43 AM

Harbormaster failed remote builds in B26830: Diff 37073!Feb 14 2024, 11:34 AM

marcin accepted this revision.Feb 19 2024, 4:40 AM

This revision is now accepted and ready to land.Feb 19 2024, 4:40 AM

marcin added inline comments.Feb 19 2024, 4:44 AM

web/database/worker/backup.js
58 ↗	(On Diff #37073)	This method can throw and in case it does error message isn't directly understandable by JS. Please before you land: Wrap the call to `sqliteQueryExecutor` with `try{} .. catch{}` and log error using `getExceptionMessage` from dbModule.

marcin mentioned this in D11043: [web] Restore compaction.Feb 19 2024, 4:46 AM

Fix error handling.

Harbormaster completed remote builds in B26976: Diff 37335.Feb 19 2024, 10:01 AM

kamil accepted this revision.Feb 21 2024, 4:55 AM

Closed by commit rCOMMbc8f71d25837: [web] Restore logs (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMar 6 2024, 6:13 AM

This revision was automatically updated to reflect the committed changes.

Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMbc8f71d25837: [web] Restore logs.

Revision Contents
Changeset List

Path

Size

web/

database/

worker/

backup.js

8 lines

db-worker.js

1 line

types/

worker-types.js

1 line

Diff 37003

View Options

web/database/worker/backup.js

Show All 40 Lines

import { TextInput } from './modal-components.react.js';		import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js';		import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js';		import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';		import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js';		import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';		import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js';		import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js';		import {
		AppOutOfDateAlertDetails,
		UsernameReservedAlertDetails,
		UsernameTakenAlertDetails,
		} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js';		import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';		import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js';		import { type StateContainer } from '../utils/state-container.js';

type WritableRegisterState = {		type WritableRegisterState = {
usernameInputText: string,		usernameInputText: string,
passwordInputText: string,		passwordInputText: string,
confirmPasswordInputText: string,		confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines	try {
await setNativeCredentials({		await setNativeCredentials({
username: result.currentUserInfo.username,		username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText,		password: this.props.registerState.state.passwordInputText,
});		});
return result;		return result;
} catch (e) {		} catch (e) {
if (e.message === 'username_reserved') {		if (e.message === 'username_reserved') {
Alert.alert(		Alert.alert(
'Username reserved',		UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' +		UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'username_taken') {		} else if (e.message === 'username_taken') {
Alert.alert(		Alert.alert(
'Username taken',		UsernameTakenAlertDetails.title,
'An account with that username already exists',		UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'client_version_unsupported') {		} else if (e.message === 'client_version_unsupported') {
Alert.alert(		Alert.alert(
AppOutOfDateAlertDetails.title,		AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message,		AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],		[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

View Options

web/database/worker/db-worker.js

Show All 40 Lines

import { TextInput } from './modal-components.react.js';		import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js';		import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js';		import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';		import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js';		import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';		import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js';		import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js';		import {
		AppOutOfDateAlertDetails,
		UsernameReservedAlertDetails,
		UsernameTakenAlertDetails,
		} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js';		import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';		import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js';		import { type StateContainer } from '../utils/state-container.js';

type WritableRegisterState = {		type WritableRegisterState = {
usernameInputText: string,		usernameInputText: string,
passwordInputText: string,		passwordInputText: string,
confirmPasswordInputText: string,		confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines	try {
await setNativeCredentials({		await setNativeCredentials({
username: result.currentUserInfo.username,		username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText,		password: this.props.registerState.state.passwordInputText,
});		});
return result;		return result;
} catch (e) {		} catch (e) {
if (e.message === 'username_reserved') {		if (e.message === 'username_reserved') {
Alert.alert(		Alert.alert(
'Username reserved',		UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' +		UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'username_taken') {		} else if (e.message === 'username_taken') {
Alert.alert(		Alert.alert(
'Username taken',		UsernameTakenAlertDetails.title,
'An account with that username already exists',		UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'client_version_unsupported') {		} else if (e.message === 'client_version_unsupported') {
Alert.alert(		Alert.alert(
AppOutOfDateAlertDetails.title,		AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message,		AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],		[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

View Options

web/types/worker-types.js

Show All 40 Lines

import { TextInput } from './modal-components.react.js';		import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js';		import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js';		import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';		import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js';		import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';		import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js';		import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js';		import {
		AppOutOfDateAlertDetails,
		UsernameReservedAlertDetails,
		UsernameTakenAlertDetails,
		} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js';		import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';		import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js';		import { type StateContainer } from '../utils/state-container.js';

type WritableRegisterState = {		type WritableRegisterState = {
usernameInputText: string,		usernameInputText: string,
passwordInputText: string,		passwordInputText: string,
confirmPasswordInputText: string,		confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines	try {
await setNativeCredentials({		await setNativeCredentials({
username: result.currentUserInfo.username,		username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText,		password: this.props.registerState.state.passwordInputText,
});		});
return result;		return result;
} catch (e) {		} catch (e) {
if (e.message === 'username_reserved') {		if (e.message === 'username_reserved') {
Alert.alert(		Alert.alert(
'Username reserved',		UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' +		UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'username_taken') {		} else if (e.message === 'username_taken') {
Alert.alert(		Alert.alert(
'Username taken',		UsernameTakenAlertDetails.title,
'An account with that username already exists',		UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],		[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },		{ cancelable: false },
);		);
} else if (e.message === 'client_version_unsupported') {		} else if (e.message === 'client_version_unsupported') {
Alert.alert(		Alert.alert(
AppOutOfDateAlertDetails.title,		AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message,		AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],		[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

[web] Restore logsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 37003

web/database/worker/backup.js

web/database/worker/db-worker.js

web/types/worker-types.js

[web] Restore logs
ClosedPublic
Actions

Revision Contents
Changeset List