mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-12-23 03:11:25 +00:00
fix toaster upon user settings change (#1802)
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
This commit is contained in:
parent
26ff0f7e06
commit
c3ab9e74f8
6 changed files with 27 additions and 8 deletions
|
@ -175,7 +175,9 @@ export class Login extends Component<any, State> {
|
|||
}
|
||||
|
||||
case "success": {
|
||||
UserService.Instance.login(loginRes.data);
|
||||
UserService.Instance.login({
|
||||
res: loginRes.data,
|
||||
});
|
||||
const site = await HttpService.client.getSite({
|
||||
auth: myAuth(),
|
||||
});
|
||||
|
|
|
@ -206,7 +206,7 @@ export class Setup extends Component<any, State> {
|
|||
if (i.state.registerRes.state == "success") {
|
||||
const data = i.state.registerRes.data;
|
||||
|
||||
UserService.Instance.login(data);
|
||||
UserService.Instance.login({ res: data });
|
||||
i.setState({ doneRegisteringUser: true });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -469,7 +469,9 @@ export class Signup extends Component<any, State> {
|
|||
|
||||
// Only log them in if a jwt was set
|
||||
if (data.jwt) {
|
||||
UserService.Instance.login(data);
|
||||
UserService.Instance.login({
|
||||
res: data,
|
||||
});
|
||||
|
||||
const site = await HttpService.client.getSite({ auth: myAuth() });
|
||||
|
||||
|
|
|
@ -135,7 +135,9 @@ export class PasswordChange extends Component<any, State> {
|
|||
|
||||
if (i.state.passwordChangeRes.state === "success") {
|
||||
const data = i.state.passwordChangeRes.data;
|
||||
UserService.Instance.login(data);
|
||||
UserService.Instance.login({
|
||||
res: data,
|
||||
});
|
||||
|
||||
const site = await HttpService.client.getSite({ auth: myAuth() });
|
||||
if (site.state === "success") {
|
||||
|
|
|
@ -1175,8 +1175,12 @@ export class Settings extends Component<any, SettingsState> {
|
|||
...i.state.saveUserSettingsForm,
|
||||
auth: myAuthRequired(),
|
||||
});
|
||||
|
||||
if (saveRes.state === "success") {
|
||||
UserService.Instance.login(saveRes.data);
|
||||
UserService.Instance.login({
|
||||
res: saveRes.data,
|
||||
showToast: false,
|
||||
});
|
||||
toast(I18NextService.i18n.t("saved"));
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
@ -1198,7 +1202,10 @@ export class Settings extends Component<any, SettingsState> {
|
|||
auth: myAuthRequired(),
|
||||
});
|
||||
if (changePasswordRes.state === "success") {
|
||||
UserService.Instance.login(changePasswordRes.data);
|
||||
UserService.Instance.login({
|
||||
res: changePasswordRes.data,
|
||||
showToast: false,
|
||||
});
|
||||
window.scrollTo(0, 0);
|
||||
toast(I18NextService.i18n.t("password_changed"));
|
||||
}
|
||||
|
|
|
@ -26,12 +26,18 @@ export class UserService {
|
|||
this.#setJwtInfo();
|
||||
}
|
||||
|
||||
public login(res: LoginResponse) {
|
||||
public login({
|
||||
res,
|
||||
showToast = true,
|
||||
}: {
|
||||
res: LoginResponse;
|
||||
showToast?: boolean;
|
||||
}) {
|
||||
const expires = new Date();
|
||||
expires.setDate(expires.getDate() + 365);
|
||||
|
||||
if (isBrowser() && res.jwt) {
|
||||
toast(I18NextService.i18n.t("logged_in"));
|
||||
showToast && toast(I18NextService.i18n.t("logged_in"));
|
||||
setAuthCookie(res.jwt);
|
||||
this.#setJwtInfo();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue