-import { None } from "@sniptt/monads";
import { Component, linkEvent } from "inferno";
-import {
- GetSiteResponse,
- Login as LoginForm,
- LoginResponse,
- PasswordReset,
- UserOperation,
- wsJsonToRes,
- wsUserOp,
-} from "lemmy-js-client";
-import { Subscription } from "rxjs";
+import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
import { i18n } from "../../i18next";
-import { UserService, WebSocketService } from "../../services";
-import {
- auth,
- isBrowser,
- setIsoData,
- toast,
- validEmail,
- wsClient,
- wsSubscribe,
-} from "../../utils";
+import { UserService } from "../../services";
+import { HttpService, RequestState } from "../../services/HttpService";
+import { isBrowser, myAuth, setIsoData, toast, validEmail } from "../../utils";
import { HtmlTags } from "../common/html-tags";
import { Spinner } from "../common/icon";
interface State {
- loginForm: LoginForm;
- loginLoading: boolean;
+ loginRes: RequestState<LoginResponse>;
+ form: {
+ username_or_email?: string;
+ password?: string;
+ totp_2fa_token?: string;
+ };
+ showTotp: boolean;
siteRes: GetSiteResponse;
}
export class Login extends Component<any, State> {
private isoData = setIsoData(this.context);
- private subscription: Subscription;
-
- emptyState: State = {
- loginForm: new LoginForm({
- username_or_email: undefined,
- password: undefined,
- }),
- loginLoading: false,
+
+ state: State = {
+ loginRes: { state: "empty" },
+ form: {},
+ showTotp: false,
siteRes: this.isoData.site_res,
};
constructor(props: any, context: any) {
super(props, context);
-
- this.state = this.emptyState;
-
- this.parseMessage = this.parseMessage.bind(this);
- this.subscription = wsSubscribe(this.parseMessage);
-
- if (isBrowser()) {
- WebSocketService.Instance.send(wsClient.getCaptcha());
- }
}
componentDidMount() {
// Navigate to home if already logged in
- if (UserService.Instance.myUserInfo.isSome()) {
+ if (UserService.Instance.myUserInfo) {
this.context.router.history.push("/");
}
}
- componentWillUnmount() {
- if (isBrowser()) {
- this.subscription.unsubscribe();
- }
- }
-
get documentTitle(): string {
- return this.state.siteRes.site_view.match({
- some: siteView => `${i18n.t("login")} - ${siteView.site.name}`,
- none: "",
- });
+ return `${i18n.t("login")} - ${this.state.siteRes.site_view.site.name}`;
}
get isLemmyMl(): boolean {
render() {
return (
- <div class="container">
+ <div className="container-lg">
<HtmlTags
title={this.documentTitle}
path={this.context.router.route.match.url}
- description={None}
- image={None}
/>
- <div class="row">
- <div class="col-12 col-lg-6 offset-lg-3">{this.loginForm()}</div>
+ <div className="row">
+ <div className="col-12 col-lg-6 offset-lg-3">{this.loginForm()}</div>
</div>
</div>
);
<div>
<form onSubmit={linkEvent(this, this.handleLoginSubmit)}>
<h5>{i18n.t("login")}</h5>
- <div class="form-group row">
+ <div className="form-group row">
<label
- class="col-sm-2 col-form-label"
+ className="col-sm-2 col-form-label"
htmlFor="login-email-or-username"
>
{i18n.t("email_or_username")}
</label>
- <div class="col-sm-10">
+ <div className="col-sm-10">
<input
type="text"
- class="form-control"
+ className="form-control"
id="login-email-or-username"
- value={this.state.loginForm.username_or_email}
+ value={this.state.form.username_or_email}
onInput={linkEvent(this, this.handleLoginUsernameChange)}
autoComplete="email"
required
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-2 col-form-label" htmlFor="login-password">
+ <div className="form-group row">
+ <label className="col-sm-2 col-form-label" htmlFor="login-password">
{i18n.t("password")}
</label>
- <div class="col-sm-10">
+ <div className="col-sm-10">
<input
type="password"
id="login-password"
- value={this.state.loginForm.password}
+ value={this.state.form.password}
onInput={linkEvent(this, this.handleLoginPasswordChange)}
- class="form-control"
+ className="form-control"
autoComplete="current-password"
required
maxLength={60}
type="button"
onClick={linkEvent(this, this.handlePasswordReset)}
className="btn p-0 btn-link d-inline-block float-right text-muted small font-weight-bold pointer-events not-allowed"
- disabled={!validEmail(this.state.loginForm.username_or_email)}
+ disabled={
+ !!this.state.form.username_or_email &&
+ !validEmail(this.state.form.username_or_email)
+ }
title={i18n.t("no_password_reset")}
>
{i18n.t("forgot_password")}
</button>
</div>
</div>
- <div class="form-group row">
- <div class="col-sm-10">
- <button type="submit" class="btn btn-secondary">
- {this.state.loginLoading ? <Spinner /> : i18n.t("login")}
+ {this.state.showTotp && (
+ <div className="form-group row">
+ <label
+ className="col-sm-6 col-form-label"
+ htmlFor="login-totp-token"
+ >
+ {i18n.t("two_factor_token")}
+ </label>
+ <div className="col-sm-6">
+ <input
+ type="number"
+ inputMode="numeric"
+ className="form-control"
+ id="login-totp-token"
+ pattern="[0-9]*"
+ autoComplete="one-time-code"
+ value={this.state.form.totp_2fa_token}
+ onInput={linkEvent(this, this.handleLoginTotpChange)}
+ />
+ </div>
+ </div>
+ )}
+ <div className="form-group row">
+ <div className="col-sm-10">
+ <button type="submit" className="btn btn-secondary">
+ {this.state.loginRes.state == "loading" ? (
+ <Spinner />
+ ) : (
+ i18n.t("login")
+ )}
</button>
</div>
</div>
);
}
- handleLoginSubmit(i: Login, event: any) {
+ async handleLoginSubmit(i: Login, event: any) {
event.preventDefault();
- i.state.loginLoading = true;
- i.setState(i.state);
- WebSocketService.Instance.send(wsClient.login(i.state.loginForm));
+ const { password, totp_2fa_token, username_or_email } = i.state.form;
+
+ if (username_or_email && password) {
+ i.setState({ loginRes: { state: "loading" } });
+
+ const loginRes = await HttpService.client.login({
+ username_or_email,
+ password,
+ totp_2fa_token,
+ });
+ switch (loginRes.state) {
+ case "failed": {
+ if (loginRes.msg === "missing_totp_token") {
+ i.setState({ showTotp: true });
+ toast(i18n.t("enter_two_factor_code"), "info");
+ }
+
+ i.setState({ loginRes: { state: "empty" } });
+ break;
+ }
+
+ case "success": {
+ UserService.Instance.login(loginRes.data);
+ const site = await HttpService.client.getSite({
+ auth: myAuth(),
+ });
+
+ if (site.state === "success") {
+ UserService.Instance.myUserInfo = site.data.my_user;
+ }
+
+ i.props.history.replace("/");
+
+ break;
+ }
+ }
+ }
}
handleLoginUsernameChange(i: Login, event: any) {
- i.state.loginForm.username_or_email = event.target.value;
+ i.state.form.username_or_email = event.target.value;
i.setState(i.state);
}
- handleLoginPasswordChange(i: Login, event: any) {
- i.state.loginForm.password = event.target.value;
+ handleLoginTotpChange(i: Login, event: any) {
+ i.state.form.totp_2fa_token = event.target.value;
i.setState(i.state);
}
- handlePasswordReset(i: Login, event: any) {
- event.preventDefault();
- let resetForm = new PasswordReset({
- email: i.state.loginForm.username_or_email,
- });
- WebSocketService.Instance.send(wsClient.passwordReset(resetForm));
+ handleLoginPasswordChange(i: Login, event: any) {
+ i.state.form.password = event.target.value;
+ i.setState(i.state);
}
- parseMessage(msg: any) {
- let op = wsUserOp(msg);
- console.log(msg);
- if (msg.error) {
- toast(i18n.t(msg.error), "danger");
- this.state = this.emptyState;
- this.setState(this.state);
- return;
- } else {
- if (op == UserOperation.Login) {
- let data = wsJsonToRes<LoginResponse>(msg, LoginResponse);
- this.state = this.emptyState;
- this.setState(this.state);
- UserService.Instance.login(data);
- WebSocketService.Instance.send(
- wsClient.userJoin({
- auth: auth().unwrap(),
- })
- );
- toast(i18n.t("logged_in"));
- this.props.history.push("/");
- } else if (op == UserOperation.PasswordReset) {
+ async handlePasswordReset(i: Login, event: any) {
+ event.preventDefault();
+ const email = i.state.form.username_or_email;
+ if (email) {
+ const res = await HttpService.client.passwordReset({ email });
+ if (res.state == "success") {
toast(i18n.t("reset_password_mail_sent"));
- } else if (op == UserOperation.GetSite) {
- let data = wsJsonToRes<GetSiteResponse>(msg, GetSiteResponse);
- this.state.siteRes = data;
- this.setState(this.state);
}
}
}
projects / lemmy-ui.git / blobdiff