Move some things around

zio/stable
Eric Bailey 2024-03-20 17:25:08 -05:00
parent 58588efcea
commit 19fab671a3
6 changed files with 4 additions and 301 deletions

View File

@ -1,7 +1,8 @@
import React from 'react'
import {StyleSheet} from 'react-native'
import {WebView, WebViewNavigation} from 'react-native-webview'
import {ShouldStartLoadRequest} from 'react-native-webview/lib/WebViewTypes'
import {StyleSheet} from 'react-native'
import {SignupState} from '#/screens/Signup/state'
const ALLOWED_HOSTS = [

View File

@ -6,9 +6,9 @@ import {nanoid} from 'nanoid/non-secure'
import {createFullHandle} from '#/lib/strings/handles'
import {isWeb} from '#/platform/detection'
import {CaptchaWebView} from '#/view/com/auth/create/CaptchaWebView'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {useSignupContext, useSubmitSignup} from '#/screens/Signup/state'
import {CaptchaWebView} from '#/screens/Signup/StepCaptcha/CaptchaWebView'
import {atoms as a, useTheme} from '#/alf'
import {FormError} from '#/components/forms/FormError'

View File

@ -4,9 +4,9 @@ import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {logger} from '#/logger'
import {Policies} from 'view/com/auth/create/Policies'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {is13, is18, useSignupContext} from '#/screens/Signup/state'
import {Policies} from '#/screens/Signup/StepInfo/Policies'
import {atoms as a} from '#/alf'
import * as DateField from '#/components/forms/DateField'
import {FormError} from '#/components/forms/FormError'

View File

@ -1,298 +0,0 @@
import {useCallback, useReducer} from 'react'
import {
ComAtprotoServerDescribeServer,
ComAtprotoServerCreateAccount,
} from '@atproto/api'
import {I18nContext, useLingui} from '@lingui/react'
import {msg} from '@lingui/macro'
import * as EmailValidator from 'email-validator'
import {getAge} from 'lib/strings/time'
import {logger} from '#/logger'
import {createFullHandle, validateHandle} from '#/lib/strings/handles'
import {cleanError} from '#/lib/strings/errors'
import {useOnboardingDispatch} from '#/state/shell/onboarding'
import {useSessionApi} from '#/state/session'
import {DEFAULT_SERVICE, IS_TEST_USER} from '#/lib/constants'
import {
DEFAULT_PROD_FEEDS,
usePreferencesSetBirthDateMutation,
useSetSaveFeedsMutation,
} from 'state/queries/preferences'
export type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
const DEFAULT_DATE = new Date(Date.now() - 60e3 * 60 * 24 * 365 * 20) // default to 20 years ago
export type CreateAccountAction =
| {type: 'set-step'; value: number}
| {type: 'set-error'; value: string | undefined}
| {type: 'set-processing'; value: boolean}
| {type: 'set-service-url'; value: string}
| {type: 'set-service-description'; value: ServiceDescription | undefined}
| {type: 'set-user-domain'; value: string}
| {type: 'set-invite-code'; value: string}
| {type: 'set-email'; value: string}
| {type: 'set-password'; value: string}
| {type: 'set-handle'; value: string}
| {type: 'set-birth-date'; value: Date}
| {type: 'next'}
| {type: 'back'}
export interface CreateAccountState {
// state
step: number
error: string | undefined
isProcessing: boolean
serviceUrl: string
serviceDescription: ServiceDescription | undefined
userDomain: string
inviteCode: string
email: string
password: string
handle: string
birthDate: Date
// computed
canBack: boolean
canNext: boolean
isInviteCodeRequired: boolean
isCaptchaRequired: boolean
}
export type CreateAccountDispatch = (action: CreateAccountAction) => void
export function useCreateAccount() {
const {_} = useLingui()
return useReducer(createReducer({_}), {
step: 1,
error: undefined,
isProcessing: false,
serviceUrl: DEFAULT_SERVICE,
serviceDescription: undefined,
userDomain: '',
inviteCode: '',
email: '',
password: '',
handle: '',
birthDate: DEFAULT_DATE,
canBack: false,
canNext: false,
isInviteCodeRequired: false,
isCaptchaRequired: false,
})
}
export function useSubmitCreateAccount(
uiState: CreateAccountState,
uiDispatch: CreateAccountDispatch,
) {
const {_} = useLingui()
const {createAccount} = useSessionApi()
const {mutate: setBirthDate} = usePreferencesSetBirthDateMutation()
const {mutate: setSavedFeeds} = useSetSaveFeedsMutation()
const onboardingDispatch = useOnboardingDispatch()
return useCallback(
async (verificationCode?: string) => {
if (!uiState.email) {
uiDispatch({type: 'set-step', value: 1})
console.log('no email?')
return uiDispatch({
type: 'set-error',
value: _(msg`Please enter your email.`),
})
}
if (!EmailValidator.validate(uiState.email)) {
uiDispatch({type: 'set-step', value: 1})
return uiDispatch({
type: 'set-error',
value: _(msg`Your email appears to be invalid.`),
})
}
if (!uiState.password) {
uiDispatch({type: 'set-step', value: 1})
return uiDispatch({
type: 'set-error',
value: _(msg`Please choose your password.`),
})
}
if (!uiState.handle) {
uiDispatch({type: 'set-step', value: 2})
return uiDispatch({
type: 'set-error',
value: _(msg`Please choose your handle.`),
})
}
if (uiState.isCaptchaRequired && !verificationCode) {
uiDispatch({type: 'set-step', value: 3})
return uiDispatch({
type: 'set-error',
value: _(msg`Please complete the verification captcha.`),
})
}
uiDispatch({type: 'set-error', value: ''})
uiDispatch({type: 'set-processing', value: true})
try {
onboardingDispatch({type: 'start'}) // start now to avoid flashing the wrong view
await createAccount({
service: uiState.serviceUrl,
email: uiState.email,
handle: createFullHandle(uiState.handle, uiState.userDomain),
password: uiState.password,
inviteCode: uiState.inviteCode.trim(),
verificationCode: uiState.isCaptchaRequired
? verificationCode
: undefined,
})
setBirthDate({birthDate: uiState.birthDate})
if (!IS_TEST_USER(uiState.handle)) {
setSavedFeeds(DEFAULT_PROD_FEEDS)
}
} catch (e: any) {
onboardingDispatch({type: 'skip'}) // undo starting the onboard
let errMsg = e.toString()
if (e instanceof ComAtprotoServerCreateAccount.InvalidInviteCodeError) {
errMsg = _(
msg`Invite code not accepted. Check that you input it correctly and try again.`,
)
uiDispatch({type: 'set-step', value: 1})
}
if ([400, 429].includes(e.status)) {
logger.warn('Failed to create account', {message: e})
} else {
logger.error(`Failed to create account (${e.status} status)`, {
message: e,
})
}
const error = cleanError(errMsg)
const isHandleError = error.toLowerCase().includes('handle')
uiDispatch({type: 'set-processing', value: false})
uiDispatch({type: 'set-error', value: cleanError(errMsg)})
uiDispatch({type: 'set-step', value: isHandleError ? 2 : 1})
}
},
[
uiState.email,
uiState.password,
uiState.handle,
uiState.isCaptchaRequired,
uiState.serviceUrl,
uiState.userDomain,
uiState.inviteCode,
uiState.birthDate,
uiDispatch,
_,
onboardingDispatch,
createAccount,
setBirthDate,
setSavedFeeds,
],
)
}
export function is13(state: CreateAccountState) {
return getAge(state.birthDate) >= 13
}
export function is18(state: CreateAccountState) {
return getAge(state.birthDate) >= 18
}
function createReducer({_}: {_: I18nContext['_']}) {
return function reducer(
state: CreateAccountState,
action: CreateAccountAction,
): CreateAccountState {
switch (action.type) {
case 'set-step': {
return compute({...state, step: action.value})
}
case 'set-error': {
return compute({...state, error: action.value})
}
case 'set-processing': {
return compute({...state, isProcessing: action.value})
}
case 'set-service-url': {
return compute({
...state,
serviceUrl: action.value,
serviceDescription:
state.serviceUrl !== action.value
? undefined
: state.serviceDescription,
})
}
case 'set-service-description': {
return compute({
...state,
serviceDescription: action.value,
userDomain: action.value?.availableUserDomains[0] || '',
})
}
case 'set-user-domain': {
return compute({...state, userDomain: action.value})
}
case 'set-invite-code': {
return compute({...state, inviteCode: action.value})
}
case 'set-email': {
return compute({...state, email: action.value})
}
case 'set-password': {
return compute({...state, password: action.value})
}
case 'set-handle': {
return compute({...state, handle: action.value})
}
case 'set-birth-date': {
return compute({...state, birthDate: action.value})
}
case 'next': {
if (state.step === 1) {
if (!is13(state)) {
return compute({
...state,
error: _(
msg`Unfortunately, you do not meet the requirements to create an account.`,
),
})
}
}
return compute({...state, error: '', step: state.step + 1})
}
case 'back': {
return compute({...state, error: '', step: state.step - 1})
}
}
}
}
function compute(state: CreateAccountState): CreateAccountState {
let canNext = true
if (state.step === 1) {
canNext =
!!state.serviceDescription &&
(!state.isInviteCodeRequired || !!state.inviteCode) &&
!!state.email &&
!!state.password
} else if (state.step === 2) {
canNext =
!!state.handle && validateHandle(state.handle, state.userDomain).overall
} else if (state.step === 3) {
// Step 3 will automatically redirect as soon as the captcha completes
canNext = false
}
return {
...state,
canBack: state.step > 1,
canNext,
isInviteCodeRequired: !!state.serviceDescription?.inviteCodeRequired,
isCaptchaRequired: !!state.serviceDescription?.phoneVerificationRequired,
}
}