Page MenuHomePhabricator
Differential D8193

[native] keyserverUsername -> keyserverURL
ClosedPublic
Actions

Authored by ashoat on Jun 13 2023, 9:59 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 11:13 AM
Unknown Object (File)
Tue, Mar 18, 11:13 AM
Unknown Object (File)
Tue, Mar 18, 11:12 AM
Unknown Object (File)
Tue, Mar 18, 11:08 AM
Unknown Object (File)
Wed, Mar 12, 5:13 AM
Unknown Object (File)
Sun, Feb 23, 3:43 PM
Unknown Object (File)
Sun, Feb 23, 3:43 PM
Unknown Object (File)
Sun, Feb 23, 3:43 PM
View All Files
Subscribers
tomek

Details

Reviewers
atul
ginsu
Commits
rCOMMcb5e3171ecad: [native] keyserverUsername -> keyserverURL
Summary

We're going to use a URL for the keyserver for now, since the identity service isn't ready for querying keyservers by username yet.

This is a simple rename diff.

Depends on D8192

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

Diff 27732

View Options

native/account/registration/avatar-selection.react.js

Show All 28 Linesimport {
EmojiAvatarSelectionRouteName, EmojiAvatarSelectionRouteName,
RegistrationUserAvatarCameraModalRouteName, RegistrationUserAvatarCameraModalRouteName,
} from '../../navigation/route-names.js'; } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
export type AvatarSelectionParams = { export type AvatarSelectionParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverURL: string,
+accountSelection: AccountSelection, +accountSelection: AccountSelection,
}, },
}; };
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'AvatarSelection'>, +navigation: RegistrationNavigationProp<'AvatarSelection'>,
+route: NavigationRoute<'AvatarSelection'>, +route: NavigationRoute<'AvatarSelection'>,
}; };
▲ Show 20 Lines • Show All 157 Lines • Show Last 20 Lines
View Options

native/account/registration/connect-ethereum.react.js

Show All 38 Lines
const exactSearchUserLoadingStatusSelector = createLoadingStatusSelector( const exactSearchUserLoadingStatusSelector = createLoadingStatusSelector(
exactSearchUserActionTypes, exactSearchUserActionTypes,
); );
export type ConnectEthereumParams = { export type ConnectEthereumParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverURL: string,
}, },
}; };
type PanelState = 'closed' | 'opening' | 'open' | 'closing'; type PanelState = 'closed' | 'opening' | 'open' | 'closing';
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'ConnectEthereum'>, +navigation: RegistrationNavigationProp<'ConnectEthereum'>,
+route: NavigationRoute<'ConnectEthereum'>, +route: NavigationRoute<'ConnectEthereum'>,
▲ Show 20 Lines • Show All 248 Lines • Show Last 20 Lines
View Options

native/account/registration/keyserver-selection.react.js

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Linestype Props = {
+navigation: RegistrationNavigationProp<'KeyserverSelection'>, +navigation: RegistrationNavigationProp<'KeyserverSelection'>,
+route: NavigationRoute<'KeyserverSelection'>, +route: NavigationRoute<'KeyserverSelection'>,
}; };
function KeyserverSelection(props: Props): React.Node { function KeyserverSelection(props: Props): React.Node {
const registrationContext = React.useContext(RegistrationContext); const registrationContext = React.useContext(RegistrationContext);
invariant(registrationContext, 'registrationContext should be set'); invariant(registrationContext, 'registrationContext should be set');
const { cachedSelections, setCachedSelections } = registrationContext; const { cachedSelections, setCachedSelections } = registrationContext;
const initialKeyserverUsername = cachedSelections.keyserverUsername; const initialKeyserverURL = cachedSelections.keyserverURL;
const [customKeyserver, setCustomKeyserver] = React.useState( const [customKeyserver, setCustomKeyserver] = React.useState(
initialKeyserverUsername === defaultURLPrefix initialKeyserverURL === defaultURLPrefix ? '' : initialKeyserverURL,
? ''
: initialKeyserverUsername,
); );
const customKeyserverTextInputRef = React.useRef(); const customKeyserverTextInputRef = React.useRef();
let initialSelection; let initialSelection;
if (initialKeyserverUsername === defaultURLPrefix) { if (initialKeyserverURL === defaultURLPrefix) {
initialSelection = 'ashoat'; initialSelection = 'ashoat';
} else if (initialKeyserverUsername) { } else if (initialKeyserverURL) {
initialSelection = 'custom'; initialSelection = 'custom';
} }
const [currentSelection, setCurrentSelection] = const [currentSelection, setCurrentSelection] =
React.useState<?Selection>(initialSelection); React.useState<?Selection>(initialSelection);
const selectAshoat = React.useCallback(() => { const selectAshoat = React.useCallback(() => {
setCurrentSelection('ashoat'); setCurrentSelection('ashoat');
customKeyserverTextInputRef.current?.blur(); customKeyserverTextInputRef.current?.blur();
}, []); }, []);
const customKeyserverEmpty = !customKeyserver; const customKeyserverEmpty = !customKeyserver;
const selectCustom = React.useCallback(() => { const selectCustom = React.useCallback(() => {
setCurrentSelection('custom'); setCurrentSelection('custom');
if (customKeyserverEmpty) { if (customKeyserverEmpty) {
customKeyserverTextInputRef.current?.focus(); customKeyserverTextInputRef.current?.focus();
} }
}, [customKeyserverEmpty]); }, [customKeyserverEmpty]);
const onCustomKeyserverFocus = React.useCallback(() => { const onCustomKeyserverFocus = React.useCallback(() => {
setCurrentSelection('custom'); setCurrentSelection('custom');
}, []); }, []);
let keyserverUsername; let keyserverURL;
if (currentSelection === 'ashoat') { if (currentSelection === 'ashoat') {
keyserverUsername = defaultURLPrefix; keyserverURL = defaultURLPrefix;
} else if (currentSelection === 'custom' && customKeyserver) { } else if (currentSelection === 'custom' && customKeyserver) {
keyserverUsername = customKeyserver; keyserverURL = customKeyserver;
} }
const versionLoadingStatus = useSelector(getVersionLoadingStatusSelector); const versionLoadingStatus = useSelector(getVersionLoadingStatusSelector);
let buttonState = keyserverUsername ? 'enabled' : 'disabled'; let buttonState = keyserverURL ? 'enabled' : 'disabled';
if (versionLoadingStatus === 'loading') { if (versionLoadingStatus === 'loading') {
buttonState = 'loading'; buttonState = 'loading';
} }
const serverCallParamOverride = React.useMemo( const serverCallParamOverride = React.useMemo(
() => ({ () => ({
urlPrefix: keyserverUsername, urlPrefix: keyserverURL,
}), }),
[keyserverUsername], [keyserverURL],
); );
const getVersionCall = useServerCall(getVersion, serverCallParamOverride); const getVersionCall = useServerCall(getVersion, serverCallParamOverride);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const { navigate } = props.navigation; const { navigate } = props.navigation;
const { coolOrNerdMode } = props.route.params.userSelections; const { coolOrNerdMode } = props.route.params.userSelections;
const onSubmit = React.useCallback(async () => { const onSubmit = React.useCallback(async () => {
if (!keyserverUsername) { if (!keyserverURL) {
return; return;
} }
const getVersionPromise = getVersionCall(); const getVersionPromise = getVersionCall();
dispatchActionPromise(getVersionActionTypes, getVersionPromise); dispatchActionPromise(getVersionActionTypes, getVersionPromise);
// We don't care about the result; just need to make sure this doesn't throw // We don't care about the result; just need to make sure this doesn't throw
await getVersionPromise; await getVersionPromise;
setCachedSelections(oldUserSelections => ({ setCachedSelections(oldUserSelections => ({
...oldUserSelections, ...oldUserSelections,
keyserverUsername, keyserverURL,
})); }));
navigate<'ConnectEthereum'>({ navigate<'ConnectEthereum'>({
name: ConnectEthereumRouteName, name: ConnectEthereumRouteName,
params: { userSelections: { coolOrNerdMode, keyserverUsername } }, params: { userSelections: { coolOrNerdMode, keyserverURL } },
}); });
}, [ }, [
navigate, navigate,
coolOrNerdMode, coolOrNerdMode,
keyserverUsername, keyserverURL,
setCachedSelections, setCachedSelections,
dispatchActionPromise, dispatchActionPromise,
getVersionCall, getVersionCall,
]); ]);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const colors = useColors(); const colors = useColors();
return ( return (
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines
View Options

native/account/registration/password-selection.react.js

Show All 18 Linesimport {
AvatarSelectionRouteName, AvatarSelectionRouteName,
} from '../../navigation/route-names.js'; } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
import type { KeyPressEvent } from '../../types/react-native.js'; import type { KeyPressEvent } from '../../types/react-native.js';
export type PasswordSelectionParams = { export type PasswordSelectionParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverURL: string,
+username: string, +username: string,
}, },
}; };
type PasswordError = 'passwords_dont_match' | 'empty_password'; type PasswordError = 'passwords_dont_match' | 'empty_password';
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'PasswordSelection'>, +navigation: RegistrationNavigationProp<'PasswordSelection'>,
Show All 35 Linesfunction PasswordSelection(props: Props): React.Node {
const { userSelections } = props.route.params; const { userSelections } = props.route.params;
const { navigate } = props.navigation; const { navigate } = props.navigation;
const onProceed = React.useCallback(() => { const onProceed = React.useCallback(() => {
if (!checkPasswordValidity()) { if (!checkPasswordValidity()) {
return; return;
} }
const { coolOrNerdMode, keyserverUsername, username } = userSelections; const { coolOrNerdMode, keyserverURL, username } = userSelections;
const newUserSelections = { const newUserSelections = {
coolOrNerdMode, coolOrNerdMode,
keyserverUsername, keyserverURL,
accountSelection: { accountSelection: {
accountType: 'username', accountType: 'username',
username, username,
password, password,
}, },
}; };
setCachedSelections(oldUserSelections => ({ setCachedSelections(oldUserSelections => ({
...oldUserSelections, ...oldUserSelections,
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines
View Options

native/account/registration/registration-terms.react.js

Loading...
View Options

native/account/registration/registration-types.js

Loading...
View Options

native/account/registration/username-selection.react.js

Loading...