Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove existing user check from inquiry auth flow #13605

Merged
merged 8 commits into from Mar 18, 2024
Merged

refactor: remove existing user check from inquiry auth flow #13605

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d834899
refactor: remove existing user check from inquiry auth flow
mc-jones Mar 14, 2024
330e73f
refactor: remove user detail inputs from inquiry message
mc-jones Mar 14, 2024
f4cae66
refactor: add email input to inquiry log in flow
mc-jones Mar 14, 2024
465a562
refactor: add email input to inquiry sign up flow
mc-jones Mar 14, 2024
e5ee6f3
refactor: add email input to inquiry reset password flow
mc-jones Mar 14, 2024
1ba9eaf
fix: reset mock in inquiry signup test
mc-jones Mar 14, 2024
6dc22c2
revert: keep privacy policy notice on inquiry modal
mc-jones Mar 15, 2024
11b3e67
refactor: remove unnecessary spacing
mc-jones Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Components/AuthDialog/Utils/formatErrorMessage.ts
View file
Open in desktop
Expand Up @@ -12,9 +12,6 @@ export const formatErrorMessage = (error: Error) => {
case "User Already Exists":
return "An account with this email already exists."

case "User Not Found":
return "No account with this email exists."
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/artsy/gravity/pull/17445#issuecomment-1981320948


case `Unexpected token '<', "<!DOCTYPE "... is not valid JSON`:
case `Unexpected token '<', "<html> <"... is not valid JSON`:
return "An error occurred. Please try again."
Expand Down
7 changes: 2 additions & 5 deletions src/Components/Inquiry/Views/InquiryAccount.tsx
View file
Open in desktop
@@ -1,5 +1,4 @@
import * as React from "react";
import { InquiryExistingUserQueryRenderer } from "./InquiryExistingUser"
import * as React from "react"
import { InquirySignUp } from "./InquirySignUp"
import { InquiryLogin } from "./InquiryLogin"
import { InquiryResetPassword } from "./InquiryResetPassword"
Expand Down Expand Up @@ -27,16 +26,14 @@ export const useInquiryAccountContext = () => {
}

export const InquiryAccount: React.FC = () => {
const [screen, navigateTo] = useState(Screen.ExistingUser)
const [screen, navigateTo] = useState(Screen.SignUp)

return (
<InquiryAccountContext.Provider value={{ screen, navigateTo }}>
{(() => {
switch (screen) {
case Screen.Login:
return <InquiryLogin />
case Screen.ExistingUser:
return <InquiryExistingUserQueryRenderer />
case Screen.SignUp:
return <InquirySignUp />
case Screen.ResetPassword:
Expand Down
59 changes: 0 additions & 59 deletions src/Components/Inquiry/Views/InquiryExistingUser.tsx
View file
Open in desktop

This file was deleted.

45 changes: 8 additions & 37 deletions src/Components/Inquiry/Views/InquiryInquiry.tsx
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ import {
Button,
Flex,
Image,
Input,
Separator,
Skeleton,
SkeletonBox,
Expand All @@ -23,7 +22,6 @@ import { useArtworkInquiryRequest } from "Components/Inquiry/Hooks/useArtworkInq
import { wait } from "Utils/wait"
import {
useInquiryContext,
InquiryState,
AUTOMATED_MESSAGES,
} from "Components/Inquiry/Hooks/useInquiryContext"
import { SystemQueryRenderer } from "System/Relay/SystemQueryRenderer"
Expand Down Expand Up @@ -53,12 +51,6 @@ const InquiryInquiry: React.FC<InquiryInquiryProps> = ({ artwork }) => {
setInquiry(prevState => ({ ...prevState, message: value }))
}

const handleInputChange = (name: keyof InquiryState) => (
event: React.ChangeEvent<HTMLInputElement>
) => {
setInquiry(prevState => ({ ...prevState, [name]: event.target.value }))
}

const handleSubmit = async (event: React.FormEvent<HTMLElement>) => {
event.preventDefault()

Expand Down Expand Up @@ -158,35 +150,14 @@ const InquiryInquiry: React.FC<InquiryInquiryProps> = ({ artwork }) => {
required
/>

{!user && (
<>
<Input
name="name"
title="Your name"
placeholder="Your full name"
onChange={handleInputChange("name")}
required
my={1}
/>

<Input
name="email"
title="Your email"
placeholder="Your email address"
onChange={handleInputChange("email")}
type="email"
required
my={1}
/>

<Text variant="xs">
By clicking send, you accept our{" "}
<RouterLink inline to="/privacy" target="_blank">
Privacy Policy.
</RouterLink>
</Text>
</>
)}
<Spacer y={1} />

<Text variant="xs">
By clicking send, you accept our{" "}
<RouterLink inline to="/privacy" target="_blank">
Privacy Policy.
</RouterLink>
</Text>

<Spacer y={1} />

Expand Down
50 changes: 41 additions & 9 deletions src/Components/Inquiry/Views/InquiryLogin.tsx
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ import {
Intent,
SuccessfullyLoggedIn,
} from "@artsy/cohesion"
import { formatErrorMessage } from "Components/AuthDialog/Utils/formatErrorMessage"

type Mode =
| "Pending"
Expand All @@ -36,6 +37,7 @@ type Mode =
| "Success"

interface InquiryLoginState {
email: string
password: string
authenticationCode: string
}
Expand All @@ -47,6 +49,7 @@ export const InquiryLogin: React.FC = () => {
inquiry,
next,
setContext,
setInquiry,
setRelayEnvironment,
} = useInquiryContext()
const { navigateTo } = useInquiryAccountContext()
Expand All @@ -56,8 +59,11 @@ export const InquiryLogin: React.FC = () => {
const [state, setState] = useState<InquiryLoginState>({
password: "",
authenticationCode: "",
email: inquiry.email ?? "",
})

const [error, setError] = useState("")

const { submitArtworkInquiryRequest } = useArtworkInquiryRequest()

const { trackEvent } = useTracking()
Expand All @@ -68,7 +74,7 @@ export const InquiryLogin: React.FC = () => {
setMode("Loading")

try {
const { user } = await login({ email: inquiry.email!, ...state })
const { user } = await login({ ...state })

setContext({
collectorLevel: user.collector_level,
Expand Down Expand Up @@ -127,15 +133,18 @@ export const InquiryLogin: React.FC = () => {
return
}

// TODO: Improve error messaging
setMode("Error")
setError(formatErrorMessage(err))
logger.error(err)
}
}

const handleInputChange = (name: keyof InquiryLoginState) => (
event: React.ChangeEvent<HTMLInputElement>
) => {
if (name === "email") {
setInquiry(prevState => ({ ...prevState, [name]: event.target.value }))
}
setState(prevState => ({ ...prevState, [name]: event.target.value }))
mode === "Error" && setMode("Pending")
}
Expand All @@ -147,25 +156,31 @@ export const InquiryLogin: React.FC = () => {
return (
<>
<Box as="form" onSubmit={handleSubmit}>
<Text variant="lg-display" mr={4}>
We found an Artsy account associated with {inquiry.email}.
</Text>

<Text variant="lg-display" mr={4} my={1}>
dzucconi marked this conversation as resolved.
Show resolved Hide resolved
Please log in to continue.
Log in to send your message
</Text>

<Separator my={2} />

<Input
name="email"
title="Email"
defaultValue={inquiry.email}
placeholder="Your email address"
onChange={handleInputChange("email")}
type="email"
required
autoFocus
my={1}
/>

<Input
name="password"
title="Password"
placeholder="Enter your password"
onChange={handleInputChange("password")}
type="password"
error={mode === "Error" && "Invalid password"}
required
autoFocus
my={1}
/>

Expand All @@ -189,6 +204,8 @@ export const InquiryLogin: React.FC = () => {
/>
)}

{mode === "Error" && <Message variant="error">{error}</Message>}

<Spacer y={2} />

<Button
Expand All @@ -203,6 +220,21 @@ export const InquiryLogin: React.FC = () => {

<Spacer y={2} />

<Text variant="xs" color="black60" textAlign="center">
Don't have an account?{" "}
<Clickable
data-test="login"
textDecoration="underline"
onClick={() => {
navigateTo(Screen.SignUp)
}}
>
Sign up.
</Clickable>
</Text>

<Spacer y={2} />

<Flex alignItems="center" justifyContent="flex-end">
<Clickable textDecoration="underline" onClick={handleClick}>
<Text variant="sm">Forgot your password?</Text>
Expand Down