remove seed name from Registration tabs components

pull/1306/head
Audric Ackermann 5 years ago
parent 38c099cdf0
commit 730c520b22
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -15,7 +15,7 @@ import { StringUtils, ToastUtils } from '../../session/utils';
enum SignInMode { enum SignInMode {
Default, Default,
UsingSeed, UsingRecoveryPhrase,
LinkingDevice, LinkingDevice,
} }
@ -40,8 +40,8 @@ interface State {
validatePassword: string; validatePassword: string;
passwordErrorString: string; passwordErrorString: string;
passwordFieldsMatch: boolean; passwordFieldsMatch: boolean;
mnemonicSeed: string; recoveryPhrase: string;
generatedMnemonicSeed: string; generatedRecoveryPhrase: string;
hexGeneratedPubKey: string; hexGeneratedPubKey: string;
primaryDevicePubKey: string; primaryDevicePubKey: string;
mnemonicError: string | undefined; mnemonicError: string | undefined;
@ -116,8 +116,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
validatePassword: '', validatePassword: '',
passwordErrorString: '', passwordErrorString: '',
passwordFieldsMatch: false, passwordFieldsMatch: false,
mnemonicSeed: '', recoveryPhrase: '',
generatedMnemonicSeed: '', generatedRecoveryPhrase: '',
hexGeneratedPubKey: '', hexGeneratedPubKey: '',
primaryDevicePubKey: '', primaryDevicePubKey: '',
mnemonicError: undefined, mnemonicError: undefined,
@ -165,7 +165,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
} }
private async generateMnemonicAndKeyPair() { private async generateMnemonicAndKeyPair() {
if (this.state.generatedMnemonicSeed === '') { if (this.state.generatedRecoveryPhrase === '') {
const language = 'english'; const language = 'english';
const mnemonic = await this.accountManager.generateMnemonic(language); const mnemonic = await this.accountManager.generateMnemonic(language);
@ -184,7 +184,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
const hexGeneratedPubKey = StringUtils.decode(keyPair.pubKey, 'hex'); const hexGeneratedPubKey = StringUtils.decode(keyPair.pubKey, 'hex');
this.setState({ this.setState({
generatedMnemonicSeed: mnemonic, generatedRecoveryPhrase: mnemonic,
hexGeneratedPubKey, // our 'frontend' sessionID hexGeneratedPubKey, // our 'frontend' sessionID
}); });
} }
@ -203,7 +203,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
validatePassword: '', validatePassword: '',
passwordErrorString: '', passwordErrorString: '',
passwordFieldsMatch: false, passwordFieldsMatch: false,
mnemonicSeed: '', recoveryPhrase: '',
primaryDevicePubKey: '', primaryDevicePubKey: '',
mnemonicError: undefined, mnemonicError: undefined,
displayNameError: undefined, displayNameError: undefined,
@ -212,8 +212,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
private onSeedChanged(val: string) { private onSeedChanged(val: string) {
this.setState({ this.setState({
mnemonicSeed: val, recoveryPhrase: val,
mnemonicError: !val ? window.i18n('mnemonicEmpty') : undefined, mnemonicError: !val ? window.i18n('recoveryPhraseEmpty') : undefined,
}); });
} }
@ -397,13 +397,13 @@ export class RegistrationTabs extends React.Component<{}, State> {
private renderRegistrationContent() { private renderRegistrationContent() {
const { signInMode, signUpMode } = this.state; const { signInMode, signUpMode } = this.state;
if (signInMode === SignInMode.UsingSeed) { if (signInMode === SignInMode.UsingRecoveryPhrase) {
return ( return (
<div className={classNames('session-registration__entry-fields')}> <div className={classNames('session-registration__entry-fields')}>
<SessionInput <SessionInput
label={window.i18n('mnemonicSeed')} label={window.i18n('recoveryPhrase')}
type="password" type="password"
placeholder={window.i18n('enterSeed')} placeholder={window.i18n('enterRecoveryPhrase')}
enableShowHide={true} enableShowHide={true}
onValueChanged={(val: string) => { onValueChanged={(val: string) => {
this.onSeedChanged(val); this.onSeedChanged(val);
@ -553,7 +553,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
if (signInMode === SignInMode.Default) { if (signInMode === SignInMode.Default) {
return ( return (
<div> <div>
{this.renderRestoreUsingSeedButton( {this.renderRestoreUsingRecoveryPhraseButton(
SessionButtonType.BrandOutline, SessionButtonType.BrandOutline,
SessionButtonColor.Green SessionButtonColor.Green
)} )}
@ -574,7 +574,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
{!this.state.secretWords && ( {!this.state.secretWords && (
<> <>
<h4>{or}</h4> <h4>{or}</h4>
{this.renderRestoreUsingSeedButton( {this.renderRestoreUsingRecoveryPhraseButton(
SessionButtonType.BrandOutline, SessionButtonType.BrandOutline,
SessionButtonColor.White SessionButtonColor.White
)} )}
@ -606,7 +606,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
} }
private handleContinueYourSessionClick() { private handleContinueYourSessionClick() {
if (this.state.signInMode === SignInMode.UsingSeed) { if (this.state.signInMode === SignInMode.UsingRecoveryPhrase) {
this.register('english').ignore(); this.register('english').ignore();
} else { } else {
this.registerSecondaryDevice().ignore(); this.registerSecondaryDevice().ignore();
@ -623,17 +623,17 @@ export class RegistrationTabs extends React.Component<{}, State> {
mnemonicError, mnemonicError,
primaryDevicePubKey, primaryDevicePubKey,
displayName, displayName,
mnemonicSeed, recoveryPhrase,
password, password,
} = this.state; } = this.state;
let enableContinue = true; let enableContinue = true;
let text = window.i18n('continueYourSession'); let text = window.i18n('continueYourSession');
const displayNameOK = !displayNameError && !!displayName; // Display name required const displayNameOK = !displayNameError && !!displayName; // Display name required
const mnemonicOK = !mnemonicError && !!mnemonicSeed; // Mnemonic required const mnemonicOK = !mnemonicError && !!recoveryPhrase; // Mnemonic required
const passwordsOK = const passwordsOK =
!password || (!passwordErrorString && passwordFieldsMatch); // password is valid if empty, or if no error and fields are matching !password || (!passwordErrorString && passwordFieldsMatch); // password is valid if empty, or if no error and fields are matching
if (signInMode === SignInMode.UsingSeed) { if (signInMode === SignInMode.UsingRecoveryPhrase) {
enableContinue = displayNameOK && mnemonicOK && passwordsOK; enableContinue = displayNameOK && mnemonicOK && passwordsOK;
} else if (signInMode === SignInMode.LinkingDevice) { } else if (signInMode === SignInMode.LinkingDevice) {
enableContinue = !!primaryDevicePubKey; enableContinue = !!primaryDevicePubKey;
@ -670,7 +670,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
); );
} }
private renderRestoreUsingSeedButton( private renderRestoreUsingRecoveryPhraseButton(
buttonType: SessionButtonType, buttonType: SessionButtonType,
buttonColor: SessionButtonColor buttonColor: SessionButtonColor
) { ) {
@ -679,16 +679,16 @@ export class RegistrationTabs extends React.Component<{}, State> {
onClick={() => { onClick={() => {
this.cancelSecondaryDevice().ignore(); this.cancelSecondaryDevice().ignore();
this.setState({ this.setState({
signInMode: SignInMode.UsingSeed, signInMode: SignInMode.UsingRecoveryPhrase,
primaryDevicePubKey: '', primaryDevicePubKey: '',
mnemonicSeed: '', recoveryPhrase: '',
displayName: '', displayName: '',
signUpMode: SignUpMode.Default, signUpMode: SignUpMode.Default,
}); });
}} }}
buttonType={buttonType} buttonType={buttonType}
buttonColor={buttonColor} buttonColor={buttonColor}
text={window.i18n('restoreUsingSeed')} text={window.i18n('restoreUsingRecoveryPhrase')}
/> />
); );
} }
@ -699,7 +699,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
onClick={() => { onClick={() => {
this.setState({ this.setState({
signInMode: SignInMode.LinkingDevice, signInMode: SignInMode.LinkingDevice,
mnemonicSeed: '', recoveryPhrase: '',
displayName: '', displayName: '',
signUpMode: SignUpMode.Default, signUpMode: SignUpMode.Default,
}); });
@ -719,7 +719,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
return; return;
} }
if (signInMode === SignInMode.UsingSeed) { if (signInMode === SignInMode.UsingRecoveryPhrase) {
this.handleContinueYourSessionClick(); this.handleContinueYourSessionClick();
return; return;
@ -789,8 +789,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
private async register(language: string) { private async register(language: string) {
const { const {
password, password,
mnemonicSeed, recoveryPhrase,
generatedMnemonicSeed, generatedRecoveryPhrase,
signInMode, signInMode,
displayName, displayName,
passwordErrorString, passwordErrorString,
@ -835,11 +835,11 @@ export class RegistrationTabs extends React.Component<{}, State> {
return; return;
} }
if (signInMode === SignInMode.UsingSeed && !mnemonicSeed) { if (signInMode === SignInMode.UsingRecoveryPhrase && !recoveryPhrase) {
window.log.warn('empty mnemonic seed passed in seed restoration mode'); window.log.warn('empty mnemonic seed passed in seed restoration mode');
return; return;
} else if (!generatedMnemonicSeed) { } else if (!generatedRecoveryPhrase) {
window.log.warn('empty generated seed'); window.log.warn('empty generated seed');
return; return;
@ -849,9 +849,9 @@ export class RegistrationTabs extends React.Component<{}, State> {
window.textsecure.storage.remove('secondaryDeviceStatus'); window.textsecure.storage.remove('secondaryDeviceStatus');
const seedToUse = const seedToUse =
signInMode === SignInMode.UsingSeed signInMode === SignInMode.UsingRecoveryPhrase
? mnemonicSeed ? recoveryPhrase
: generatedMnemonicSeed; : generatedRecoveryPhrase;
try { try {
await this.resetRegistration(); await this.resetRegistration();
@ -947,7 +947,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
return; return;
} }
try { try {
const fakeMnemonic = this.state.mnemonicSeed; const fakeMnemonic = this.state.recoveryPhrase;
await this.accountManager.registerSingleDevice( await this.accountManager.registerSingleDevice(
fakeMnemonic, fakeMnemonic,

Loading…
Cancel
Save