|
@@ -35,18 +35,18 @@ const Widget = () => {
|
|
|
<ProForm<IFormData>
|
|
<ProForm<IFormData>
|
|
|
onFinish={async (values: IFormData) => {
|
|
onFinish={async (values: IFormData) => {
|
|
|
const user = {
|
|
const user = {
|
|
|
- username: values.email,
|
|
|
|
|
- password: values.password,
|
|
|
|
|
|
|
+ username: values.email.trim(),
|
|
|
|
|
+ password: values.password.trim(),
|
|
|
};
|
|
};
|
|
|
- const signin = await post<ISignInRequest, ISignInResponse>(
|
|
|
|
|
- "/v2/auth/signin",
|
|
|
|
|
|
|
+ const res = await post<ISignInRequest, ISignInResponse>(
|
|
|
|
|
+ "/v2/sign-in",
|
|
|
user
|
|
user
|
|
|
);
|
|
);
|
|
|
- if (signin.ok) {
|
|
|
|
|
- localStorage.setItem("token", signin.data);
|
|
|
|
|
|
|
+ if (res.ok) {
|
|
|
|
|
+ localStorage.setItem("token", res.data);
|
|
|
get<IUserResponse>("/v2/auth/current").then((json) => {
|
|
get<IUserResponse>("/v2/auth/current").then((json) => {
|
|
|
if (json.ok) {
|
|
if (json.ok) {
|
|
|
- dispatch(signIn([json.data, signin.data]));
|
|
|
|
|
|
|
+ dispatch(signIn([json.data, res.data]));
|
|
|
navigate(TO_HOME);
|
|
navigate(TO_HOME);
|
|
|
} else {
|
|
} else {
|
|
|
console.error(json.message);
|
|
console.error(json.message);
|
|
@@ -55,7 +55,7 @@ const Widget = () => {
|
|
|
|
|
|
|
|
message.success(intl.formatMessage({ id: "flashes.success" }));
|
|
message.success(intl.formatMessage({ id: "flashes.success" }));
|
|
|
} else {
|
|
} else {
|
|
|
- message.error(signin.message);
|
|
|
|
|
|
|
+ message.error(res.message);
|
|
|
}
|
|
}
|
|
|
}}
|
|
}}
|
|
|
>
|
|
>
|