oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

running yarn ready

Browse source
This commit is contained in:
Warrick Corfe-Tan 2021-08-16 09:57:38 +10:00
parent a1194fa7bb
commit 59d52d6e66
3 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/components/session/SessionRegistrationView.tsx
View file

@ -36,7 +36,7 @@ export const SessionRegistrationView = () => {
<AccentText /> <AccentText />
</div> </div>
<div className="session-content-registration"> <div className="session-content-registration">
<RegistrationStages theme={lightTheme} /> <RegistrationStages />
</div> </div>
</div> </div>
</div> </div>

34
ts/components/session/registration/RegistrationStages.tsx
View file

@ -1,4 +1,4 @@
import React, { useState } from 'react'; import React, { useEffect, useState } from 'react';
import { PromiseUtils, StringUtils, ToastUtils, UserUtils } from '../../../session/utils'; import { PromiseUtils, StringUtils, ToastUtils, UserUtils } from '../../../session/utils';
import { getConversationController } from '../../../session/conversations'; import { getConversationController } from '../../../session/conversations';
@ -16,7 +16,6 @@ import { fromHex } from '../../../session/utils/String';
import { TaskTimedOutError } from '../../../session/utils/Promise'; import { TaskTimedOutError } from '../../../session/utils/Promise';
import { mn_decode } from '../../../session/crypto/mnemonic'; import { mn_decode } from '../../../session/crypto/mnemonic';
import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling'; import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling';
import { useEffect } from 'react';
export const MAX_USERNAME_LENGTH = 20; export const MAX_USERNAME_LENGTH = 20;
// tslint:disable: use-simple-attributes // tslint:disable: use-simple-attributes
@ -156,10 +155,10 @@ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: str
export enum RegistrationPhase { export enum RegistrationPhase {
Start, Start,
SignIn, SignIn,
SignUp SignUp,
} }
export const RegistrationStages = (props: any) => { export const RegistrationStages = () => {
const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState(''); const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState('');
const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState(''); const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState('');
const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start); const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start);
@ -167,7 +166,7 @@ export const RegistrationStages = (props: any) => {
useEffect(() => { useEffect(() => {
void generateMnemonicAndKeyPair(); void generateMnemonicAndKeyPair();
void resetRegistration(); void resetRegistration();
}, []) }, []);
const generateMnemonicAndKeyPair = async () => { const generateMnemonicAndKeyPair = async () => {
if (generatedRecoveryPhrase === '') { if (generatedRecoveryPhrase === '') {
@ -182,30 +181,27 @@ export const RegistrationStages = (props: any) => {
} }
const seed = fromHex(seedHex); const seed = fromHex(seedHex);
const keyPair = await sessionGenerateKeyPair(seed); const keyPair = await sessionGenerateKeyPair(seed);
const hexGeneratedPubKey = StringUtils.decode(keyPair.pubKey, 'hex'); const newHexPubKey = StringUtils.decode(keyPair.pubKey, 'hex');
setGeneratedRecoveryPhrase(mnemonic); setGeneratedRecoveryPhrase(mnemonic);
setHexGeneratedPubKey(hexGeneratedPubKey); // our 'frontend' sessionID setHexGeneratedPubKey(newHexPubKey); // our 'frontend' sessionID
} }
} };
return ( return (
<div className="session-registration-container"> <div className="session-registration-container">
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.SignUp) && registrationPhase === RegistrationPhase.SignUp) && (
<SignUpTab <SignUpTab
generatedRecoveryPhrase={generatedRecoveryPhrase} generatedRecoveryPhrase={generatedRecoveryPhrase}
hexGeneratedPubKey={hexGeneratedPubKey} hexGeneratedPubKey={hexGeneratedPubKey}
setRegistrationPhase={setRegistrationPhase} setRegistrationPhase={setRegistrationPhase}
/> />
} )}
{ {(registrationPhase === RegistrationPhase.Start ||
(registrationPhase === RegistrationPhase.Start || registrationPhase === RegistrationPhase.SignIn) && (
registrationPhase === RegistrationPhase.SignIn) && <SignInTab setRegistrationPhase={setRegistrationPhase} />
<SignInTab )}
setRegistrationPhase={setRegistrationPhase}
/>
}
</div> </div>
) );
} };

2
ts/components/session/registration/SignUpTab.tsx
View file

@ -79,7 +79,7 @@ export const SignUpTab = (props: Props) => {
<SignUpDefault <SignUpDefault
createSessionID={() => { createSessionID={() => {
setSignUpMode(SignUpMode.SessionIDShown); setSignUpMode(SignUpMode.SessionIDShown);
setRegistrationPhase(RegistrationPhase.SignUp) setRegistrationPhase(RegistrationPhase.SignUp);
}} }}
/> />
); );