fix: prevent email from being altered #1863
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kylecarbs
approved these changes
May 27, 2022
|
@f0ssel feel free to do the FE if you want but if not, which is 100% ok, could you create a ticket for this and add the FE label, and make it Community MVP, please? |
|
💯 I would not merge this as is, frontend will be same PR |
|
@BrunoQuaresma This is ready for frontend review |
FE ticket is here: #1725 |
greyscaled
reviewed
May 27, 2022
| @@ -59,6 +56,7 @@ export const AccountForm: React.FC<AccountFormProps> = ({ | |||
| fullWidth | |||
| label={Language.emailLabel} | |||
| variant="outlined" | |||
| disabled={true} | |||
There was a problem hiding this comment.
Suggested change
| disabled={true} | |
| disabled |
There was a problem hiding this comment.
I feel like we should remove the getFieldHelpers("email") and onChange and autoComplete here.
At a minimum, can you remove the autoComplete (doesn't make much sense for a disabled field).
greyscaled
approved these changes
May 27, 2022
greyscaled
reviewed
May 27, 2022
There was a problem hiding this comment.
Here's a patch I'd prefer to be applied to the FE code. It cleans up the form so that email is read-only and not associated with the Formik form.
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
index 3773b307..4c90deb6 100644
--- a/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
+++ b/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
@@ -8,7 +8,6 @@ import { LoadingButton } from "../LoadingButton/LoadingButton"
import { Stack } from "../Stack/Stack"
interface AccountFormValues {
- email: string
username: string
}
@@ -23,7 +22,9 @@ const validationSchema = Yup.object({
})
export type AccountFormErrors = FormikErrors<AccountFormValues>
+
export interface AccountFormProps {
+ email: string
isLoading: boolean
initialValues: AccountFormValues
onSubmit: (values: AccountFormValues) => void
@@ -32,6 +33,7 @@ export interface AccountFormProps {
}
export const AccountForm: React.FC<AccountFormProps> = ({
+ email,
isLoading,
onSubmit,
initialValues,
@@ -49,15 +51,7 @@ export const AccountForm: React.FC<AccountFormProps> = ({
<>
<form onSubmit={form.handleSubmit}>
<Stack>
- <TextField
- {...getFieldHelpers("email")}
- onChange={onChangeTrimmed(form)}
- autoComplete="email"
- fullWidth
- label={Language.emailLabel}
- variant="outlined"
- disabled={true}
- />
+ <TextField disabled fullWidth label={Language.emailLabel} value={email} variant="outlined" />
<TextField
{...getFieldHelpers("username")}
onChange={onChangeTrimmed(form)}
diff --git a/site/src/pages/SettingsPages/AccountPage/AccountPage.tsx b/site/src/pages/SettingsPages/AccountPage/AccountPage.tsx
index 5f9cf428..5954ac64 100644
--- a/site/src/pages/SettingsPages/AccountPage/AccountPage.tsx
+++ b/site/src/pages/SettingsPages/AccountPage/AccountPage.tsx
@@ -26,10 +26,11 @@ export const AccountPage: React.FC = () => {
return (
<Section title={Language.title}>
<AccountForm
+ email={me.email}
error={hasUnknownError ? Language.unknownError : undefined}
formErrors={formErrors}
isLoading={authState.matches("signedIn.profile.updatingProfile")}
- initialValues={{ username: me.username, email: me.email }}
+ initialValues={{ username: me.username }}
onSubmit={(data) => {
authSend({
type: "UPDATE_PROFILE",
greyscaled
approved these changes
May 27, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #1490
Fixes: #1725