Implement 'forgot password' flow
parent
0d54f6e126
commit
3a44a1cfdc
|
@ -9,24 +9,37 @@ import {
|
||||||
View,
|
View,
|
||||||
} from 'react-native'
|
} from 'react-native'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
|
import * as EmailValidator from 'email-validator'
|
||||||
import {Logo} from './Logo'
|
import {Logo} from './Logo'
|
||||||
import {s, colors} from '../../lib/styles'
|
import {s, colors} from '../../lib/styles'
|
||||||
import {createFullHandle, toNiceDomain} from '../../../lib/strings'
|
import {createFullHandle, toNiceDomain} from '../../../lib/strings'
|
||||||
import {useStores, DEFAULT_SERVICE} from '../../../state'
|
import {useStores, RootStoreModel, DEFAULT_SERVICE} from '../../../state'
|
||||||
import {ServiceDescription} from '../../../state/models/session'
|
import {ServiceDescription} from '../../../state/models/session'
|
||||||
import {ServerInputModal} from '../../../state/models/shell-ui'
|
import {ServerInputModal} from '../../../state/models/shell-ui'
|
||||||
import {isNetworkError} from '../../../lib/errors'
|
import {isNetworkError} from '../../../lib/errors'
|
||||||
|
import {sessionClient as AtpApi} from '../../../third-party/api/index'
|
||||||
|
import type {SessionServiceClient} from '../../../third-party/api/src/index'
|
||||||
|
|
||||||
|
enum Forms {
|
||||||
|
Login,
|
||||||
|
ForgotPassword,
|
||||||
|
SetNewPassword,
|
||||||
|
PasswordUpdated,
|
||||||
|
}
|
||||||
|
|
||||||
export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
const store = useStores()
|
const store = useStores()
|
||||||
const [isProcessing, setIsProcessing] = useState<boolean>(false)
|
const [error, setError] = useState<string>('')
|
||||||
const [serviceUrl, setServiceUrl] = useState<string>(DEFAULT_SERVICE)
|
const [serviceUrl, setServiceUrl] = useState<string>(DEFAULT_SERVICE)
|
||||||
const [serviceDescription, setServiceDescription] = useState<
|
const [serviceDescription, setServiceDescription] = useState<
|
||||||
ServiceDescription | undefined
|
ServiceDescription | undefined
|
||||||
>(undefined)
|
>(undefined)
|
||||||
const [error, setError] = useState<string>('')
|
const [currentForm, setCurrentForm] = useState<Forms>(Forms.Login)
|
||||||
const [handle, setHandle] = useState<string>('')
|
|
||||||
const [password, setPassword] = useState<string>('')
|
const gotoForm = (form: Forms) => () => {
|
||||||
|
setError('')
|
||||||
|
setCurrentForm(form)
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let aborted = false
|
let aborted = false
|
||||||
|
@ -50,6 +63,75 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
}
|
}
|
||||||
}, [store.session, serviceUrl])
|
}, [store.session, serviceUrl])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<KeyboardAvoidingView behavior="padding" style={{flex: 1}}>
|
||||||
|
<View style={styles.logoHero}>
|
||||||
|
<Logo />
|
||||||
|
</View>
|
||||||
|
{currentForm === Forms.Login ? (
|
||||||
|
<LoginForm
|
||||||
|
store={store}
|
||||||
|
error={error}
|
||||||
|
serviceUrl={serviceUrl}
|
||||||
|
serviceDescription={serviceDescription}
|
||||||
|
setError={setError}
|
||||||
|
setServiceUrl={setServiceUrl}
|
||||||
|
onPressBack={onPressBack}
|
||||||
|
onPressForgotPassword={gotoForm(Forms.ForgotPassword)}
|
||||||
|
/>
|
||||||
|
) : undefined}
|
||||||
|
{currentForm === Forms.ForgotPassword ? (
|
||||||
|
<ForgotPasswordForm
|
||||||
|
store={store}
|
||||||
|
error={error}
|
||||||
|
serviceUrl={serviceUrl}
|
||||||
|
serviceDescription={serviceDescription}
|
||||||
|
setError={setError}
|
||||||
|
setServiceUrl={setServiceUrl}
|
||||||
|
onPressBack={gotoForm(Forms.Login)}
|
||||||
|
onEmailSent={gotoForm(Forms.SetNewPassword)}
|
||||||
|
/>
|
||||||
|
) : undefined}
|
||||||
|
{currentForm === Forms.SetNewPassword ? (
|
||||||
|
<SetNewPasswordForm
|
||||||
|
store={store}
|
||||||
|
error={error}
|
||||||
|
serviceUrl={serviceUrl}
|
||||||
|
setError={setError}
|
||||||
|
onPressBack={gotoForm(Forms.ForgotPassword)}
|
||||||
|
onPasswordSet={gotoForm(Forms.PasswordUpdated)}
|
||||||
|
/>
|
||||||
|
) : undefined}
|
||||||
|
{currentForm === Forms.PasswordUpdated ? (
|
||||||
|
<PasswordUpdatedForm onPressNext={gotoForm(Forms.Login)} />
|
||||||
|
) : undefined}
|
||||||
|
</KeyboardAvoidingView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const LoginForm = ({
|
||||||
|
store,
|
||||||
|
error,
|
||||||
|
serviceUrl,
|
||||||
|
serviceDescription,
|
||||||
|
setError,
|
||||||
|
setServiceUrl,
|
||||||
|
onPressBack,
|
||||||
|
onPressForgotPassword,
|
||||||
|
}: {
|
||||||
|
store: RootStoreModel
|
||||||
|
error: string
|
||||||
|
serviceUrl: string
|
||||||
|
serviceDescription: ServiceDescription | undefined
|
||||||
|
setError: (v: string) => void
|
||||||
|
setServiceUrl: (v: string) => void
|
||||||
|
onPressBack: () => void
|
||||||
|
onPressForgotPassword: () => void
|
||||||
|
}) => {
|
||||||
|
const [isProcessing, setIsProcessing] = useState<boolean>(false)
|
||||||
|
const [handle, setHandle] = useState<string>('')
|
||||||
|
const [password, setPassword] = useState<string>('')
|
||||||
|
|
||||||
const onPressSelectService = () => {
|
const onPressSelectService = () => {
|
||||||
store.shell.openModal(new ServerInputModal(serviceUrl, setServiceUrl))
|
store.shell.openModal(new ServerInputModal(serviceUrl, setServiceUrl))
|
||||||
}
|
}
|
||||||
|
@ -58,8 +140,8 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
setError('')
|
setError('')
|
||||||
setIsProcessing(true)
|
setIsProcessing(true)
|
||||||
|
|
||||||
// try to guess the handle if the user just gave their own username
|
|
||||||
try {
|
try {
|
||||||
|
// try to guess the handle if the user just gave their own username
|
||||||
let fullHandle = handle
|
let fullHandle = handle
|
||||||
if (
|
if (
|
||||||
serviceDescription &&
|
serviceDescription &&
|
||||||
|
@ -101,10 +183,7 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<KeyboardAvoidingView behavior="padding" style={{flex: 1}}>
|
<>
|
||||||
<View style={styles.logoHero}>
|
|
||||||
<Logo />
|
|
||||||
</View>
|
|
||||||
<View style={styles.group}>
|
<View style={styles.group}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.groupTitle, {paddingRight: 0, paddingVertical: 6}]}
|
style={[styles.groupTitle, {paddingRight: 0, paddingVertical: 6}]}
|
||||||
|
@ -148,6 +227,11 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
onChangeText={setPassword}
|
onChangeText={setPassword}
|
||||||
editable={!isProcessing}
|
editable={!isProcessing}
|
||||||
/>
|
/>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.textInputInnerBtn}
|
||||||
|
onPress={onPressForgotPassword}>
|
||||||
|
<Text style={styles.textInputInnerBtnLabel}>Forgot</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
{error ? (
|
{error ? (
|
||||||
|
@ -176,11 +260,273 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
|
||||||
<Text style={[s.white, s.f18, s.pl10]}>Connecting...</Text>
|
<Text style={[s.white, s.f18, s.pl10]}>Connecting...</Text>
|
||||||
) : undefined}
|
) : undefined}
|
||||||
</View>
|
</View>
|
||||||
</KeyboardAvoidingView>
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const ForgotPasswordForm = ({
|
||||||
|
store,
|
||||||
|
error,
|
||||||
|
serviceUrl,
|
||||||
|
serviceDescription,
|
||||||
|
setError,
|
||||||
|
setServiceUrl,
|
||||||
|
onPressBack,
|
||||||
|
onEmailSent,
|
||||||
|
}: {
|
||||||
|
store: RootStoreModel
|
||||||
|
error: string
|
||||||
|
serviceUrl: string
|
||||||
|
serviceDescription: ServiceDescription | undefined
|
||||||
|
setError: (v: string) => void
|
||||||
|
setServiceUrl: (v: string) => void
|
||||||
|
onPressBack: () => void
|
||||||
|
onEmailSent: () => void
|
||||||
|
}) => {
|
||||||
|
const [isProcessing, setIsProcessing] = useState<boolean>(false)
|
||||||
|
const [email, setEmail] = useState<string>('')
|
||||||
|
|
||||||
|
const onPressSelectService = () => {
|
||||||
|
store.shell.openModal(new ServerInputModal(serviceUrl, setServiceUrl))
|
||||||
|
}
|
||||||
|
|
||||||
|
const onPressNext = async () => {
|
||||||
|
if (!EmailValidator.validate(email)) {
|
||||||
|
return setError('Your email appears to be invalid.')
|
||||||
|
}
|
||||||
|
|
||||||
|
setError('')
|
||||||
|
setIsProcessing(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
const api = AtpApi.service(serviceUrl) as SessionServiceClient
|
||||||
|
await api.com.atproto.account.requestPasswordReset({email})
|
||||||
|
onEmailSent()
|
||||||
|
} catch (e: any) {
|
||||||
|
const errMsg = e.toString()
|
||||||
|
console.log(e)
|
||||||
|
setIsProcessing(false)
|
||||||
|
if (isNetworkError(e)) {
|
||||||
|
setError(
|
||||||
|
'Unable to contact your service. Please check your Internet connection.',
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
setError(errMsg.replace(/^Error:/, ''))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Text style={styles.screenTitle}>Reset password</Text>
|
||||||
|
<Text style={styles.instructions}>
|
||||||
|
Enter the email you used to create your account. We'll send you a "reset
|
||||||
|
code" so you can set a new password.
|
||||||
|
</Text>
|
||||||
|
<View style={styles.group}>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={[styles.groupContent, {borderTopWidth: 0}]}
|
||||||
|
onPress={onPressSelectService}>
|
||||||
|
<FontAwesomeIcon icon="globe" style={styles.groupContentIcon} />
|
||||||
|
<Text style={styles.textInput} numberOfLines={1}>
|
||||||
|
{toNiceDomain(serviceUrl)}
|
||||||
|
</Text>
|
||||||
|
<View style={styles.textBtnFakeInnerBtn}>
|
||||||
|
<FontAwesomeIcon
|
||||||
|
icon="pen"
|
||||||
|
size={12}
|
||||||
|
style={styles.textBtnFakeInnerBtnIcon}
|
||||||
|
/>
|
||||||
|
<Text style={styles.textBtnFakeInnerBtnLabel}>Change</Text>
|
||||||
|
</View>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<View style={styles.groupContent}>
|
||||||
|
<FontAwesomeIcon icon="envelope" style={styles.groupContentIcon} />
|
||||||
|
<TextInput
|
||||||
|
style={styles.textInput}
|
||||||
|
placeholder="Email address"
|
||||||
|
placeholderTextColor={colors.blue0}
|
||||||
|
autoCapitalize="none"
|
||||||
|
autoFocus
|
||||||
|
autoCorrect={false}
|
||||||
|
value={email}
|
||||||
|
onChangeText={setEmail}
|
||||||
|
editable={!isProcessing}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
{error ? (
|
||||||
|
<View style={styles.error}>
|
||||||
|
<View style={styles.errorIcon}>
|
||||||
|
<FontAwesomeIcon icon="exclamation" style={s.white} size={10} />
|
||||||
|
</View>
|
||||||
|
<View style={s.flex1}>
|
||||||
|
<Text style={[s.white, s.bold]}>{error}</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
) : undefined}
|
||||||
|
<View style={[s.flexRow, s.alignCenter, s.pl20, s.pr20]}>
|
||||||
|
<TouchableOpacity onPress={onPressBack}>
|
||||||
|
<Text style={[s.white, s.f18, s.pl5]}>Back</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<View style={s.flex1} />
|
||||||
|
{!serviceDescription || isProcessing ? (
|
||||||
|
<ActivityIndicator color="#fff" />
|
||||||
|
) : !email ? (
|
||||||
|
<Text style={[s.blue1, s.f18, s.bold, s.pr5]}>Next</Text>
|
||||||
|
) : (
|
||||||
|
<TouchableOpacity onPress={onPressNext}>
|
||||||
|
<Text style={[s.white, s.f18, s.bold, s.pr5]}>Next</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
)}
|
||||||
|
{!serviceDescription || isProcessing ? (
|
||||||
|
<Text style={[s.white, s.f18, s.pl10]}>Processing...</Text>
|
||||||
|
) : undefined}
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const SetNewPasswordForm = ({
|
||||||
|
store,
|
||||||
|
error,
|
||||||
|
serviceUrl,
|
||||||
|
setError,
|
||||||
|
onPressBack,
|
||||||
|
onPasswordSet,
|
||||||
|
}: {
|
||||||
|
store: RootStoreModel
|
||||||
|
error: string
|
||||||
|
serviceUrl: string
|
||||||
|
setError: (v: string) => void
|
||||||
|
onPressBack: () => void
|
||||||
|
onPasswordSet: () => void
|
||||||
|
}) => {
|
||||||
|
const [isProcessing, setIsProcessing] = useState<boolean>(false)
|
||||||
|
const [resetCode, setResetCode] = useState<string>('')
|
||||||
|
const [password, setPassword] = useState<string>('')
|
||||||
|
|
||||||
|
const onPressNext = async () => {
|
||||||
|
setError('')
|
||||||
|
setIsProcessing(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
const api = AtpApi.service(serviceUrl) as SessionServiceClient
|
||||||
|
await api.com.atproto.account.resetPassword({token: resetCode, password})
|
||||||
|
onPasswordSet()
|
||||||
|
} catch (e: any) {
|
||||||
|
const errMsg = e.toString()
|
||||||
|
console.log(e)
|
||||||
|
setIsProcessing(false)
|
||||||
|
if (isNetworkError(e)) {
|
||||||
|
setError(
|
||||||
|
'Unable to contact your service. Please check your Internet connection.',
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
setError(errMsg.replace(/^Error:/, ''))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Text style={styles.screenTitle}>Set new password</Text>
|
||||||
|
<Text style={styles.instructions}>
|
||||||
|
You will receive an email with a "reset code." Enter that code here,
|
||||||
|
then enter your new password.
|
||||||
|
</Text>
|
||||||
|
<View style={styles.group}>
|
||||||
|
<View style={[styles.groupContent, {borderTopWidth: 0}]}>
|
||||||
|
<FontAwesomeIcon icon="ticket" style={styles.groupContentIcon} />
|
||||||
|
<TextInput
|
||||||
|
style={[styles.textInput]}
|
||||||
|
placeholder="Reset code"
|
||||||
|
placeholderTextColor={colors.blue0}
|
||||||
|
autoCapitalize="none"
|
||||||
|
autoCorrect={false}
|
||||||
|
autoFocus
|
||||||
|
value={resetCode}
|
||||||
|
onChangeText={setResetCode}
|
||||||
|
editable={!isProcessing}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={styles.groupContent}>
|
||||||
|
<FontAwesomeIcon icon="lock" style={styles.groupContentIcon} />
|
||||||
|
<TextInput
|
||||||
|
style={styles.textInput}
|
||||||
|
placeholder="New password"
|
||||||
|
placeholderTextColor={colors.blue0}
|
||||||
|
autoCapitalize="none"
|
||||||
|
autoCorrect={false}
|
||||||
|
secureTextEntry
|
||||||
|
value={password}
|
||||||
|
onChangeText={setPassword}
|
||||||
|
editable={!isProcessing}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
{error ? (
|
||||||
|
<View style={styles.error}>
|
||||||
|
<View style={styles.errorIcon}>
|
||||||
|
<FontAwesomeIcon icon="exclamation" style={s.white} size={10} />
|
||||||
|
</View>
|
||||||
|
<View style={s.flex1}>
|
||||||
|
<Text style={[s.white, s.bold]}>{error}</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
) : undefined}
|
||||||
|
<View style={[s.flexRow, s.alignCenter, s.pl20, s.pr20]}>
|
||||||
|
<TouchableOpacity onPress={onPressBack}>
|
||||||
|
<Text style={[s.white, s.f18, s.pl5]}>Back</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<View style={s.flex1} />
|
||||||
|
{isProcessing ? (
|
||||||
|
<ActivityIndicator color="#fff" />
|
||||||
|
) : !resetCode || !password ? (
|
||||||
|
<Text style={[s.blue1, s.f18, s.bold, s.pr5]}>Next</Text>
|
||||||
|
) : (
|
||||||
|
<TouchableOpacity onPress={onPressNext}>
|
||||||
|
<Text style={[s.white, s.f18, s.bold, s.pr5]}>Next</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
)}
|
||||||
|
{isProcessing ? (
|
||||||
|
<Text style={[s.white, s.f18, s.pl10]}>Updating...</Text>
|
||||||
|
) : undefined}
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const PasswordUpdatedForm = ({onPressNext}: {onPressNext: () => void}) => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Text style={styles.screenTitle}>Password updated!</Text>
|
||||||
|
<Text style={styles.instructions}>
|
||||||
|
You can now sign in with your new password.
|
||||||
|
</Text>
|
||||||
|
<View style={[s.flexRow, s.alignCenter, s.pl20, s.pr20]}>
|
||||||
|
<View style={s.flex1} />
|
||||||
|
<TouchableOpacity onPress={onPressNext}>
|
||||||
|
<Text style={[s.white, s.f18, s.bold, s.pr5]}>Okay</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
|
screenTitle: {
|
||||||
|
color: colors.white,
|
||||||
|
fontSize: 26,
|
||||||
|
marginBottom: 10,
|
||||||
|
marginHorizontal: 20,
|
||||||
|
},
|
||||||
|
instructions: {
|
||||||
|
color: colors.white,
|
||||||
|
fontSize: 16,
|
||||||
|
marginBottom: 20,
|
||||||
|
marginHorizontal: 20,
|
||||||
|
},
|
||||||
logoHero: {
|
logoHero: {
|
||||||
paddingTop: 30,
|
paddingTop: 30,
|
||||||
paddingBottom: 40,
|
paddingBottom: 40,
|
||||||
|
@ -219,6 +565,16 @@ const styles = StyleSheet.create({
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
},
|
},
|
||||||
|
textInputInnerBtn: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
paddingVertical: 6,
|
||||||
|
paddingHorizontal: 8,
|
||||||
|
marginHorizontal: 6,
|
||||||
|
},
|
||||||
|
textInputInnerBtnLabel: {
|
||||||
|
color: colors.white,
|
||||||
|
},
|
||||||
textBtnFakeInnerBtn: {
|
textBtnFakeInnerBtn: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
|
|
Loading…
Reference in New Issue