diff options
Diffstat (limited to 'src/view/com/auth')
| -rw-r--r-- | src/view/com/auth/create/CreateAccount.tsx | 8 | ||||
| -rw-r--r-- | src/view/com/auth/create/Step1.tsx | 9 | ||||
| -rw-r--r-- | src/view/com/auth/create/Step2.tsx | 4 | ||||
| -rw-r--r-- | src/view/com/auth/create/Step3.tsx | 1 | ||||
| -rw-r--r-- | src/view/com/auth/login/Login.tsx | 10 |
5 files changed, 20 insertions, 12 deletions
diff --git a/src/view/com/auth/create/CreateAccount.tsx b/src/view/com/auth/create/CreateAccount.tsx index 618c15cf5..6ece903d6 100644 --- a/src/view/com/auth/create/CreateAccount.tsx +++ b/src/view/com/auth/create/CreateAccount.tsx @@ -75,16 +75,14 @@ export const CreateAccount = observer( {model.step === 3 && <Step3 model={model} />} </View> <View style={[s.flexRow, s.pl20, s.pr20]}> - <TouchableOpacity onPress={onPressBackInner}> + <TouchableOpacity onPress={onPressBackInner} testID="backBtn"> <Text type="xl" style={pal.link}> Back </Text> </TouchableOpacity> <View style={s.flex1} /> {model.canNext ? ( - <TouchableOpacity - testID="createAccountButton" - onPress={onPressNext}> + <TouchableOpacity testID="nextBtn" onPress={onPressNext}> {model.isProcessing ? ( <ActivityIndicator /> ) : ( @@ -95,7 +93,7 @@ export const CreateAccount = observer( </TouchableOpacity> ) : model.didServiceDescriptionFetchFail ? ( <TouchableOpacity - testID="registerRetryButton" + testID="retryConnectBtn" onPress={onPressRetryConnect}> <Text type="xl-bold" style={[pal.link, s.pr5]}> Retry diff --git a/src/view/com/auth/create/Step1.tsx b/src/view/com/auth/create/Step1.tsx index 0a628f9d0..ca964ede2 100644 --- a/src/view/com/auth/create/Step1.tsx +++ b/src/view/com/auth/create/Step1.tsx @@ -60,12 +60,14 @@ export const Step1 = observer(({model}: {model: CreateAccountModel}) => { This is the company that keeps you online. </Text> <Option + testID="blueskyServerBtn" isSelected={isDefaultSelected} label="Bluesky" help=" (default)" onPress={onPressDefault} /> <Option + testID="otherServerBtn" isSelected={!isDefaultSelected} label="Other" onPress={onPressOther}> @@ -74,6 +76,7 @@ export const Step1 = observer(({model}: {model: CreateAccountModel}) => { Enter the address of your provider: </Text> <TextInput + testID="customServerInput" icon="globe" placeholder="Hosting provider address" value={model.serviceUrl} @@ -83,12 +86,14 @@ export const Step1 = observer(({model}: {model: CreateAccountModel}) => { {LOGIN_INCLUDE_DEV_SERVERS && ( <View style={[s.flexRow, s.mt10]}> <Button + testID="stagingServerBtn" type="default" style={s.mr5} label="Staging" onPress={() => onDebugChangeServiceUrl(STAGING_SERVICE)} /> <Button + testID="localDevServerBtn" type="default" label="Dev Server" onPress={() => onDebugChangeServiceUrl(LOCAL_DEV_SERVICE)} @@ -112,11 +117,13 @@ function Option({ label, help, onPress, + testID, }: React.PropsWithChildren<{ isSelected: boolean label: string help?: string onPress: () => void + testID?: string }>) { const theme = useTheme() const pal = usePalette('default') @@ -129,7 +136,7 @@ function Option({ return ( <View style={[styles.option, pal.border]}> - <TouchableWithoutFeedback onPress={onPress}> + <TouchableWithoutFeedback onPress={onPress} testID={testID}> <View style={styles.optionHeading}> <View style={[styles.circle, pal.border]}> {isSelected ? ( diff --git a/src/view/com/auth/create/Step2.tsx b/src/view/com/auth/create/Step2.tsx index f115bf6ac..8df997bd3 100644 --- a/src/view/com/auth/create/Step2.tsx +++ b/src/view/com/auth/create/Step2.tsx @@ -59,6 +59,7 @@ export const Step2 = observer(({model}: {model: CreateAccountModel}) => { Email address </Text> <TextInput + testID="emailInput" icon="envelope" placeholder="Enter your email address" value={model.email} @@ -72,6 +73,7 @@ export const Step2 = observer(({model}: {model: CreateAccountModel}) => { Password </Text> <TextInput + testID="passwordInput" icon="lock" placeholder="Choose your password" value={model.password} @@ -86,7 +88,7 @@ export const Step2 = observer(({model}: {model: CreateAccountModel}) => { Legal check </Text> <TouchableOpacity - testID="registerIs13Input" + testID="is13Input" style={[styles.toggleBtn, pal.border]} onPress={() => model.setIs13(!model.is13)}> <View style={[pal.borderDark, styles.checkbox]}> diff --git a/src/view/com/auth/create/Step3.tsx b/src/view/com/auth/create/Step3.tsx index 652591171..13ab39a10 100644 --- a/src/view/com/auth/create/Step3.tsx +++ b/src/view/com/auth/create/Step3.tsx @@ -17,6 +17,7 @@ export const Step3 = observer(({model}: {model: CreateAccountModel}) => { <StepHeader step="3" title="Your user handle" /> <View style={s.pb10}> <TextInput + testID="handleInput" icon="at" placeholder="eg alice" value={model.handle} diff --git a/src/view/com/auth/login/Login.tsx b/src/view/com/auth/login/Login.tsx index f99e72daa..eff1642f0 100644 --- a/src/view/com/auth/login/Login.tsx +++ b/src/view/com/auth/login/Login.tsx @@ -13,7 +13,7 @@ import { FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' import * as EmailValidator from 'email-validator' -import AtpAgent from '@atproto/api' +import {BskyAgent} from '@atproto/api' import {useAnalytics} from 'lib/analytics' import {Text} from '../../util/text/Text' import {UserAvatar} from '../../util/UserAvatar' @@ -506,8 +506,8 @@ const ForgotPasswordForm = ({ setIsProcessing(true) try { - const agent = new AtpAgent({service: serviceUrl}) - await agent.api.com.atproto.account.requestPasswordReset({email}) + const agent = new BskyAgent({service: serviceUrl}) + await agent.com.atproto.server.requestPasswordReset({email}) onEmailSent() } catch (e: any) { const errMsg = e.toString() @@ -648,8 +648,8 @@ const SetNewPasswordForm = ({ setIsProcessing(true) try { - const agent = new AtpAgent({service: serviceUrl}) - await agent.api.com.atproto.account.resetPassword({ + const agent = new BskyAgent({service: serviceUrl}) + await agent.com.atproto.server.resetPassword({ token: resetCode, password, }) |