Updated sign up interface

front/src/api/signup/index.ts

@@ -1,18 +1,10 @@
 import { API_URL } from '../../config'
-import { fallbackTo, isString } from '../../utils/types'
+import { SignUp, SignUpResponse } from './types'
-import { SignUp, SignUpBody, SignUpResponse } from './types'
 
 const composeSignUpURL = () => (
     API_URL + '/signup?'
 )
 
-const composeSignUpBody = (formData: FormData): SignUpBody => ({
-    email: fallbackTo(formData.get('email'), isString, ''),
-    password: fallbackTo(formData.get('password'), isString, ''),
-    name: fallbackTo(formData.get('name'), isString, ''),
-    surname: fallbackTo(formData.get('surname'), isString, ''),
-})
-
 const processSignUp = (data: SignUpResponse): SignUp => {
     if (!data.Success) {
         throw new Error(data.Message)
@@ -21,4 +13,4 @@ const processSignUp = (data: SignUpResponse): SignUp => {
     return true
 }
 
-export { composeSignUpURL, composeSignUpBody, processSignUp }
+export { composeSignUpURL, processSignUp }

front/src/api/signup/types.ts

@@ -1,12 +1,5 @@
 import { isConst, isObject } from '../../utils/types'
 
-type SignUpBody = {
-    email: string,
-    password: string,
-    name: string,
-    surname: string,
-}
-
 type SignUpResponse = {
     Success: true,
 } | {
@@ -25,6 +18,6 @@ const isSignUpResponse = (obj: unknown): obj is SignUpResponse => (
 
 type SignUp = boolean
 
-export type { SignUpBody, SignUpResponse, SignUp }
+export type { SignUpResponse, SignUp }
 
 export { isSignUpResponse }

front/src/api/token/index.ts

@@ -1,22 +1,12 @@
 import { API_URL } from '../../config'
-import { fallbackTo, isString } from '../../utils/types'
 import { Token, TokenResponse } from './types'
 
 const composeTokenURL = () => (
     API_URL + '/token?'
 )
 
-const composeSignInBody = (formData: FormData) => {
-    const resFD = new FormData()
-
-    resFD.append('username', fallbackTo(formData.get('email'), isString, ''))
-    resFD.append('password', fallbackTo(formData.get('password'), isString, ''))
-
-    return resFD
-}
-
 const processToken = (data: TokenResponse): Token => {
     return data.access_token
 }
 
-export { composeTokenURL, composeSignInBody, processToken }
+export { composeTokenURL, processToken }

front/src/components/AuthForm.tsx

@@ -2,8 +2,6 @@ import { FormEventHandler, useCallback } from 'react'
 import { Button, Form } from 'react-bootstrap'
 
 import { useSignIn, useSignUp } from '../hooks/api'
-import { composeSignUpBody } from '../api/signup'
-import { composeSignInBody } from '../api/token'
 
 type AuthFormProps = {
     register: boolean,
@@ -23,11 +21,11 @@ function AuthForm({ goBack, register }: AuthFormProps) {
 
         void (async () => {
             const accountCreated = register ? (
-                await handleSignUp(composeSignUpBody(formData))
+                await handleSignUp(formData)
             ) : true
 
             if (accountCreated) {
-                if (await handleSignIn(composeSignInBody(formData))) {
+                if (await handleSignIn(formData)) {
                     goBack()
                 }
             }
@@ -37,23 +35,11 @@ function AuthForm({ goBack, register }: AuthFormProps) {
 
     return (
         <Form onSubmit={handleAuth}>
-            <Form.Group className='mb-3' controlId='email'>
+            <Form.Group className='mb-3' controlId='username'>
-                <Form.Label>Почта</Form.Label>
+                <Form.Label>Как вас называть?</Form.Label>
-                <Form.Control name='email' type='email' required />
+                <Form.Control name='username' type='text' required />
             </Form.Group>
 
-            {register && <>
-                <Form.Group className='mb-3' controlId='name'>
-                    <Form.Label>Имя</Form.Label>
-                    <Form.Control name='name' type='text' required />
-                </Form.Group>
-
-                <Form.Group className='mb-3' controlId='surname'>
-                    <Form.Label>Фамилия</Form.Label>
-                    <Form.Control name='surname' type='text' required />
-                </Form.Group>
-            </>}
-
             <Form.Group className='mb-3' controlId='password'>
                 <Form.Label>Пароль</Form.Label>
                 <Form.Control name='password' type='password' required />

front/src/hooks/api/useSignUp.ts

@@ -1,6 +1,6 @@
 import { useSendWithButton } from '..'
 import { composeSignUpURL, processSignUp } from '../../api/signup'
-import { SignUpBody, isSignUpResponse } from '../../api/signup/types'
+import { isSignUpResponse } from '../../api/signup/types'
 
 function useSignUp() {
     const { doSend, button } = useSendWithButton(
@@ -14,12 +14,9 @@ function useSignUp() {
         processSignUp,
     )
 
-    async function handleSignUp(data: SignUpBody) {
+    async function handleSignUp(formData: FormData) {
         const res = await doSend({}, {
-            body: JSON.stringify(data),
+            body: formData,
-            headers: {
-                'Content-Type': 'application/json',
-            },
         })
 
         return res ?? false