beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

renamed passwordForm to SetPasswordForm

Browse source
This commit is contained in:
Abhinav-grd 2021-05-11 10:12:06 +05:30
parent a7a8515431
commit b9f1870760
4 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/PasswordForm.tsx → src/components/SetPasswordForm.tsx
View file

@ -19,7 +19,7 @@ interface formValues {
passphrase: string; passphrase: string;
confirm: string; confirm: string;
} }
function SetPassword(props: Props) { function SetPasswordForm(props: Props) {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const onSubmit = async ( const onSubmit = async (
values: formValues, values: formValues,
@ -94,7 +94,7 @@ function SetPassword(props: Props) {
<Form.Control <Form.Control
type="password" type="password"
placeholder={ placeholder={
constants.PASSPHRASE_CONFIRM constants.RE_ENTER_PASSPHRASE
} }
value={values.confirm} value={values.confirm}
onChange={handleChange('confirm')} onChange={handleChange('confirm')}
@ -129,4 +129,4 @@ function SetPassword(props: Props) {
</Container> </Container>
); );
} }
export default SetPassword; export default SetPasswordForm;

10
src/pages/changePassword/index.tsx
View file

@ -10,7 +10,7 @@ import CryptoWorker, {
} from 'utils/crypto'; } from 'utils/crypto';
import { getActualKey } from 'utils/common/key'; import { getActualKey } from 'utils/common/key';
import { logoutUser, setKeys, UpdatedKey } from 'services/userService'; import { logoutUser, setKeys, UpdatedKey } from 'services/userService';
import PasswordForm from 'components/PasswordForm'; import SetPasswordForm from 'components/SetPasswordForm';
export interface KEK { export interface KEK {
key: string; key: string;
@ -44,10 +44,8 @@ export default function Generate() {
setFieldError('confirm', constants.PASSWORD_GENERATION_FAILED); setFieldError('confirm', constants.PASSWORD_GENERATION_FAILED);
return; return;
} }
const encryptedKeyAttributes: B64EncryptionResult = await cryptoWorker.encryptToB64( const encryptedKeyAttributes: B64EncryptionResult =
key, await cryptoWorker.encryptToB64(key, kek.key);
kek.key
);
const updatedKey: UpdatedKey = { const updatedKey: UpdatedKey = {
kekSalt, kekSalt,
encryptedKey: encryptedKeyAttributes.encryptedData, encryptedKey: encryptedKeyAttributes.encryptedData,
@ -73,7 +71,7 @@ export default function Generate() {
router.push('/gallery'); router.push('/gallery');
}; };
return ( return (
<PasswordForm <SetPasswordForm
callback={onSubmit} callback={onSubmit}
buttonText={constants.CHANGE_PASSWORD} buttonText={constants.CHANGE_PASSWORD}
back={ back={

28
src/pages/generate/index.tsx
View file

@ -9,7 +9,7 @@ import CryptoWorker, {
setSessionKeys, setSessionKeys,
generateAndSaveIntermediateKeyAttributes, generateAndSaveIntermediateKeyAttributes,
} from 'utils/crypto'; } from 'utils/crypto';
import PasswordForm from 'components/PasswordForm'; import SetPasswordForm from 'components/SetPasswordForm';
import { KeyAttributes } from 'types'; import { KeyAttributes } from 'types';
import { setJustSignedUp } from 'utils/storage'; import { setJustSignedUp } from 'utils/storage';
import RecoveryKeyModal from 'components/RecoveryKeyModal'; import RecoveryKeyModal from 'components/RecoveryKeyModal';
@ -52,24 +52,16 @@ export default function Generate() {
setFieldError('confirm', constants.PASSWORD_GENERATION_FAILED); setFieldError('confirm', constants.PASSWORD_GENERATION_FAILED);
return; return;
} }
const masterKeyEncryptedWithKek: B64EncryptionResult = await cryptoWorker.encryptToB64( const masterKeyEncryptedWithKek: B64EncryptionResult =
masterKey, await cryptoWorker.encryptToB64(masterKey, kek.key);
kek.key const masterKeyEncryptedWithRecoveryKey: B64EncryptionResult =
); await cryptoWorker.encryptToB64(masterKey, recoveryKey);
const masterKeyEncryptedWithRecoveryKey: B64EncryptionResult = await cryptoWorker.encryptToB64( const recoveryKeyEncryptedWithMasterKey: B64EncryptionResult =
masterKey, await cryptoWorker.encryptToB64(recoveryKey, masterKey);
recoveryKey
);
const recoveryKeyEncryptedWithMasterKey: B64EncryptionResult = await cryptoWorker.encryptToB64(
recoveryKey,
masterKey
);
const keyPair = await cryptoWorker.generateKeyPair(); const keyPair = await cryptoWorker.generateKeyPair();
const encryptedKeyPairAttributes: B64EncryptionResult = await cryptoWorker.encryptToB64( const encryptedKeyPairAttributes: B64EncryptionResult =
keyPair.privateKey, await cryptoWorker.encryptToB64(keyPair.privateKey, masterKey);
masterKey
);
const keyAttributes: KeyAttributes = { const keyAttributes: KeyAttributes = {
kekSalt, kekSalt,
@ -101,7 +93,7 @@ export default function Generate() {
return ( return (
<> <>
<PasswordForm <SetPasswordForm
callback={onSubmit} callback={onSubmit}
buttonText={constants.SET_PASSPHRASE} buttonText={constants.SET_PASSPHRASE}
back={logoutUser} back={logoutUser}

3
src/utils/strings/englishConstants.tsx
View file

@ -51,7 +51,8 @@ const englishConstants = {
</p> </p>
), ),
PASSPHRASE_HINT: 'password', PASSPHRASE_HINT: 'password',
PASSPHRASE_CONFIRM: 'password again', RE_ENTER_PASSPHRASE: 'password again',
CONFIRM_PASSPHRASE: 'confirm your password',
PASSPHRASE_MATCH_ERROR: `passwords don't match`, PASSPHRASE_MATCH_ERROR: `passwords don't match`,
CONSOLE_WARNING_STOP: 'STOP!', CONSOLE_WARNING_STOP: 'STOP!',
CONSOLE_WARNING_DESC: `This is a browser feature intended for developers. Please don't copy-paste unverified code here.`, CONSOLE_WARNING_DESC: `This is a browser feature intended for developers. Please don't copy-paste unverified code here.`,