Refactor account-creation to use react-query and a reducer (react-query refactor) (#1931)
* Refactor account-creation to use react-query and a reducer * Add translations * Missing translate
This commit is contained in:
parent
9f7a162a96
commit
e637798e05
10 changed files with 384 additions and 338 deletions
|
@ -1,223 +0,0 @@
|
|||
import {makeAutoObservable} from 'mobx'
|
||||
import {RootStoreModel} from '../root-store'
|
||||
import {ServiceDescription} from '../session'
|
||||
import {DEFAULT_SERVICE} from 'state/index'
|
||||
import {ComAtprotoServerCreateAccount} from '@atproto/api'
|
||||
import * as EmailValidator from 'email-validator'
|
||||
import {createFullHandle} from 'lib/strings/handles'
|
||||
import {cleanError} from 'lib/strings/errors'
|
||||
import {getAge} from 'lib/strings/time'
|
||||
import {track} from 'lib/analytics/analytics'
|
||||
import {logger} from '#/logger'
|
||||
import {DispatchContext as OnboardingDispatchContext} from '#/state/shell/onboarding'
|
||||
import {ApiContext as SessionApiContext} from '#/state/session'
|
||||
|
||||
const DEFAULT_DATE = new Date(Date.now() - 60e3 * 60 * 24 * 365 * 20) // default to 20 years ago
|
||||
|
||||
export class CreateAccountModel {
|
||||
step: number = 1
|
||||
isProcessing = false
|
||||
isFetchingServiceDescription = false
|
||||
didServiceDescriptionFetchFail = false
|
||||
error = ''
|
||||
|
||||
serviceUrl = DEFAULT_SERVICE
|
||||
serviceDescription: ServiceDescription | undefined = undefined
|
||||
userDomain = ''
|
||||
inviteCode = ''
|
||||
email = ''
|
||||
password = ''
|
||||
handle = ''
|
||||
birthDate = DEFAULT_DATE
|
||||
|
||||
constructor(public rootStore: RootStoreModel) {
|
||||
makeAutoObservable(this, {}, {autoBind: true})
|
||||
}
|
||||
|
||||
get isAge13() {
|
||||
return getAge(this.birthDate) >= 13
|
||||
}
|
||||
|
||||
get isAge18() {
|
||||
return getAge(this.birthDate) >= 18
|
||||
}
|
||||
|
||||
// form state controls
|
||||
// =
|
||||
|
||||
next() {
|
||||
this.error = ''
|
||||
if (this.step === 2) {
|
||||
if (!this.isAge13) {
|
||||
this.error =
|
||||
'Unfortunately, you do not meet the requirements to create an account.'
|
||||
return
|
||||
}
|
||||
}
|
||||
this.step++
|
||||
}
|
||||
|
||||
back() {
|
||||
this.error = ''
|
||||
this.step--
|
||||
}
|
||||
|
||||
setStep(v: number) {
|
||||
this.step = v
|
||||
}
|
||||
|
||||
async fetchServiceDescription() {
|
||||
this.setError('')
|
||||
this.setIsFetchingServiceDescription(true)
|
||||
this.setDidServiceDescriptionFetchFail(false)
|
||||
this.setServiceDescription(undefined)
|
||||
if (!this.serviceUrl) {
|
||||
return
|
||||
}
|
||||
try {
|
||||
const desc = await this.rootStore.session.describeService(this.serviceUrl)
|
||||
this.setServiceDescription(desc)
|
||||
this.setUserDomain(desc.availableUserDomains[0])
|
||||
} catch (err: any) {
|
||||
logger.warn(
|
||||
`Failed to fetch service description for ${this.serviceUrl}`,
|
||||
{error: err},
|
||||
)
|
||||
this.setError(
|
||||
'Unable to contact your service. Please check your Internet connection.',
|
||||
)
|
||||
this.setDidServiceDescriptionFetchFail(true)
|
||||
} finally {
|
||||
this.setIsFetchingServiceDescription(false)
|
||||
}
|
||||
}
|
||||
|
||||
async submit({
|
||||
createAccount,
|
||||
onboardingDispatch,
|
||||
}: {
|
||||
createAccount: SessionApiContext['createAccount']
|
||||
onboardingDispatch: OnboardingDispatchContext
|
||||
}) {
|
||||
if (!this.email) {
|
||||
this.setStep(2)
|
||||
return this.setError('Please enter your email.')
|
||||
}
|
||||
if (!EmailValidator.validate(this.email)) {
|
||||
this.setStep(2)
|
||||
return this.setError('Your email appears to be invalid.')
|
||||
}
|
||||
if (!this.password) {
|
||||
this.setStep(2)
|
||||
return this.setError('Please choose your password.')
|
||||
}
|
||||
if (!this.handle) {
|
||||
this.setStep(3)
|
||||
return this.setError('Please choose your handle.')
|
||||
}
|
||||
this.setError('')
|
||||
this.setIsProcessing(true)
|
||||
|
||||
try {
|
||||
onboardingDispatch({type: 'start'}) // start now to avoid flashing the wrong view
|
||||
await createAccount({
|
||||
service: this.serviceUrl,
|
||||
email: this.email,
|
||||
handle: createFullHandle(this.handle, this.userDomain),
|
||||
password: this.password,
|
||||
inviteCode: this.inviteCode.trim(),
|
||||
})
|
||||
track('Create Account')
|
||||
} catch (e: any) {
|
||||
onboardingDispatch({type: 'skip'}) // undo starting the onboard
|
||||
let errMsg = e.toString()
|
||||
if (e instanceof ComAtprotoServerCreateAccount.InvalidInviteCodeError) {
|
||||
errMsg =
|
||||
'Invite code not accepted. Check that you input it correctly and try again.'
|
||||
}
|
||||
logger.error('Failed to create account', {error: e})
|
||||
this.setIsProcessing(false)
|
||||
this.setError(cleanError(errMsg))
|
||||
throw e
|
||||
}
|
||||
}
|
||||
|
||||
// form state accessors
|
||||
// =
|
||||
|
||||
get canBack() {
|
||||
return this.step > 1
|
||||
}
|
||||
|
||||
get canNext() {
|
||||
if (this.step === 1) {
|
||||
return !!this.serviceDescription
|
||||
} else if (this.step === 2) {
|
||||
return (
|
||||
(!this.isInviteCodeRequired || this.inviteCode) &&
|
||||
!!this.email &&
|
||||
!!this.password
|
||||
)
|
||||
}
|
||||
return !!this.handle
|
||||
}
|
||||
|
||||
get isServiceDescribed() {
|
||||
return !!this.serviceDescription
|
||||
}
|
||||
|
||||
get isInviteCodeRequired() {
|
||||
return this.serviceDescription?.inviteCodeRequired
|
||||
}
|
||||
|
||||
// setters
|
||||
// =
|
||||
|
||||
setIsProcessing(v: boolean) {
|
||||
this.isProcessing = v
|
||||
}
|
||||
|
||||
setIsFetchingServiceDescription(v: boolean) {
|
||||
this.isFetchingServiceDescription = v
|
||||
}
|
||||
|
||||
setDidServiceDescriptionFetchFail(v: boolean) {
|
||||
this.didServiceDescriptionFetchFail = v
|
||||
}
|
||||
|
||||
setError(v: string) {
|
||||
this.error = v
|
||||
}
|
||||
|
||||
setServiceUrl(v: string) {
|
||||
this.serviceUrl = v
|
||||
}
|
||||
|
||||
setServiceDescription(v: ServiceDescription | undefined) {
|
||||
this.serviceDescription = v
|
||||
}
|
||||
|
||||
setUserDomain(v: string) {
|
||||
this.userDomain = v
|
||||
}
|
||||
|
||||
setInviteCode(v: string) {
|
||||
this.inviteCode = v
|
||||
}
|
||||
|
||||
setEmail(v: string) {
|
||||
this.email = v
|
||||
}
|
||||
|
||||
setPassword(v: string) {
|
||||
this.password = v
|
||||
}
|
||||
|
||||
setHandle(v: string) {
|
||||
this.handle = v
|
||||
}
|
||||
|
||||
setBirthDate(v: Date) {
|
||||
this.birthDate = v
|
||||
}
|
||||
}
|
|
@ -1,16 +1,26 @@
|
|||
import {BskyAgent} from '@atproto/api'
|
||||
import {useQuery} from '@tanstack/react-query'
|
||||
|
||||
import {useSession} from '#/state/session'
|
||||
|
||||
export const RQKEY = (serviceUrl: string) => ['service', serviceUrl]
|
||||
|
||||
export function useServiceQuery() {
|
||||
const {agent} = useSession()
|
||||
export function useServiceQuery(serviceUrl: string) {
|
||||
return useQuery({
|
||||
queryKey: RQKEY(agent.service.toString()),
|
||||
queryKey: RQKEY(serviceUrl),
|
||||
queryFn: async () => {
|
||||
const agent = new BskyAgent({service: serviceUrl})
|
||||
const res = await agent.com.atproto.server.describeServer()
|
||||
return res.data
|
||||
},
|
||||
enabled: isValidUrl(serviceUrl),
|
||||
})
|
||||
}
|
||||
|
||||
function isValidUrl(url: string) {
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
const urlp = new URL(url)
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue