Page MenuHomePhabricator
Differential D13617

[blob] Move HTTP request/response types to comm-lib
ClosedPublic
Actions

Authored by bartek on Oct 4 2024, 11:43 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 9:23 PM
Unknown Object (File)
Mon, Mar 17, 7:32 PM
Unknown Object (File)
Sat, Mar 15, 3:18 AM
Unknown Object (File)
Wed, Mar 12, 2:32 AM
Unknown Object (File)
Tue, Mar 11, 7:30 AM
Unknown Object (File)
Tue, Mar 11, 6:25 AM
Unknown Object (File)
Feb 17 2025, 11:04 AM
Unknown Object (File)
Feb 17 2025, 11:04 AM
View All 82 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
varun
will
Commits
rCOMMb6f911a681b1: [blob] Move HTTP request/response types to comm-lib
Summary

These types can (and generally should) be shared with the BlobServiceClient living in the comm-lib.
Unified them with types existing in comm-lib so request and response structs are now shared between client and server

Depends on D13616

Test Plan

cargo check

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bartek created this revision.Oct 4 2024, 11:43 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptOct 4 2024, 11:43 AM
bartek added a child revision: D13618: [blob] Add DB method to query holders by prefix.Oct 4 2024, 11:46 AM
Harbormaster completed remote builds in B32079: Diff 44912.Oct 4 2024, 12:01 PM
bartek retitled this revision from [blob] Move BlobHashAndHolder struct to parent mod to [blob] Move HTTP request/response types to comm-lib.Oct 9 2024, 12:28 AM
bartek edited the summary of this revision. (Show Details)
bartek updated this revision to Diff 44989.Oct 9 2024, 12:31 AM

Share types between client and server

Harbormaster completed remote builds in B32119: Diff 44989.Oct 9 2024, 12:49 AM
bartek published this revision for review.Oct 9 2024, 1:12 AM
bartek added a child revision: D13644: [comm-lib] Add remove_multiple_holders to Blob client.Oct 9 2024, 1:15 AM
bartek mentioned this in D13655: [lib] Add types for Blob Service requests and responses.Oct 9 2024, 2:13 AM
kamil accepted this revision.Oct 10 2024, 1:16 AM
kamil added inline comments.
shared/comm-lib/src/blob/types.rs
1 ↗(On Diff #44989)

nit: can you standarize empty lines between structs and comments below? (if there is some pattern I don't see - sorry in advance, but it seems a bit messy)

This revision is now accepted and ready to land.Oct 10 2024, 1:16 AM
Closed by commit rCOMMb6f911a681b1: [blob] Move HTTP request/response types to comm-lib (authored by bartek). · Explain WhyOct 10 2024, 2:06 PM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMb6f911a681b1: [blob] Move HTTP request/response types to comm-lib.
bartek mentioned this in rCOMM11b6ebffce87: [lib] Add types for Blob Service requests and responses.

Revision Contents
Changeset List

PathSize
services/
blob/
src/
http/
handlers/
8 lines
1 line
8 lines

Diff 44912

View Options

services/blob/src/http/handlers/holders.rs

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

services/blob/src/main.rs

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

services/blob/src/types.rs

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